From 3f8b83adb78e49fe5b6575f4b8f3061f5082b017 Mon Sep 17 00:00:00 2001 From: olsdavis Date: Wed, 23 Feb 2022 09:55:03 +0000 Subject: [PATCH 0001/1244] Implementing lazy vals - Implements a propotype of the new lazy vals scheme Fix/Fixing/Fixes/Close/Closing/Refs #7140 --- .../dotty/tools/dotc/transform/LazyVals.scala | 363 +++-- library/src/scala/runtime/LazyVals.scala | 65 +- vscode-dotty/package-lock.json | 1417 ++++++++++++++++- vscode-dotty/package.json | 2 +- 4 files changed, 1663 insertions(+), 184 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala index aabf8cf9a680..6126bc9b3e0b 100644 --- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala @@ -23,9 +23,10 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { import LazyVals._ import tpd._ - /** this map contains mutable state of transformation: OffsetDefs to be appended to companion object definitions, - * and number of bits currently used */ - class OffsetInfo(var defs: List[Tree], var ord:Int) + /** + * The map contains the list of the offset trees. + */ + class OffsetInfo(var defs: List[Tree]) private val appendOffsetDefs = mutable.Map.empty[Symbol, OffsetInfo] override def phaseName: String = LazyVals.name @@ -52,6 +53,16 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { else nullables.toList } + private def initBlock(stats: List[Tree])(using Context): Block = stats match + case Nil => throw new IllegalArgumentException("trying to create an empty Block") + case x :: Nil => Block(List(x), EmptyTree) + case x :: xs => Block(stats.init, stats.last) + + private def needsBoxing(tp: Type)(using Context): Boolean = tp != NoType && tp != defn.UnitType && tp.classSymbol.isPrimitiveValueClass + + private def boxIfCan(tp: Type)(using Context): Type = + assert(needsBoxing(tp)) + defn.boxedType(tp) override def prepareForUnit(tree: Tree)(using Context): Context = { if (lazyValNullables == null) @@ -62,7 +73,6 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { override def transformDefDef(tree: DefDef)(using Context): Tree = transformLazyVal(tree) - override def transformValDef(tree: ValDef)(using Context): Tree = transformLazyVal(tree) @@ -101,7 +111,6 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { } } - /** Append offset fields to companion objects */ override def transformTemplate(template: Template)(using Context): Tree = { @@ -115,16 +124,15 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { } } - private def addInFront(prefix: List[Tree], stats: List[Tree]) = stats match { case first :: rest if isSuperConstrCall(first) => first :: prefix ::: rest case _ => prefix ::: stats } - /** Make an eager val that would implement synthetic module. - * Eager val ensures thread safety and has less code generated. - * - */ + /** + * Make an eager val that would implement synthetic module. + * Eager val ensures thread safety and has less code generated. + */ def transformSyntheticModule(tree: ValOrDefDef)(using Context): Thicket = { val sym = tree.symbol val holderSymbol = newSymbol(sym.owner, LazyLocalName.fresh(sym.asTerm.name), @@ -134,7 +142,8 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { Thicket(field, getter) } - /** Desugar a local `lazy val x: Int = ` into: + /** + * Desugar a local `lazy val x: Int = ` into: * * ``` * val x$lzy = new scala.runtime.LazyInt() @@ -186,7 +195,6 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { Thicket(holderTree, initTree, accessor) } - override def transformStats(trees: List[tpd.Tree])(using Context): List[Tree] = { // backend requires field usage to be after field definition // need to bring containers to start of method @@ -274,168 +282,212 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { } } - /** Create a threadsafe lazy accessor equivalent to such code - * ``` - * def methodSymbol(): Int = { - * while (true) { - * val flag = LazyVals.get(this, bitmap_offset) - * val state = LazyVals.STATE(flag, ) - * - * if (state == ) { - * return value_0 - * } else if (state == ) { - * if (LazyVals.CAS(this, bitmap_offset, flag, , )) { - * try { - * val result = - * value_0 = result - * nullable = null - * LazyVals.setFlag(this, bitmap_offset, , ) - * return result - * } - * catch { - * case ex => - * LazyVals.setFlag(this, bitmap_offset, , ) - * throw ex - * } - * } - * } else /* if (state == || state == ) */ { - * LazyVals.wait4Notification(this, bitmap_offset, flag, ) - * } - * } - * } - * ``` - */ + /** + * Create a threadsafe lazy accessor equivalent to the following code: + * ``` + * private @volatile var _x: AnyRef = null + * @tailrec def x: A = + * _x match + * case current: A => + * current + * case null => + * if CAS(_x, null, Evaluating) then + * var result: AnyRef = null // here, we need `AnyRef` to possibly assign `NULL` + * try + * result = rhs + * nullable = null // if the field is nullable; see `CollectNullableFields` + * if result == null then result = NULL // drop if A is non-nullable + * finally + * if !CAS(_x, Evaluating, result) then + * val lock = _x.asInstanceOf[Waiting] + * CAS(_x, lock, result) + * lock.release() + * x + * case Evaluating => + * CAS(_x, Evaluating, new Waiting) + * x + * case current: Waiting => + * current.awaitRelease() + * x + * case NULL => null + * ``` + * Where `Evaluating` and `NULL` are represented by `object`s and `Waiting` by a class that + * allows awaiting the completion of the evaluation. Note that since tail-recursive + * functions are transformed *before* lazy-vals, this implementation directly implements + * the resulting loop. `PatternMatcher` coming before `LazyVals`, the pattern matching block + * is implemented using if-s. That is: + * + * ``` + * private @volatile var _x: AnyRef = null + * def x: A = + * while true do + * val current: AnyRef = _x + * if current == null then + * if CAS(_x, null, Evaluating) then + * var result: AnyRef = null + * try + * result = rhs + * nullable = null + * if result == null then result = NULL + * finally + * if !CAS(_x, Evaluating, result) then + * val lock = _x.asInstanceOf[Waiting] + * CAS(_x, lock, result) + * lock.release() + * else + * if current.isInstanceOf[A] then + * current.asInstanceOf[A] + * else if current.isInstanceOf[NULL] then + * null + * else if current.isInstanceOf[Waiting] then + * current.asInstanceOf[Waiting].awaitRelease() + * else // `current` is Evaluating + * CAS(current, Evaluating, new Waiting) + * end while + * ``` + * + * @param methodSymbol the symbol of the new method + * @param claz the class containing this lazy val field + * @param target the target synthetic field + * @param rhs the right-hand side expression of the lazy val + * @param tp the type of the lazy val + * @param offset the offset of the field in the bitmap + * @param getFlag a flag for the volatile get function + * @param objCasFlag a flag for the CAS function operating on objects + * @param waiting a reference to the `Waiting` runtime class + * @param evaluating a reference to the `Evaluating` runtime object + * @param nullValued a reference to the `NULL` runtime object + */ def mkThreadSafeDef(methodSymbol: TermSymbol, claz: ClassSymbol, - ord: Int, target: Symbol, rhs: Tree, tp: Type, offset: Tree, - getFlag: Tree, - stateMask: Tree, - casFlag: Tree, - setFlagState: Tree, - waitOnLock: Tree)(using Context): DefDef = { - val initState = Literal(Constant(0)) - val computeState = Literal(Constant(1)) - val computedState = Literal(Constant(3)) - - val thiz = This(claz) - val fieldId = Literal(Constant(ord)) - - val flagSymbol = newSymbol(methodSymbol, lazyNme.flag, Synthetic, defn.LongType) - val flagDef = ValDef(flagSymbol, getFlag.appliedTo(thiz, offset)) - val flagRef = ref(flagSymbol) - - val stateSymbol = newSymbol(methodSymbol, lazyNme.state, Synthetic, defn.LongType) - val stateDef = ValDef(stateSymbol, stateMask.appliedTo(ref(flagSymbol), Literal(Constant(ord)))) - val stateRef = ref(stateSymbol) - - val compute = { - val resultSymbol = newSymbol(methodSymbol, lazyNme.result, Synthetic, tp) - val resultRef = ref(resultSymbol) - val stats = ( - ValDef(resultSymbol, rhs) :: - ref(target).becomes(resultRef) :: - (nullOut(nullableFor(methodSymbol)) :+ - setFlagState.appliedTo(thiz, offset, computedState, fieldId)) - ) - Block(stats, Return(resultRef, methodSymbol)) - } - - val retryCase = { - val caseSymbol = newSymbol(methodSymbol, nme.DEFAULT_EXCEPTION_NAME, Synthetic | Case, defn.ThrowableType) - val triggerRetry = setFlagState.appliedTo(thiz, offset, initState, fieldId) - CaseDef( - Bind(caseSymbol, ref(caseSymbol)), - EmptyTree, - Block(List(triggerRetry), Throw(ref(caseSymbol))) + objCasFlag: Tree, + waiting: Tree, + evaluating: Tree, + nullValued: Tree, + thiz: Tree)(using Context): DefDef = { + val discardSymb = newSymbol(methodSymbol, lazyNme.discard, Method | Synthetic, MethodType(Nil)(_ => Nil, _ => defn.UnitType)) + val discardDef = DefDef(discardSymb, initBlock( + objCasFlag.appliedTo(thiz, offset, evaluating, Select(New(waiting), StdNames.nme.CONSTRUCTOR).ensureApplied) + :: Return(unitLiteral, discardSymb) :: Nil)) + // if observed a null value + val unevaluated = { + // var res: AnyRef + val resSymb = newSymbol(methodSymbol, lazyNme.result, Synthetic | Mutable, defn.ObjectType) + // releasing block in finally + val lockRel = { + val lockSymb = newSymbol(methodSymbol, lazyNme.lock, Synthetic, waiting.typeOpt) + initBlock(ValDef(lockSymb, ref(target).cast(waiting.typeOpt)) + :: objCasFlag.appliedTo(thiz, offset, ref(lockSymb), ref(resSymb)) + :: ref(lockSymb).select(lazyNme.RLazyVals.waitingRelease).ensureApplied :: Nil) + } + // finally block + val fin = If( + objCasFlag.appliedTo(thiz, offset, evaluating, ref(resSymb)).equal(Literal(Constant(false))), + lockRel, + EmptyTree + ).withType(defn.UnitType) + // entire try block + val evaluate = Try( + initBlock( + Assign(ref(resSymb), if needsBoxing(tp) && rhs != EmptyTree then rhs.ensureConforms(boxIfCan(tp)) else rhs) // try result = rhs + :: nullOut(nullableFor(methodSymbol)) + ::: If(ref(resSymb).equal(nullLiteral), Assign(ref(resSymb), nullValued), EmptyTree).withType(defn.UnitType) // if result == null then result = NULL + :: Nil + ), + Nil, + fin ) + // if CAS(...) + If( + objCasFlag.appliedTo(thiz, offset, nullLiteral, evaluating), + initBlock(ValDef(resSymb, nullLiteral) // var result: AnyRef = null + :: evaluate // try ... finally ... + :: Nil), + EmptyTree + ).withType(defn.UnitType) } - - val initialize = If( - casFlag.appliedTo(thiz, offset, flagRef, computeState, fieldId), - Try(compute, List(retryCase), EmptyTree), - unitLiteral - ) - - val condition = If( - stateRef.equal(computedState), - Return(ref(target), methodSymbol), + val current = newSymbol(methodSymbol, lazyNme.current, Synthetic, defn.ObjectType) + val ifNotNull = If( - stateRef.equal(initState), - initialize, - waitOnLock.appliedTo(thiz, offset, flagRef, fieldId) + ref(current).select(defn.Any_isInstanceOf).appliedToType(if needsBoxing(tp) then boxIfCan(tp) else tp), + Return(ref(current).ensureConforms(tp), methodSymbol), + // not an A + If( + ref(current).select(defn.Any_isInstanceOf).appliedToTypeTree(nullValued), + Return(defaultValue(tp), methodSymbol), + // not a NULL + If( + ref(current).select(defn.Any_isInstanceOf).appliedToTypeTree(waiting), + ref(current).select(defn.Any_asInstanceOf).appliedToTypeTree(waiting).select(lazyNme.RLazyVals.waitingAwaitRelease).ensureApplied, + // not a Waiting, then is an Evaluating + ref(discardSymb).ensureApplied + ) + ) ) - ) - - val loop = WhileDo(EmptyTree, Block(List(flagDef, stateDef), condition)) - DefDef(methodSymbol, loop) + val body = initBlock(ValDef(current, ref(target)) :: If(ref(current).equal(nullLiteral), unevaluated, ifNotNull) :: Nil) + val mainLoop = WhileDo(EmptyTree, body) // becomes: while (true) do { body } + val ret = DefDef(methodSymbol, initBlock(discardDef :: mainLoop :: Nil)) + ret } def transformMemberDefThreadSafe(x: ValOrDefDef)(using Context): Thicket = { assert(!(x.symbol is Mutable)) - + import dotty.tools.dotc.core.Types._ + import dotty.tools.dotc.core.Flags._ + + val runtimeModule = "scala.runtime.LazyVals" val tpe = x.tpe.widen.resultType.widen val claz = x.symbol.owner.asClass val thizClass = Literal(Constant(claz.info)) - val helperModule = requiredModule("scala.runtime.LazyVals") + val helperModule = requiredModule(runtimeModule) val getOffset = Select(ref(helperModule), lazyNme.RLazyVals.getOffset) var offsetSymbol: TermSymbol = null - var flag: Tree = EmptyTree - var ord = 0 def offsetName(id: Int) = s"${StdNames.nme.LAZY_FIELD_OFFSET}${if (x.symbol.owner.is(Module)) "_m_" else ""}$id".toTermName - // compute or create appropriate offsetSymbol, bitmap and bits used by current ValDef - appendOffsetDefs.get(claz) match { + val containerName = LazyLocalName.fresh(x.name.asTermName) + val containerSymbol = newSymbol(claz, containerName, containerFlags, defn.ObjectType).enteredAfter(this) + containerSymbol.addAnnotation(Annotation(defn.VolatileAnnot)) // private @volatile var _x: AnyRef + val stat = x.symbol.isStatic + if stat then + containerSymbol.setFlag(JavaStatic) + val containerTree = ValDef(containerSymbol, nullLiteral) + def staticOrFieldOff: Tree = getOffset.appliedTo(thizClass, Literal(Constant(containerName.toString))) + + // create an offset for this lazy val + appendOffsetDefs.get(claz) match case Some(info) => - val flagsPerLong = (64 / scala.runtime.LazyVals.BITS_PER_LAZY_VAL).toInt - info.ord += 1 - ord = info.ord % flagsPerLong - val id = info.ord / flagsPerLong - val offsetById = offsetName(id) - if (ord != 0) // there are unused bits in already existing flag - offsetSymbol = claz.info.decl(offsetById) - .suchThat(sym => sym.is(Synthetic) && sym.isTerm) - .symbol.asTerm - else { // need to create a new flag - offsetSymbol = newSymbol(claz, offsetById, Synthetic, defn.LongType).enteredAfter(this) - offsetSymbol.addAnnotation(Annotation(defn.ScalaStaticAnnot)) - val flagName = LazyBitMapName.fresh(id.toString.toTermName) - val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType).enteredAfter(this) - flag = ValDef(flagSymbol, Literal(Constant(0L))) - val offsetTree = ValDef(offsetSymbol, getOffset.appliedTo(thizClass, Literal(Constant(flagName.toString)))) - info.defs = offsetTree :: info.defs - } - + offsetSymbol = newSymbol(claz, offsetName(info.defs.size), Synthetic, defn.LongType).enteredAfter(this) + offsetSymbol.addAnnotation(Annotation(defn.ScalaStaticAnnot)) + val offsetTree = ValDef(offsetSymbol, staticOrFieldOff) + info.defs = offsetTree :: info.defs case None => offsetSymbol = newSymbol(claz, offsetName(0), Synthetic, defn.LongType).enteredAfter(this) offsetSymbol.addAnnotation(Annotation(defn.ScalaStaticAnnot)) - val flagName = LazyBitMapName.fresh("0".toTermName) - val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType).enteredAfter(this) - flag = ValDef(flagSymbol, Literal(Constant(0L))) - val offsetTree = ValDef(offsetSymbol, getOffset.appliedTo(thizClass, Literal(Constant(flagName.toString)))) - appendOffsetDefs += (claz -> new OffsetInfo(List(offsetTree), ord)) - } - - val containerName = LazyLocalName.fresh(x.name.asTermName) - val containerSymbol = newSymbol(claz, containerName, x.symbol.flags &~ containerFlagsMask | containerFlags, tpe, coord = x.symbol.coord).enteredAfter(this) - - val containerTree = ValDef(containerSymbol, defaultValue(tpe)) - - val offset = ref(offsetSymbol) - val getFlag = Select(ref(helperModule), lazyNme.RLazyVals.get) - val setFlag = Select(ref(helperModule), lazyNme.RLazyVals.setFlag) - val wait = Select(ref(helperModule), lazyNme.RLazyVals.wait4Notification) - val state = Select(ref(helperModule), lazyNme.RLazyVals.state) - val cas = Select(ref(helperModule), lazyNme.RLazyVals.cas) - - val accessor = mkThreadSafeDef(x.symbol.asTerm, claz, ord, containerSymbol, x.rhs, tpe, offset, getFlag, state, cas, setFlag, wait) - if (flag eq EmptyTree) - Thicket(containerTree, accessor) - else Thicket(containerTree, flag, accessor) + val offsetTree = ValDef(offsetSymbol, staticOrFieldOff) + appendOffsetDefs += (claz -> new OffsetInfo(List(offsetTree))) + + val waiting = requiredClass(s"$runtimeModule.${lazyNme.RLazyVals.waiting}") + val evaluating = Select(ref(helperModule), lazyNme.RLazyVals.evaluating) + val nullValued = Select(ref(helperModule), lazyNme.RLazyVals.nullValued) + val objCas = Select(ref(helperModule), lazyNme.RLazyVals.objCas) + + val offset = ref(offsetSymbol) + + val swapOver = + if stat then + tpd.clsOf(x.symbol.owner.typeRef) + else + This(claz) + + val methodSymbol = x.symbol.asTerm + val accessor = mkThreadSafeDef(methodSymbol, claz, containerSymbol, x.rhs, tpe, offset, objCas, + ref(waiting), evaluating, nullValued, swapOver) + Thicket(containerTree, accessor) } } @@ -447,12 +499,14 @@ object LazyVals { import Names.TermName object RLazyVals { import scala.runtime.LazyVals.{Names => N} - val get: TermName = N.get.toTermName - val setFlag: TermName = N.setFlag.toTermName - val wait4Notification: TermName = N.wait4Notification.toTermName - val state: TermName = N.state.toTermName - val cas: TermName = N.cas.toTermName + val waiting: TermName = N.waiting.toTermName + val waitingAwaitRelease: TermName = N.waitingAwaitRelease.toTermName + val waitingRelease: TermName = N.waitingRelease.toTermName + val evaluating: TermName = N.evaluating.toTermName + val nullValued: TermName = N.nullValued.toTermName + val objCas: TermName = N.objCas.toTermName val getOffset: TermName = N.getOffset.toTermName + val getStaticOffset: TermName = N.getStaticOffset.toTermName } val flag: TermName = "flag".toTermName val state: TermName = "state".toTermName @@ -461,5 +515,8 @@ object LazyVals { val initialized: TermName = "initialized".toTermName val initialize: TermName = "initialize".toTermName val retry: TermName = "retry".toTermName + val current: TermName = "current".toTermName + val lock: TermName = "lock".toTermName + val discard: TermName = "discard".toTermName } } diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala index 85ca4f5cb3a0..0c1a6dd421e6 100644 --- a/library/src/scala/runtime/LazyVals.scala +++ b/library/src/scala/runtime/LazyVals.scala @@ -1,5 +1,7 @@ package scala.runtime +import java.lang.reflect.Modifier + /** * Helper methods used in thread-safe lazy vals. */ @@ -22,6 +24,7 @@ object LazyVals { val processors = java.lang.Runtime.getRuntime.nn.availableProcessors() 8 * processors * processors } + private[this] val monitors: Array[Object] = Array.tabulate(base)(_ => new Object) @@ -37,6 +40,41 @@ object LazyVals { /* ------------- Start of public API ------------- */ + /** + * Used to indicate the state of a lazy val that is being + * evaluated and of which other threads await the result. + */ + final class Waiting: + private var done = false + + /** + * Wakes up waiting threads. Called on completion of the evaluation + * of lazy val's right-hand side. + */ + def release(): Unit = synchronized { + done = true + notifyAll() + } + + /** + * Awaits the completion of the evaluation of lazy val's right-hand side. + */ + def awaitRelease(): Unit = synchronized { + while !done do wait() + } + + /** + * Used to indicate the state of a lazy val that is currently being + * evaluated with no other thread awaiting its result. + */ + object Evaluating + + /** + * Used to indicate the state of a lazy val that has been evaluated to + * `null`. + */ + object NULL + final val BITS_PER_LAZY_VAL = 2L def STATE(cur: Long, ord: Int): Long = { @@ -54,6 +92,12 @@ object LazyVals { unsafe.compareAndSwapLong(t, offset, e, n) } + def objCAS(t: Object, offset: Long, exp: Object, n: Object): Boolean = { + if (debug) + println(s"objCAS($t, $exp, $n)") + unsafe.compareAndSwapObject(t, offset, exp, n) + } + def setFlag(t: Object, offset: Long, v: Int, ord: Int): Unit = { if (debug) println(s"setFlag($t, $offset, $v, $ord)") @@ -100,18 +144,35 @@ object LazyVals { } def getOffset(clz: Class[_], name: String): Long = { - val r = unsafe.objectFieldOffset(clz.getDeclaredField(name)) if (debug) - println(s"getOffset($clz, $name) = $r") + clz.getDeclaredFields.foreach(println(_)) + val field = clz.getDeclaredField(name) + if java.lang.reflect.Modifier.isStatic(field.getModifiers()) then + unsafe.staticFieldOffset(field) + else + unsafe.objectFieldOffset(field) + } + + def getStaticOffset(clz: Class[_], name: String): Long = { + val r = unsafe.staticFieldOffset(clz.getDeclaredField(name)) + if (debug) + println(s"getStaticOffset($clz, $name) = $r") r } object Names { + final val waiting = "Waiting" + final val evaluating = "Evaluating" + final val nullValued = "NULL" + final val waitingAwaitRelease = "awaitRelease" + final val waitingRelease = "release" final val state = "STATE" final val cas = "CAS" + final val objCas = "objCAS" final val setFlag = "setFlag" final val wait4Notification = "wait4Notification" final val get = "get" final val getOffset = "getOffset" + final val getStaticOffset = "getStaticOffset" } } diff --git a/vscode-dotty/package-lock.json b/vscode-dotty/package-lock.json index 22e232900f01..e1c1e9906ad7 100644 --- a/vscode-dotty/package-lock.json +++ b/vscode-dotty/package-lock.json @@ -1,9 +1,1345 @@ { "name": "dotty", "version": "0.1.17-snapshot", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "dotty", + "version": "0.1.17-snapshot", + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "archiver": "^3.1.1", + "compare-versions": "^3.5.1", + "promisify-child-process": "^2.1.2", + "request": "^2.88.0", + "vscode-jsonrpc": "4.0.0", + "vscode-languageclient": "^5.2.1", + "vscode-languageserver": "^5.2.1", + "ws": "^6.2.1" + }, + "devDependencies": { + "@types/archiver": "^2.1.3", + "@types/compare-versions": "^3.0.0", + "@types/mocha": "^5.2.7", + "@types/node": "^10.14.18", + "@types/request": "^2.48.3", + "@types/ws": "^6.0.3", + "typescript": "^3.6.3", + "vscode": "^1.1.37" + }, + "engines": { + "vscode": "^1.30.0" + } + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/archiver": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-2.1.3.tgz", + "integrity": "sha512-x37dj6VvV8jArjvqvZP+qz5+24qOwgFesLMvn98uNz8qebjCg+uteqquRf9mqaxxhcM7S1vPl4YFhBs2/abcFQ==", + "dev": true, + "dependencies": { + "@types/glob": "*" + } + }, + "node_modules/@types/caseless": { + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz", + "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==", + "dev": true + }, + "node_modules/@types/compare-versions": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/compare-versions/-/compare-versions-3.0.0.tgz", + "integrity": "sha512-HNXtUQQuW3ThO9DVfTNbdvClVr+8AZlNNa2pxk5qtEvObnT27qh0DdQXTN4h5PuTTGinxwXkRKXsllJxuAzGPw==", + "dev": true + }, + "node_modules/@types/events": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", + "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", + "dev": true + }, + "node_modules/@types/glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "dev": true, + "dependencies": { + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "node_modules/@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "dev": true + }, + "node_modules/@types/mocha": { + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", + "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", + "dev": true + }, + "node_modules/@types/node": { + "version": "10.14.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.18.tgz", + "integrity": "sha512-ryO3Q3++yZC/+b8j8BdKd/dn9JlzlHBPdm80656xwYUdmPkpTGTjkAdt6BByiNupGPE8w0FhBgvYy/fX9hRNGQ==", + "dev": true + }, + "node_modules/@types/request": { + "version": "2.48.3", + "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.3.tgz", + "integrity": "sha512-3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==", + "dev": true, + "dependencies": { + "@types/caseless": "*", + "@types/node": "*", + "@types/tough-cookie": "*", + "form-data": "^2.5.0" + } + }, + "node_modules/@types/request/node_modules/form-data": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", + "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/@types/tough-cookie": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz", + "integrity": "sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==", + "dev": true + }, + "node_modules/@types/ws": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz", + "integrity": "sha512-yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/agent-base": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "dev": true, + "dependencies": { + "es6-promisify": "^5.0.0" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dependencies": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, + "node_modules/archiver": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-3.1.1.tgz", + "integrity": "sha512-5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg==", + "dependencies": { + "archiver-utils": "^2.1.0", + "async": "^2.6.3", + "buffer-crc32": "^0.2.1", + "glob": "^7.1.4", + "readable-stream": "^3.4.0", + "tar-stream": "^2.1.0", + "zip-stream": "^2.1.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/archiver-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", + "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", + "dependencies": { + "glob": "^7.1.4", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^2.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/archiver-utils/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, + "node_modules/async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" + }, + "node_modules/balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "node_modules/base64-js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/bl": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz", + "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==", + "dependencies": { + "readable-stream": "^3.0.1" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/buffer": { + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz", + "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==", + "dependencies": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "engines": { + "node": "*" + } + }, + "node_modules/buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/combined-stream": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", + "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "dev": true + }, + "node_modules/compare-versions": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz", + "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==" + }, + "node_modules/compress-commons": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz", + "integrity": "sha512-eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q==", + "dependencies": { + "buffer-crc32": "^0.2.13", + "crc32-stream": "^3.0.1", + "normalize-path": "^3.0.0", + "readable-stream": "^2.3.6" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/compress-commons/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "node_modules/crc": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", + "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", + "dependencies": { + "buffer": "^5.1.0" + } + }, + "node_modules/crc32-stream": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz", + "integrity": "sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==", + "dependencies": { + "crc": "^3.4.4", + "readable-stream": "^3.4.0" + }, + "engines": { + "node": ">= 6.9.0" + } + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", + "dev": true + }, + "node_modules/es6-promisify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "dev": true, + "dependencies": { + "es6-promise": "^4.0.3" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "engines": [ + "node >=0.6.0" + ] + }, + "node_modules/fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "engines": { + "node": "*" + } + }, + "node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==" + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true, + "engines": { + "node": ">=4.x" + } + }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz", + "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==", + "dependencies": { + "ajv": "^5.3.0", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/http-proxy-agent": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", + "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", + "dev": true, + "dependencies": { + "agent-base": "4", + "debug": "3.1.0" + }, + "engines": { + "node": ">= 4.5.0" + } + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/https-proxy-agent": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz", + "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==", + "dev": true, + "dependencies": { + "agent-base": "^4.3.0", + "debug": "^3.1.0" + }, + "engines": { + "node": ">= 4.5.0" + } + }, + "node_modules/ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "node_modules/json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "node_modules/json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "node_modules/jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "node_modules/lazystream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "dependencies": { + "readable-stream": "^2.0.5" + }, + "engines": { + "node": ">= 0.6.3" + } + }, + "node_modules/lazystream/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" + }, + "node_modules/lodash.difference": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=" + }, + "node_modules/lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "node_modules/lodash.union": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", + "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=" + }, + "node_modules/mime-db": { + "version": "1.37.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", + "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.21", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", + "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", + "dependencies": { + "mime-db": "~1.37.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "node_modules/mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "dependencies": { + "minimist": "0.0.8" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mocha": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", + "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", + "dev": true, + "dependencies": { + "browser-stdout": "1.3.1", + "commander": "2.15.1", + "debug": "3.1.0", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.2", + "growl": "1.10.5", + "he": "1.1.1", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "supports-color": "5.4.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/mocha/node_modules/glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "engines": { + "node": "*" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "node_modules/promisify-child-process": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-2.1.2.tgz", + "integrity": "sha512-j2BRwNaM7fUwrd67avtqSTRevQXZiqS+T4Ky3VVaQdvzkPpsTByBAv+ZyBxuXgV/eUrCe2qYrOZvPvd+sMryeg==", + "dependencies": { + "@types/node": "^10.11.3" + } + }, + "node_modules/promisify-child-process/node_modules/@types/node": { + "version": "10.12.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.0.tgz", + "integrity": "sha512-3TUHC3jsBAB7qVRGxT6lWyYo2v96BMmD2PTcl47H25Lu7UXtFH/2qqmKiVrnel6Ne//0TFYf6uvNX+HW2FRkLQ==" + }, + "node_modules/psl": { + "version": "1.1.29", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz", + "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==" + }, + "node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "node_modules/qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/readable-stream": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", + "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/request": { + "version": "2.88.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/semver": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sshpk": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz", + "integrity": "sha512-mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==", + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/tar-stream": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz", + "integrity": "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==", + "dependencies": { + "bl": "^3.0.0", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + } + }, + "node_modules/tough-cookie": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "dependencies": { + "psl": "^1.1.24", + "punycode": "^1.4.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "node_modules/typescript": { + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz", + "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "node_modules/uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/vscode": { + "version": "1.1.37", + "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.37.tgz", + "integrity": "sha512-vJNj6IlN7IJPdMavlQa1KoFB3Ihn06q1AiN3ZFI/HfzPNzbKZWPPuiU+XkpNOfGU5k15m4r80nxNPlM7wcc0wg==", + "deprecated": "This package is deprecated in favor of @types/vscode and vscode-test. For more information please read: https://code.visualstudio.com/updates/v1_36#_splitting-vscode-package-into-typesvscode-and-vscodetest", + "dev": true, + "license": "MIT", + "dependencies": { + "glob": "^7.1.2", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "mocha": "^5.2.0", + "semver": "^5.4.1", + "source-map-support": "^0.5.0", + "vscode-test": "^0.4.1" + }, + "bin": { + "vscode-install": "bin/install" + }, + "engines": { + "node": ">=8.9.3" + } + }, + "node_modules/vscode-jsonrpc": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz", + "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==", + "engines": { + "node": ">=8.0.0 || >=10.0.0" + } + }, + "node_modules/vscode-languageclient": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.2.1.tgz", + "integrity": "sha512-7jrS/9WnV0ruqPamN1nE7qCxn0phkH5LjSgSp9h6qoJGoeAKzwKz/PF6M+iGA/aklx4GLZg1prddhEPQtuXI1Q==", + "dependencies": { + "semver": "^5.5.0", + "vscode-languageserver-protocol": "3.14.1" + }, + "engines": { + "vscode": "^1.30" + } + }, + "node_modules/vscode-languageserver": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz", + "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==", + "dependencies": { + "vscode-languageserver-protocol": "3.14.1", + "vscode-uri": "^1.0.6" + }, + "bin": { + "installServerIntoExtension": "bin/installServerIntoExtension" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz", + "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==", + "dependencies": { + "vscode-jsonrpc": "^4.0.0", + "vscode-languageserver-types": "3.14.0" + } + }, + "node_modules/vscode-languageserver-types": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz", + "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==" + }, + "node_modules/vscode-test": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-0.4.3.tgz", + "integrity": "sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w==", + "dev": true, + "dependencies": { + "http-proxy-agent": "^2.1.0", + "https-proxy-agent": "^2.2.1" + }, + "engines": { + "node": ">=8.9.3" + } + }, + "node_modules/vscode-uri": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.6.tgz", + "integrity": "sha512-sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww==" + }, + "node_modules/vscode/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/vscode/node_modules/debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/vscode/node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/vscode/node_modules/https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dev": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/vscode/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "node_modules/ws": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "dependencies": { + "async-limiter": "~1.0.0" + } + }, + "node_modules/zip-stream": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.2.tgz", + "integrity": "sha512-ykebHGa2+uzth/R4HZLkZh3XFJzivhVsjJt8bN3GvBzLaqqrUdRacu+c4QtnUgjkkQfsOuNE1JgLKMCPNmkKgg==", + "dependencies": { + "archiver-utils": "^2.1.0", + "compress-commons": "^2.1.1", + "readable-stream": "^3.4.0" + }, + "engines": { + "node": ">= 6" + } + } + }, "dependencies": { + "@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true + }, "@types/archiver": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-2.1.3.tgz", @@ -810,12 +2146,6 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, - "querystringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz", - "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==", - "dev": true - }, "readable-stream": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", @@ -853,12 +2183,6 @@ "uuid": "^3.3.2" } }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", - "dev": true - }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -963,16 +2287,6 @@ "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==", "dev": true }, - "url-parse": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", - "dev": true, - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -994,18 +2308,65 @@ } }, "vscode": { - "version": "1.1.36", - "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.36.tgz", - "integrity": "sha512-cGFh9jmGLcTapCpPCKvn8aG/j9zVQ+0x5hzYJq5h5YyUXVGa1iamOaB2M2PZXoumQPES4qeAP1FwkI0b6tL4bQ==", + "version": "1.1.37", + "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.37.tgz", + "integrity": "sha512-vJNj6IlN7IJPdMavlQa1KoFB3Ihn06q1AiN3ZFI/HfzPNzbKZWPPuiU+XkpNOfGU5k15m4r80nxNPlM7wcc0wg==", "dev": true, "requires": { "glob": "^7.1.2", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", "mocha": "^5.2.0", - "request": "^2.88.0", "semver": "^5.4.1", "source-map-support": "^0.5.0", - "url-parse": "^1.4.4", "vscode-test": "^0.4.1" + }, + "dependencies": { + "agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "requires": { + "debug": "4" + } + }, + "debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "requires": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + } + }, + "https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dev": true, + "requires": { + "agent-base": "6", + "debug": "4" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "vscode-jsonrpc": { diff --git a/vscode-dotty/package.json b/vscode-dotty/package.json index 6cfe08d6f685..af7b08fed4f6 100644 --- a/vscode-dotty/package.json +++ b/vscode-dotty/package.json @@ -133,6 +133,6 @@ "@types/request": "^2.48.3", "@types/ws": "^6.0.3", "typescript": "^3.6.3", - "vscode": "^1.1.36" + "vscode": "^1.1.37" } } From 14b37e457d2446068b3c3e5d6384f9487cceec69 Mon Sep 17 00:00:00 2001 From: olsdavis Date: Sat, 12 Mar 2022 11:46:28 +0000 Subject: [PATCH 0002/1244] Reorder to avoid type erasure to Object issue + fix test --- .../dotty/tools/dotc/transform/LazyVals.scala | 18 +++++++++--------- .../tools/backend/jvm/DottyBytecodeTests.scala | 2 +- library/src/scala/runtime/LazyVals.scala | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala index 6126bc9b3e0b..f737098469f4 100644 --- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala @@ -335,14 +335,14 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { * CAS(_x, lock, result) * lock.release() * else - * if current.isInstanceOf[A] then - * current.asInstanceOf[A] + * if current.isInstanceOf[Evaluating] then + * CAS(current, Evaluating, new Waiting) * else if current.isInstanceOf[NULL] then * null * else if current.isInstanceOf[Waiting] then * current.asInstanceOf[Waiting].awaitRelease() - * else // `current` is Evaluating - * CAS(current, Evaluating, new Waiting) + * else + * current.asInstanceOf[A] * end while * ``` * @@ -413,9 +413,9 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { val current = newSymbol(methodSymbol, lazyNme.current, Synthetic, defn.ObjectType) val ifNotNull = If( - ref(current).select(defn.Any_isInstanceOf).appliedToType(if needsBoxing(tp) then boxIfCan(tp) else tp), - Return(ref(current).ensureConforms(tp), methodSymbol), - // not an A + ref(current).select(defn.Any_isInstanceOf).appliedToTypeTree(evaluating), + ref(discardSymb).ensureApplied, + // not an Evaluating If( ref(current).select(defn.Any_isInstanceOf).appliedToTypeTree(nullValued), Return(defaultValue(tp), methodSymbol), @@ -423,8 +423,8 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { If( ref(current).select(defn.Any_isInstanceOf).appliedToTypeTree(waiting), ref(current).select(defn.Any_asInstanceOf).appliedToTypeTree(waiting).select(lazyNme.RLazyVals.waitingAwaitRelease).ensureApplied, - // not a Waiting, then is an Evaluating - ref(discardSymb).ensureApplied + // not a Waiting, then is an A + Return(ref(current).ensureConforms(tp), methodSymbol) ) ) ) diff --git a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala index 9d6ff413f8a2..83b84496f1f5 100644 --- a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala +++ b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala @@ -595,7 +595,7 @@ class TestBCode extends DottyBytecodeTest { val clsIn = dir.lookupName("Test.class", directory = false).input val clsNode = loadClassNode(clsIn) val method = getMethod(clsNode, "test") - assertEquals(94, instructionsFromMethod(method).size) + assertEquals(122, instructionsFromMethod(method).size) } } diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala index 0c1a6dd421e6..59c05029a11e 100644 --- a/library/src/scala/runtime/LazyVals.scala +++ b/library/src/scala/runtime/LazyVals.scala @@ -145,9 +145,9 @@ object LazyVals { def getOffset(clz: Class[_], name: String): Long = { if (debug) - clz.getDeclaredFields.foreach(println(_)) + clz.getDeclaredFields.nn.foreach(println(_)) val field = clz.getDeclaredField(name) - if java.lang.reflect.Modifier.isStatic(field.getModifiers()) then + if java.lang.reflect.Modifier.isStatic(field.nn.getModifiers()) then unsafe.staticFieldOffset(field) else unsafe.objectFieldOffset(field) From 91c03b1f7835d574290eba1ecf236e0f59fc2bf0 Mon Sep 17 00:00:00 2001 From: olsdavis Date: Mon, 4 Apr 2022 19:48:02 +0100 Subject: [PATCH 0003/1244] Keeping code for old release compatibility --- .../dotty/tools/dotc/transform/LazyVals.scala | 209 +++++++++++++++++- library/src/scala/runtime/LazyVals.scala | 9 +- project/MiMaFilters.scala | 19 +- tests/run/lazyVals_c3.0.0.check | 4 + tests/run/lazyVals_c3.0.0.scala | 13 ++ tests/run/lazyVals_c3.1.0.check | 4 + tests/run/lazyVals_c3.1.0.scala | 13 ++ 7 files changed, 255 insertions(+), 16 deletions(-) create mode 100644 tests/run/lazyVals_c3.0.0.check create mode 100644 tests/run/lazyVals_c3.0.0.scala create mode 100644 tests/run/lazyVals_c3.1.0.check create mode 100644 tests/run/lazyVals_c3.1.0.scala diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala index f737098469f4..061789fd3865 100644 --- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala @@ -27,7 +27,13 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { * The map contains the list of the offset trees. */ class OffsetInfo(var defs: List[Tree]) + /** + * This map contains mutable state of transformation: OffsetDefs to be appended + * to companion object definitions, and number of bits currently used. + */ + class OldOffsetInfo(defs: List[Tree], var ord: Int) extends OffsetInfo(defs) private val appendOffsetDefs = mutable.Map.empty[Symbol, OffsetInfo] + private val oldAppendOffsetDefs = mutable.Map.empty[Symbol, OldOffsetInfo] override def phaseName: String = LazyVals.name @@ -53,6 +59,10 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { else nullables.toList } + private inline def isOldLazyVals(using ctx: Context): Boolean = + import dotty.tools.dotc.config.ScalaRelease._ + ctx.scalaRelease <= Release3_1 + private def initBlock(stats: List[Tree])(using Context): Block = stats match case Nil => throw new IllegalArgumentException("trying to create an empty Block") case x :: Nil => Block(List(x), EmptyTree) @@ -111,12 +121,13 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { } } - /** Append offset fields to companion objects - */ + /** + * Append offset fields to companion objects. + */ override def transformTemplate(template: Template)(using Context): Tree = { val cls = ctx.owner.asClass - - appendOffsetDefs.get(cls) match { + + (if isOldLazyVals then oldAppendOffsetDefs else appendOffsetDefs).get(cls) match { case None => template case Some(data) => data.defs.foreach(_.symbol.addAnnotation(Annotation(defn.ScalaStaticAnnot))) @@ -282,6 +293,16 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { } } + def transformMemberDefThreadSafe(x: ValOrDefDef)(using Context): Thicket = { + assert(!(x.symbol is Mutable)) + // generate old code for compatibility + // TODO find more meaningful names than old/new + if isOldLazyVals then + transformMemberDefThreadSafeOld(x) + else + transformMemberDefThreadSafeNew(x) + } + /** * Create a threadsafe lazy accessor equivalent to the following code: * ``` @@ -358,7 +379,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { * @param evaluating a reference to the `Evaluating` runtime object * @param nullValued a reference to the `NULL` runtime object */ - def mkThreadSafeDef(methodSymbol: TermSymbol, + def mkThreadSafeDefNew(methodSymbol: TermSymbol, claz: ClassSymbol, target: Symbol, rhs: Tree, @@ -434,8 +455,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { ret } - def transformMemberDefThreadSafe(x: ValOrDefDef)(using Context): Thicket = { - assert(!(x.symbol is Mutable)) + def transformMemberDefThreadSafeNew(x: ValOrDefDef)(using Context): Thicket = { import dotty.tools.dotc.core.Types._ import dotty.tools.dotc.core.Flags._ @@ -444,7 +464,6 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { val claz = x.symbol.owner.asClass val thizClass = Literal(Constant(claz.info)) val helperModule = requiredModule(runtimeModule) - val getOffset = Select(ref(helperModule), lazyNme.RLazyVals.getOffset) var offsetSymbol: TermSymbol = null def offsetName(id: Int) = s"${StdNames.nme.LAZY_FIELD_OFFSET}${if (x.symbol.owner.is(Module)) "_m_" else ""}$id".toTermName @@ -455,6 +474,11 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { val stat = x.symbol.isStatic if stat then containerSymbol.setFlag(JavaStatic) + val getOffset = + if stat then + Select(ref(helperModule), lazyNme.RLazyVals.getStaticOffset) + else + Select(ref(helperModule), lazyNme.RLazyVals.getOffset) val containerTree = ValDef(containerSymbol, nullLiteral) def staticOrFieldOff: Tree = getOffset.appliedTo(thizClass, Literal(Constant(containerName.toString))) @@ -485,10 +509,172 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { This(claz) val methodSymbol = x.symbol.asTerm - val accessor = mkThreadSafeDef(methodSymbol, claz, containerSymbol, x.rhs, tpe, offset, objCas, + val accessor = mkThreadSafeDefNew(methodSymbol, claz, containerSymbol, x.rhs, tpe, offset, objCas, ref(waiting), evaluating, nullValued, swapOver) Thicket(containerTree, accessor) } + + /** Create a threadsafe lazy accessor equivalent to such code + * ``` + * def methodSymbol(): Int = { + * while (true) { + * val flag = LazyVals.get(this, bitmap_offset) + * val state = LazyVals.STATE(flag, ) + * + * if (state == ) { + * return value_0 + * } else if (state == ) { + * if (LazyVals.CAS(this, bitmap_offset, flag, , )) { + * try { + * val result = + * value_0 = result + * nullable = null + * LazyVals.setFlag(this, bitmap_offset, , ) + * return result + * } + * catch { + * case ex => + * LazyVals.setFlag(this, bitmap_offset, , ) + * throw ex + * } + * } + * } else /* if (state == || state == ) */ { + * LazyVals.wait4Notification(this, bitmap_offset, flag, ) + * } + * } + * } + * ``` + */ + def mkThreadSafeDefOld(methodSymbol: TermSymbol, + claz: ClassSymbol, + ord: Int, + target: Symbol, + rhs: Tree, + tp: Type, + offset: Tree, + getFlag: Tree, + stateMask: Tree, + casFlag: Tree, + setFlagState: Tree, + waitOnLock: Tree)(using Context): DefDef = { + val initState = Literal(Constant(0)) + val computeState = Literal(Constant(1)) + val computedState = Literal(Constant(3)) + + val thiz = This(claz) + val fieldId = Literal(Constant(ord)) + + val flagSymbol = newSymbol(methodSymbol, lazyNme.flag, Synthetic, defn.LongType) + val flagDef = ValDef(flagSymbol, getFlag.appliedTo(thiz, offset)) + val flagRef = ref(flagSymbol) + + val stateSymbol = newSymbol(methodSymbol, lazyNme.state, Synthetic, defn.LongType) + val stateDef = ValDef(stateSymbol, stateMask.appliedTo(ref(flagSymbol), Literal(Constant(ord)))) + val stateRef = ref(stateSymbol) + + val compute = { + val resultSymbol = newSymbol(methodSymbol, lazyNme.result, Synthetic, tp) + val resultRef = ref(resultSymbol) + val stats = ( + ValDef(resultSymbol, rhs) :: + ref(target).becomes(resultRef) :: + (nullOut(nullableFor(methodSymbol)) :+ + setFlagState.appliedTo(thiz, offset, computedState, fieldId)) + ) + Block(stats, Return(resultRef, methodSymbol)) + } + + val retryCase = { + val caseSymbol = newSymbol(methodSymbol, nme.DEFAULT_EXCEPTION_NAME, Synthetic | Case, defn.ThrowableType) + val triggerRetry = setFlagState.appliedTo(thiz, offset, initState, fieldId) + CaseDef( + Bind(caseSymbol, ref(caseSymbol)), + EmptyTree, + Block(List(triggerRetry), Throw(ref(caseSymbol))) + ) + } + + val initialize = If( + casFlag.appliedTo(thiz, offset, flagRef, computeState, fieldId), + Try(compute, List(retryCase), EmptyTree), + unitLiteral + ) + + val condition = If( + stateRef.equal(computedState), + Return(ref(target), methodSymbol), + If( + stateRef.equal(initState), + initialize, + waitOnLock.appliedTo(thiz, offset, flagRef, fieldId) + ) + ) + + val loop = WhileDo(EmptyTree, Block(List(flagDef, stateDef), condition)) + DefDef(methodSymbol, loop) + } + + def transformMemberDefThreadSafeOld(x: ValOrDefDef)(using Context): Thicket = { + val tpe = x.tpe.widen.resultType.widen + val claz = x.symbol.owner.asClass + val thizClass = Literal(Constant(claz.info)) + val helperModule = requiredModule("scala.runtime.LazyVals") + val getOffset = Select(ref(helperModule), lazyNme.RLazyVals.getOffset) + var offsetSymbol: TermSymbol | Null = null + var flag: Tree = EmptyTree + var ord = 0 + + def offsetName(id: Int) = s"${StdNames.nme.LAZY_FIELD_OFFSET}${if (x.symbol.owner.is(Module)) "_m_" else ""}$id".toTermName + + // compute or create appropriate offsetSymbol, bitmap and bits used by current ValDef + oldAppendOffsetDefs.get(claz) match { + case Some(info) => + val flagsPerLong = (64 / scala.runtime.LazyVals.BITS_PER_LAZY_VAL).toInt + info.ord += 1 + ord = info.ord % flagsPerLong + val id = info.ord / flagsPerLong + val offsetById = offsetName(id) + if (ord != 0) // there are unused bits in already existing flag + offsetSymbol = claz.info.decl(offsetById) + .suchThat(sym => sym.is(Synthetic) && sym.isTerm) + .symbol.asTerm + else { // need to create a new flag + offsetSymbol = newSymbol(claz, offsetById, Synthetic, defn.LongType).enteredAfter(this) + offsetSymbol.nn.addAnnotation(Annotation(defn.ScalaStaticAnnot)) + val flagName = LazyBitMapName.fresh(id.toString.toTermName) + val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType).enteredAfter(this) + flag = ValDef(flagSymbol, Literal(Constant(0L))) + val offsetTree = ValDef(offsetSymbol.nn, getOffset.appliedTo(thizClass, Literal(Constant(flagName.toString)))) + info.defs = offsetTree :: info.defs + } + + case None => + offsetSymbol = newSymbol(claz, offsetName(0), Synthetic, defn.LongType).enteredAfter(this) + offsetSymbol.nn.addAnnotation(Annotation(defn.ScalaStaticAnnot)) + val flagName = LazyBitMapName.fresh("0".toTermName) + val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType).enteredAfter(this) + flag = ValDef(flagSymbol, Literal(Constant(0L))) + val offsetTree = ValDef(offsetSymbol.nn, getOffset.appliedTo(thizClass, Literal(Constant(flagName.toString)))) + oldAppendOffsetDefs += (claz -> new OldOffsetInfo(List(offsetTree), ord)) + } + + val containerName = LazyLocalName.fresh(x.name.asTermName) + val containerSymbol = newSymbol(claz, containerName, x.symbol.flags &~ containerFlagsMask | containerFlags, tpe, coord = x.symbol.coord).enteredAfter(this) + + val containerTree = ValDef(containerSymbol, defaultValue(tpe)) + + val offset = ref(offsetSymbol.nn) + val getFlag = Select(ref(helperModule), lazyNme.RLazyVals.get) + val setFlag = Select(ref(helperModule), lazyNme.RLazyVals.setFlag) + val wait = Select(ref(helperModule), lazyNme.RLazyVals.wait4Notification) + val state = Select(ref(helperModule), lazyNme.RLazyVals.state) + val cas = Select(ref(helperModule), lazyNme.RLazyVals.cas) + + val accessor = mkThreadSafeDefOld(x.symbol.asTerm, claz, ord, containerSymbol, x.rhs, tpe, offset, getFlag, state, cas, setFlag, wait) + if (flag eq EmptyTree) + Thicket(containerTree, accessor) + else Thicket(containerTree, flag, accessor) + } } object LazyVals { @@ -507,6 +693,11 @@ object LazyVals { val objCas: TermName = N.objCas.toTermName val getOffset: TermName = N.getOffset.toTermName val getStaticOffset: TermName = N.getStaticOffset.toTermName + val get: TermName = N.get.toTermName + val setFlag: TermName = N.setFlag.toTermName + val wait4Notification: TermName = N.wait4Notification.toTermName + val state: TermName = N.state.toTermName + val cas: TermName = N.cas.toTermName } val flag: TermName = "flag".toTermName val state: TermName = "state".toTermName diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala index 59c05029a11e..1713fbe141ff 100644 --- a/library/src/scala/runtime/LazyVals.scala +++ b/library/src/scala/runtime/LazyVals.scala @@ -144,13 +144,10 @@ object LazyVals { } def getOffset(clz: Class[_], name: String): Long = { + val r = unsafe.objectFieldOffset(clz.getDeclaredField(name)) if (debug) - clz.getDeclaredFields.nn.foreach(println(_)) - val field = clz.getDeclaredField(name) - if java.lang.reflect.Modifier.isStatic(field.nn.getModifiers()) then - unsafe.staticFieldOffset(field) - else - unsafe.objectFieldOffset(field) + println(s"getOffset($clz, $name) = $r") + r } def getStaticOffset(clz: Class[_], name: String): Long = { diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index cac81eecc141..c6bf9cdd6471 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -19,6 +19,23 @@ object MiMaFilters { ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#CompilationInfoModule.XmacroSettings"), // Private to the compiler - needed for forward binary compatibility - ProblemFilters.exclude[MissingClassProblem]("scala.annotation.since") + ProblemFilters.exclude[MissingClassProblem]("scala.annotation.since"), + + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.objCAS"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.objCAS"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.evaluating"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.getStaticOffset"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.nullValued"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.objCas"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waiting"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waitingAwaitRelease"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waitingRelease"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Evaluating$"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$NULL$"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Waiting"), + ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.LazyVals.Evaluating"), + ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.LazyVals.NULL") ) } diff --git a/tests/run/lazyVals_c3.0.0.check b/tests/run/lazyVals_c3.0.0.check new file mode 100644 index 000000000000..a0aad90603ed --- /dev/null +++ b/tests/run/lazyVals_c3.0.0.check @@ -0,0 +1,4 @@ +computing x +x +computing y +y \ No newline at end of file diff --git a/tests/run/lazyVals_c3.0.0.scala b/tests/run/lazyVals_c3.0.0.scala new file mode 100644 index 000000000000..5df4069bc94c --- /dev/null +++ b/tests/run/lazyVals_c3.0.0.scala @@ -0,0 +1,13 @@ +// Compiled with 3.0.0 and run with current compiler +class Foo: + lazy val x = + println("computing x") + "x" + lazy val y = + println("computing y") + "y" + +@main def Test = + val foo = new Foo + println(foo.x) + println(foo.y) diff --git a/tests/run/lazyVals_c3.1.0.check b/tests/run/lazyVals_c3.1.0.check new file mode 100644 index 000000000000..a0aad90603ed --- /dev/null +++ b/tests/run/lazyVals_c3.1.0.check @@ -0,0 +1,4 @@ +computing x +x +computing y +y \ No newline at end of file diff --git a/tests/run/lazyVals_c3.1.0.scala b/tests/run/lazyVals_c3.1.0.scala new file mode 100644 index 000000000000..45e796ab46d3 --- /dev/null +++ b/tests/run/lazyVals_c3.1.0.scala @@ -0,0 +1,13 @@ +// Compiled with 3.1.0 and run with current compiler +class Foo: + lazy val x = + println("computing x") + "x" + lazy val y = + println("computing y") + "y" + +@main def Test = + val foo = new Foo + println(foo.x) + println(foo.y) \ No newline at end of file From b563979396e102f725553c7cdffd9f44c6426759 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 15 Jul 2021 12:54:30 +0200 Subject: [PATCH 0004/1244] Fix definition of enclosingExtensionMethod Now also finds enclosing methods outside the current class. Fixes #13075 --- .../tools/dotc/core/SymDenotations.scala | 3 +- tests/neg/i13075.scala | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 tests/neg/i13075.scala diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala index 112bd182b1ad..df2c195b9e74 100644 --- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala @@ -1140,11 +1140,10 @@ object SymDenotations { else NoSymbol /** The closest enclosing extension method containing this definition, - * provided the extension method appears in the same class. + * including methods outside the current class. */ final def enclosingExtensionMethod(using Context): Symbol = if this.is(ExtensionMethod) then symbol - else if this.isClass then NoSymbol else if this.exists then owner.enclosingExtensionMethod else NoSymbol diff --git a/tests/neg/i13075.scala b/tests/neg/i13075.scala new file mode 100644 index 000000000000..2a5ff70c0481 --- /dev/null +++ b/tests/neg/i13075.scala @@ -0,0 +1,40 @@ +object Implementing_Tuples: + + sealed trait Tup + case class ConsTup[T, H <: Tup](head: T, tail: H) extends Tup + case object EmptyTup extends Tup + + val *: = ConsTup // for unapply + type *:[H, T <: Tup] = ConsTup[H, T] // for type matching + type EmptyTup = EmptyTup.type // for type matching + + extension [H](head: H) + def *:[T <: Tup](tail: T) = ConsTup(head, tail) + + type Fold[T <: Tup, Seed, F[_,_]] = T match + case EmptyTup => Seed + case h *: t => Fold[t, F[Seed, h], F] + + extension [T <: Tup](v: T) + def fold[Seed, F[_,_]](seed: Seed)( + fn: [C, Acc] => (C, Acc) => F[C, Acc] + ): Fold[T, Seed, F] = + (v match + case EmptyTup => seed + case h *: t => t.fold(fn(h, seed))(fn) + ).asInstanceOf[Fold[T, Seed, F]] + + extension [T <: Tup](v: T) def reversed: Tup = + v.fold[EmptyTup, [C, Acc] =>> Acc match { + case h *: t => C *: h *: t + }](EmptyTup)( + [C, Acc] => (c: C, acc: Acc) => acc match + case _@(_ *: _) => c *: acc // error + ) + + @main def testProperFold = + val t = (1 *: '2' *: "foo" *: EmptyTup) + val reversed: (String *: Char *: Int *: EmptyTup) = t.reversed // error + println(reversed) + +end Implementing_Tuples \ No newline at end of file From 1e4766870e567e334efbb955dfdfaff97c35d03a Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 24 Mar 2021 16:19:48 +0100 Subject: [PATCH 0005/1244] Fix #11318: add regression test --- tests/pos/i11318a.scala | 4 ++++ tests/pos/i11318b.scala | 13 +++++++++++++ tests/pos/i11318c.scala | 6 ++++++ 3 files changed, 23 insertions(+) create mode 100644 tests/pos/i11318a.scala create mode 100644 tests/pos/i11318b.scala create mode 100644 tests/pos/i11318c.scala diff --git a/tests/pos/i11318a.scala b/tests/pos/i11318a.scala new file mode 100644 index 000000000000..6422b32a375e --- /dev/null +++ b/tests/pos/i11318a.scala @@ -0,0 +1,4 @@ +extension(a: Int) + def b: Int = ??? + def h: Unit = + [A] => (r: Int) => b diff --git a/tests/pos/i11318b.scala b/tests/pos/i11318b.scala new file mode 100644 index 000000000000..b8bf2203d218 --- /dev/null +++ b/tests/pos/i11318b.scala @@ -0,0 +1,13 @@ +type FunctionK[A[_], B[_]] = [Z] => A[Z] => B[Z] +type ~>:[A[_], B[_]] = FunctionK[A, B] + +trait RepresentableK[F[_[_], _]]: + type RepresentationK[_] + + def tabulateK[A[_], C](f: RepresentationK ~>: A): F[A, C] + + extension[A[_], C](fa: F[A, C]) + def indexK: RepresentationK ~>: A + + def mapK[B[_]] (f: A ~>: B): F[B, C] = + tabulateK([Z] => (r: RepresentationK[Z]) => f(indexK(r))) diff --git a/tests/pos/i11318c.scala b/tests/pos/i11318c.scala new file mode 100644 index 000000000000..b1da38d7f6da --- /dev/null +++ b/tests/pos/i11318c.scala @@ -0,0 +1,6 @@ +extension(a: Int) + def b: Int = ??? + def h: Unit = + new Function1[Int, Int] { + def apply(r: Int): Int = b + } From 7b6b5d2bf077237b200db294936c57e724ca5f19 Mon Sep 17 00:00:00 2001 From: Boris Date: Fri, 16 Jul 2021 19:57:51 +0200 Subject: [PATCH 0006/1244] community build: Add monocle. (#11468) --- .gitmodules | 3 +++ community-build/community-projects/Monocle | 1 + .../src/scala/dotty/communitybuild/projects.scala | 7 +++++++ .../scala/dotty/communitybuild/CommunityBuildTest.scala | 1 + 4 files changed, 12 insertions(+) create mode 160000 community-build/community-projects/Monocle diff --git a/.gitmodules b/.gitmodules index 9a85a0254e85..e2584fc8396e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -180,6 +180,9 @@ [submodule "community-build/community-projects/protoquill"] path = community-build/community-projects/protoquill url = https://github.com/dotty-staging/protoquill.git +[submodule "community-build/community-projects/Monocle"] + path = community-build/community-projects/Monocle + url = https://github.com/dotty-staging/Monocle.git [submodule "community-build/community-projects/onnx-scala"] path = community-build/community-projects/onnx-scala url = https://github.com/dotty-staging/onnx-scala.git diff --git a/community-build/community-projects/Monocle b/community-build/community-projects/Monocle new file mode 160000 index 000000000000..4613afff874c --- /dev/null +++ b/community-build/community-projects/Monocle @@ -0,0 +1 @@ +Subproject commit 4613afff874c23d17bde580671ff29c7a13123d0 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 6128796bbff7..583dd0e94d37 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -660,6 +660,12 @@ object projects: dependencies = List(scalatest, scalatestplusJunit, scalatestplusScalacheck) ) + lazy val monocle = SbtCommunityProject( + project = "Monocle", + sbtTestCommand = "coreJVM/test; macrosJVM/test; testJVM/test", + dependencies = List(cats, munit, discipline, disciplineMunit) + ) + lazy val protoquill = SbtCommunityProject( project = "protoquill", sbtTestCommand = "test", @@ -777,6 +783,7 @@ def allProjects = List( projects.izumiReflect, projects.perspective, projects.akka, + projects.monocle, projects.protoquill, projects.onnxScala, projects.playJson, diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index e5a77ff33c4f..507920c7cc4b 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -127,6 +127,7 @@ class CommunityBuildTestB extends CommunityBuildTest: @Test def scalacheckEffect = projects.scalacheckEffect.run() @Test def scodec = projects.scodec.run() @Test def scodecBits = projects.scodecBits.run() + @Test def monocle = projects.monocle.run() @Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run() end CommunityBuildTestB From 7779fbb72f3a3843f38a17bce6d74a1f74b289b5 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Tue, 20 Jul 2021 14:21:26 +0200 Subject: [PATCH 0007/1244] Fix MatchError in Scaladoc Scalajs script --- scaladoc-js/src/searchbar/code-snippets/CodeSnippets.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/scaladoc-js/src/searchbar/code-snippets/CodeSnippets.scala b/scaladoc-js/src/searchbar/code-snippets/CodeSnippets.scala index 50f0ad2d5df7..c8121b31860d 100644 --- a/scaladoc-js/src/searchbar/code-snippets/CodeSnippets.scala +++ b/scaladoc-js/src/searchbar/code-snippets/CodeSnippets.scala @@ -24,4 +24,5 @@ class CodeSnippets: }) a.classList.add("snippet-comment-button") e.insertBefore(a, e.firstChild) + case e => // skip } From ea9371fd1731703a81aea58c40c4908ff891dde7 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 16 Jul 2021 09:59:53 +0200 Subject: [PATCH 0008/1244] Add explanation to "already defined" message Fixes #13089 --- .../dotty/tools/dotc/reporting/messages.scala | 6 +++++- tests/neg/i13089.check | 12 +++++++++++ tests/neg/i13089.scala | 21 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 tests/neg/i13089.check create mode 100644 tests/neg/i13089.scala diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala index fb7c6d41e885..0e47c4a1ff57 100644 --- a/compiler/src/dotty/tools/dotc/reporting/messages.scala +++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala @@ -1861,11 +1861,15 @@ import transform.SymUtils._ i" in ${conflicting.associatedFile}" else if conflicting.owner == owner then "" else i" in ${conflicting.owner}" + private def note = + if owner.is(Method) || conflicting.is(Method) then + "\n\nNote that overloaded methods must all be defined in the same group of toplevel definitions" + else "" def msg = if conflicting.isTerm != name.isTermName then em"$name clashes with $conflicting$where; the two must be defined together" else - em"$name is already defined as $conflicting$where" + em"$name is already defined as $conflicting$where$note" def explain = "" class PackageNameAlreadyDefined(pkg: Symbol)(using Context) extends NamingMsg(PackageNameAlreadyDefinedID) { diff --git a/tests/neg/i13089.check b/tests/neg/i13089.check new file mode 100644 index 000000000000..ed0f9d5effd9 --- /dev/null +++ b/tests/neg/i13089.check @@ -0,0 +1,12 @@ +-- [E161] Naming Error: tests/neg/i13089.scala:6:8 --------------------------------------------------------------------- +6 | def fails : Unit = {} // error + | ^^^^^^^^^^^^^^^^^^^^^ + | fails is already defined as method fails in tests/neg/i13089.scala + | + | Note that overloaded methods must all be defined in the same group of toplevel definitions +-- [E161] Naming Error: tests/neg/i13089.scala:8:6 --------------------------------------------------------------------- +8 | def baz(x: String): Boolean = true // error + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | baz is already defined as method baz in tests/neg/i13089.scala + | + | Note that overloaded methods must all be defined in the same group of toplevel definitions diff --git a/tests/neg/i13089.scala b/tests/neg/i13089.scala new file mode 100644 index 000000000000..5b91996de837 --- /dev/null +++ b/tests/neg/i13089.scala @@ -0,0 +1,21 @@ +package pkg: + + trait Bar + + extension (bar : Bar) + def fails : Unit = {} // error + + def baz(x: String): Boolean = true // error + +package pkg: + + trait Foo + extension (foo : Foo) + def fails : Unit = {} + def works : Unit = {} + + extension (bar : Bar) + def works : Unit = {} + + def baz(x: Int): Boolean = true + From b8fc378301d3980dbf0bd1abb078ad0c8ad7f8b0 Mon Sep 17 00:00:00 2001 From: Kacper Korban Date: Tue, 20 Jul 2021 18:45:34 +0200 Subject: [PATCH 0009/1244] Escape illegal characters in scaladoc code blocks Fixes #13107 --- scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala index 6f52abb0a61b..76d88a8a0bb3 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala @@ -46,7 +46,7 @@ class DocRender(signatureRenderer: SignatureRenderer)(using DocContext): case 5 => h5(content) case 6 => h6(content) case Paragraph(text) => p(renderElement(text)) - case Code(data: String) => pre(code(raw(data))) // TODO add classes + case Code(data: String) => pre(code(raw(data.escapeReservedTokens))) // TODO add classes case HorizontalRule => hr case UnorderedList(items) => ul(listItems(items)) From b1f5157f77acbf28ecd83245a83e52bf6740fd50 Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Sat, 17 Jul 2021 17:04:37 +0200 Subject: [PATCH 0010/1244] Mark website content as outdated. The Scala 3 documentation is now hosted at https://docs.scala-lang.org. --- docs/_layouts/main.html | 5 +++++ docs/css/dottydoc.css | 4 ++-- .../reference/changed-features/compiler-plugins.md | 1 + .../reference/changed-features/eta-expansion-spec.md | 1 + .../docs/reference/changed-features/eta-expansion.md | 1 + .../changed-features/implicit-conversions-spec.md | 1 + .../changed-features/implicit-conversions.md | 1 + .../changed-features/implicit-resolution.md | 1 + docs/docs/reference/changed-features/imports.md | 1 + .../changed-features/interpolation-escapes.md | 1 + .../reference/changed-features/lazy-vals-init.md | 1 + .../reference/changed-features/main-functions.md | 1 + docs/docs/reference/changed-features/match-syntax.md | 1 + .../reference/changed-features/numeric-literals.md | 1 + docs/docs/reference/changed-features/operators.md | 1 + .../changed-features/overload-resolution.md | 1 + .../reference/changed-features/pattern-bindings.md | 1 + .../reference/changed-features/pattern-matching.md | 1 + .../changed-features/structural-types-spec.md | 1 + .../reference/changed-features/structural-types.md | 1 + .../docs/reference/changed-features/type-checking.md | 1 + .../reference/changed-features/type-inference.md | 1 + .../reference/changed-features/vararg-splices.md | 1 + docs/docs/reference/changed-features/wildcards.md | 1 + .../contextual/by-name-context-parameters.md | 1 + docs/docs/reference/contextual/context-bounds.md | 1 + .../reference/contextual/context-functions-spec.md | 1 + docs/docs/reference/contextual/context-functions.md | 1 + docs/docs/reference/contextual/conversions.md | 1 + docs/docs/reference/contextual/derivation-macro.md | 1 + docs/docs/reference/contextual/derivation.md | 1 + docs/docs/reference/contextual/extension-methods.md | 1 + docs/docs/reference/contextual/given-imports.md | 1 + docs/docs/reference/contextual/givens.md | 1 + docs/docs/reference/contextual/motivation.md | 1 + .../reference/contextual/multiversal-equality.md | 1 + .../reference/contextual/relationship-implicits.md | 1 + .../right-associative-extension-methods.md | 1 + docs/docs/reference/contextual/type-classes.md | 1 + docs/docs/reference/contextual/using-clauses.md | 1 + docs/docs/reference/dropped-features/auto-apply.md | 1 + .../dropped-features/class-shadowing-spec.md | 1 + .../reference/dropped-features/class-shadowing.md | 1 + docs/docs/reference/dropped-features/delayed-init.md | 3 ++- docs/docs/reference/dropped-features/do-while.md | 1 + .../reference/dropped-features/early-initializers.md | 1 + .../reference/dropped-features/existential-types.md | 1 + docs/docs/reference/dropped-features/limit22.md | 1 + docs/docs/reference/dropped-features/macros.md | 1 + .../reference/dropped-features/nonlocal-returns.md | 1 + .../reference/dropped-features/package-objects.md | 1 + .../reference/dropped-features/procedure-syntax.md | 1 + docs/docs/reference/dropped-features/symlits.md | 1 + .../reference/dropped-features/this-qualifier.md | 1 + .../reference/dropped-features/type-projection.md | 1 + .../dropped-features/weak-conformance-spec.md | 1 + .../reference/dropped-features/weak-conformance.md | 1 + .../docs/reference/dropped-features/wildcard-init.md | 1 + docs/docs/reference/dropped-features/xml.md | 1 + docs/docs/reference/enums/adts.md | 1 + docs/docs/reference/enums/desugarEnums.md | 1 + docs/docs/reference/enums/enums.md | 1 + .../reference/metaprogramming/compiletime-ops.md | 1 + docs/docs/reference/metaprogramming/inline.md | 1 + docs/docs/reference/metaprogramming/macros-spec.md | 1 + docs/docs/reference/metaprogramming/macros.md | 1 + docs/docs/reference/metaprogramming/reflection.md | 1 + docs/docs/reference/metaprogramming/staging.md | 1 + docs/docs/reference/metaprogramming/tasty-inspect.md | 1 + docs/docs/reference/metaprogramming/toc.md | 1 + .../new-types/dependent-function-types-spec.md | 1 + .../reference/new-types/dependent-function-types.md | 1 + .../reference/new-types/intersection-types-spec.md | 1 + docs/docs/reference/new-types/intersection-types.md | 1 + docs/docs/reference/new-types/match-types.md | 1 + .../new-types/polymorphic-function-types.md | 1 + docs/docs/reference/new-types/type-lambdas-spec.md | 1 + docs/docs/reference/new-types/type-lambdas.md | 1 + docs/docs/reference/new-types/union-types-spec.md | 1 + docs/docs/reference/new-types/union-types.md | 1 + .../reference/other-new-features/control-syntax.md | 1 + .../other-new-features/creator-applications.md | 1 + .../reference/other-new-features/explicit-nulls.md | 1 + docs/docs/reference/other-new-features/export.md | 1 + .../docs/reference/other-new-features/indentation.md | 1 + .../other-new-features/kind-polymorphism.md | 1 + docs/docs/reference/other-new-features/matchable.md | 1 + .../reference/other-new-features/opaques-details.md | 1 + docs/docs/reference/other-new-features/opaques.md | 1 + .../reference/other-new-features/open-classes.md | 1 + .../other-new-features/parameter-untupling-spec.md | 1 + .../other-new-features/parameter-untupling.md | 1 + .../other-new-features/safe-initialization.md | 1 + docs/docs/reference/other-new-features/targetName.md | 1 + .../other-new-features/threadUnsafe-annotation.md | 1 + .../reference/other-new-features/trait-parameters.md | 1 + .../other-new-features/transparent-traits.md | 1 + docs/docs/reference/other-new-features/type-test.md | 1 + docs/docs/reference/overview.md | 1 + docs/docs/reference/syntax.md | 1 + docs/docs/resources/talks.md | 1 + docs/docs/usage/getting-started.md | 1 + docs/docs/usage/ide-support.md | 1 + docs/docs/usage/language-versions.md | 1 + docs/docs/usage/worksheet-mode.md | 1 + scaladoc/resources/dotty_res/styles/colors.css | 12 ++++++++---- 106 files changed, 119 insertions(+), 7 deletions(-) diff --git a/docs/_layouts/main.html b/docs/_layouts/main.html index c7aff4f96c5a..e265ac1bed16 100644 --- a/docs/_layouts/main.html +++ b/docs/_layouts/main.html @@ -2,6 +2,11 @@ layout: base ---
+ {% if page.movedTo %} + + {% endif %} {{ content }}
+ + + diff --git a/project/Build.scala b/project/Build.scala index 8520a5de6839..bc9121bdcac3 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -24,6 +24,7 @@ import sbtbuildinfo.BuildInfoPlugin.autoImport._ import scala.util.Properties.isJavaAtLeast import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._ +import org.scalajs.linker.interface.ModuleInitializer object DottyJSPlugin extends AutoPlugin { import Build._ @@ -1246,6 +1247,7 @@ object Build { // Note: the two tasks below should be one, but a bug in Tasty prevents that val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib") val generateTestcasesDocumentation = taskKey[Unit]("Generate documentation for testcases, usefull for debugging tests") + val renderScaladocScalajsToFile = inputKey[Unit]("Copy the output of the scaladoc js files") lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")). dependsOn(`scala3-compiler-bootstrapped`). @@ -1254,8 +1256,12 @@ object Build { enablePlugins(DottyJSPlugin). dependsOn(`scala3-library-bootstrappedJS`). settings( + Compile / scalaJSMainModuleInitializer := (sys.env.get("scaladoc.projectFormat") match { + case Some("md") => Some(ModuleInitializer.mainMethod("dotty.tools.scaladoc.Main", "markdownMain")) + case _ => Some(ModuleInitializer.mainMethod("dotty.tools.scaladoc.Main", "main")) + }), Test / fork := false, - scalaJSUseMainModuleInitializer := true, + Compile / scalaJSUseMainModuleInitializer := true, libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13) ) @@ -1309,7 +1315,7 @@ object Build { ). settings( Compile / resourceGenerators += Def.task { - val jsDestinationFile = (Compile / resourceManaged).value / "dotty_res" / "scripts" / "searchbar.js" + val jsDestinationFile = (Compile / resourceManaged).value / "dotty_res" / "scripts" / "scaladoc-scalajs.js" sbt.IO.copyFile((`scaladoc-js` / Compile / fullOptJS).value.data, jsDestinationFile) Seq(jsDestinationFile) }.taskValue, @@ -1439,6 +1445,23 @@ object Build { ) }.value, + renderScaladocScalajsToFile := Def.inputTask { + val extraArgs = spaceDelimited("").parsed + val (destJS, destCSS, csses) = extraArgs match { + case js :: css :: tail => (js, css, tail) + case js :: Nil => (js, "", Nil) + case _ => throw new IllegalArgumentException("No js destination provided") + } + val jsDestinationFile: File = Paths.get(destJS).toFile + sbt.IO.copyFile((`scaladoc-js` / Compile / fullOptJS).value.data, jsDestinationFile) + csses.map { file => + val cssDesitnationFile = Paths.get(destCSS).toFile / file + val cssSourceFile = (`scaladoc-js` / Compile / resourceDirectory).value / file + sbt.IO.copyFile(cssSourceFile, cssDesitnationFile) + cssDesitnationFile + } + }.evaluated, + Test / buildInfoKeys := Seq[BuildInfoKey]( (Test / Build.testcasesOutputDir), (Test / Build.testcasesSourceRoot), diff --git a/project/scripts/genDocsScalaLang b/project/scripts/genDocsScalaLang new file mode 100755 index 000000000000..8125c5cc0e8b --- /dev/null +++ b/project/scripts/genDocsScalaLang @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +set -e +shopt -s extglob # needed for rm everything but x +echo "Working directory: $PWD" + +GENDOC_EXTRA_ARGS=$@ +GIT_HEAD=$(git rev-parse HEAD) # save current head for commit message in gh-pages +PREVIOUS_SNAPSHOTS_DIR="$PWD/../prev_snapshots" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)" +SITE_OUT_DIR="$PWD/docs/_site" + +DOCS_SCALA_LANG_DIR="$PWD/docsScalaLang" + +rm -rf $DOCS_SCALA_LANG_DIR +mkdir -pv $DOCS_SCALA_LANG_DIR +git clone "https://github.com/scala/docs.scala-lang.git" $DOCS_SCALA_LANG_DIR + +SBT="$SCRIPT_DIR/sbt" +mkdir -pv $SITE_OUT_DIR +env "scaladoc.projectFormat=md" "$SBT" "scaladoc/renderScaladocScalajsToFile $DOCS_SCALA_LANG_DIR/scripts/scaladoc-scalajs.js $DOCS_SCALA_LANG_DIR/resources/css code-snippets.css" +"dist/target/pack/bin/scaladoc" "-d" "$SITE_OUT_DIR" "-format" "md" "-siteroot" "docs" "/dev/null" + +if [ ! -d "$SITE_OUT_DIR" ]; then + echo "Output directory did not exist: $SITE_OUT_DIR" 1>&2 + exit 1 +fi + +# Copy reference and scaladoc docs +cp -rf "$SITE_OUT_DIR/docs/reference"/* "$DOCS_SCALA_LANG_DIR/_scala3-reference" +cp -rf "$SITE_OUT_DIR/docs/usage/scaladoc"/* "$DOCS_SCALA_LANG_DIR/_overviews/scala3-scaladoc" + +cp -rf "$SITE_OUT_DIR/docs/reference/contextual/motivation.md" "$DOCS_SCALA_LANG_DIR/_scala3-reference/contextual.md" +cp -rf "$SITE_OUT_DIR/docs/reference/metaprogramming/toc.md" "$DOCS_SCALA_LANG_DIR/_scala3-reference/metaprogramming.md" +cp -rf "$SITE_OUT_DIR/docs/resources/talks.md" "$DOCS_SCALA_LANG_DIR/scala3/talks.md" +cp -rf "$SITE_OUT_DIR/docs/usage/getting-started.md" "$DOCS_SCALA_LANG_DIR/scala3/getting-started.md" +cp -rf "$SITE_OUT_DIR/docs/usage/language-versions.md" "$DOCS_SCALA_LANG_DIR/_scala3-reference/language-versions.md" +cp -rf "$SITE_OUT_DIR/docs/usage/worksheet-mode.md" "$DOCS_SCALA_LANG_DIR/_overviews/scala3-book/tools-worksheets.md" + + +# Copy csses and html importing these assets +cp -f "$SITE_OUT_DIR/styles/colors.css" "$DOCS_SCALA_LANG_DIR/resources/css/colors.css" +cp -f "$PWD/docs/docsScalaLangResources/scaladoc-assets.html" "$DOCS_SCALA_LANG_DIR/_includes/scaladoc-assets.html" + +# Hack inclusion of these assests by the docs.scala-lang jekyll builder +echo "{% include scaladoc-assets.html %}" >> "$DOCS_SCALA_LANG_DIR/_layouts/inner-page-parent-dropdown.html" diff --git a/scaladoc-js/src/Main.scala b/scaladoc-js/src/Main.scala index a7d7e8d552be..f7075766e3b4 100644 --- a/scaladoc-js/src/Main.scala +++ b/scaladoc-js/src/Main.scala @@ -1,9 +1,22 @@ package dotty.tools.scaladoc -object Main extends App { - Searchbar() - SocialLinks() - CodeSnippets() - DropdownHandler() - Ux() -} +object Main: + + private def common(): Unit = + CodeSnippets() + + def main(): Unit = + Searchbar() + SocialLinks() + DropdownHandler() + Ux() + common() + + /** + * This main is conditionally enabled by system env variable `scaladoc.projectFormat=md` + * passed in ./projects/scripts/genDocsScalaLang + * The reason why we have to pass the condition by env variable is because js is build before scaladoc, + * so we cannot access its args + */ + def markdownMain(): Unit = + common() diff --git a/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala b/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala index 487eebf7a1b6..bd8493ebb9ec 100644 --- a/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala +++ b/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala @@ -59,7 +59,8 @@ object Scaladoc: versionsDictionaryUrl: Option[String] = None, generateInkuire : Boolean = false, apiSubdirectory : Boolean = false, - scastieConfiguration: String = "" + scastieConfiguration: String = "", + projectFormat: String = "html", ) def run(args: Array[String], rootContext: CompilerContext): Reporter = @@ -236,7 +237,8 @@ object Scaladoc: versionsDictionaryUrl.nonDefault, generateInkuire.get, apiSubdirectory.get, - scastieConfiguration.get + scastieConfiguration.get, + projectFormat.get, ) (Some(docArgs), newContext) } @@ -245,6 +247,10 @@ object Scaladoc: given docContext: DocContext = new DocContext(args, ctx) val module = ScalaModuleProvider.mkModule() - new dotty.tools.scaladoc.renderers.HtmlRenderer(module.rootPackage, module.members).render() + val renderer = args.projectFormat match + case "html" => new dotty.tools.scaladoc.renderers.HtmlRenderer(module.rootPackage, module.members) + case "md" => new dotty.tools.scaladoc.renderers.MarkdownRenderer(module.rootPackage, module.members) + + renderer.render() report.inform("generation completed successfully") docContext diff --git a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala index e9058c504147..ba077d31a8fd 100644 --- a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala +++ b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala @@ -128,6 +128,16 @@ class ScaladocSettings extends SettingGroup with AllScalaSettings: val scastieConfiguration: Setting[String] = StringSetting("-scastie-configuration", "Scastie configuration", "Additional configuration passed to Scastie in code snippets", "") + + val projectFormat: Setting[String] = + ChoiceSetting( + "-format", + "format of the static site output", + "Format of the static site output. The default value is html, which converts all static articles into a webpage. " + + "The md format only preprocess markdown files and should not be used as a direct output, but rather as a sources generator for an outer templating engine like Jekyll", + List("html", "md"), + "html" + ) def scaladocSpecificSettings: Set[Setting[_]] = Set(sourceLinks, legacySourceLink, syntax, revision, externalDocumentationMappings, socialLinks, skipById, skipByRegex, deprecatedSkipPackages, docRootContent, snippetCompiler, generateInkuire, scastieConfiguration) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala index 8db1dc2e5b87..3b6876238436 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala @@ -14,120 +14,21 @@ import java.nio.file.Files import java.nio.file.FileVisitOption import java.io.File -case class Page(link: Link, content: Member | ResolvedTemplate | String, children: Seq[Page]): - def withNewChildren(newChildren: Seq[Page]) = copy(children = children ++ newChildren) +class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: DocContext) + extends Renderer(rootPackage, members, extension = "html"): - def withTitle(newTitle: String) = copy(link = link.copy(name = newTitle)) - - def hasFrame = content match - case t: ResolvedTemplate => t.hasFrame - case _ => true - -class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx: DocContext) - extends SiteRenderer, Resources, Locations, Writer: - private val args = summon[DocContext].args - val staticSite = summon[DocContext].staticSiteContext - - val effectiveMembers = members - - private def memberPage(member: Member): Page = - val childrenPages = member.members.filter(_.needsOwnPage) - Page(Link(member.name, member.dri), member, childrenPages.map(memberPage)) - - val navigablePage: Page = - val rootPckPage = memberPage(rootPackage) - staticSite match - case None => rootPckPage.withTitle(args.name) - case Some(siteContext) => - val (indexes, templates) = siteContext.templates.partition(f => - f.templateFile.isIndexPage() && f.file.toPath.getParent() == siteContext.docsPath) - if (indexes.size > 1) - val msg = s"ERROR: Multiple index pages for doc found ${indexes.map(_.file)}" - report.error(msg) - - val templatePages = templates.map(templateToPage(_, siteContext)) - - indexes.headOption match - case None if templatePages.isEmpty=> - rootPckPage.withTitle(args.name) - case None => - Page(Link(args.name, docsRootDRI),"", templatePages :+ rootPckPage.withTitle("API")) - case Some(indexPage) => - val newChildren = templatePages :+ rootPckPage.withTitle("API") - templateToPage(indexPage, siteContext).withNewChildren(newChildren) - - val hiddenPages: Seq[Page] = - staticSite match - case None => - Seq(navigablePage.copy( // Add index page that is a copy of api/index.html - link = navigablePage.link.copy(dri = docsRootDRI), - children = Nil - )) - case Some(siteContext) => - // In case that we do not have an index page and we do not have any API entries - // we want to create empty index page, so there is one - val actualIndexTemplate = siteContext.indexTemplate() match { - case None if effectiveMembers.isEmpty => Seq(siteContext.emptyIndexTemplate) - case templates => templates.toSeq - } - - (siteContext.orphanedTemplates ++ actualIndexTemplate).map(templateToPage(_, siteContext)) - - /** - * Here we have to retrive index pages from hidden pages and replace fake index pages in navigable page tree. - */ - val allPages: Seq[Page] = - def traversePages(page: Page): (Page, Seq[Page]) = - val (newChildren, newPagesToRemove): (Seq[Page], Seq[Page]) = page.children.map(traversePages(_)).foldLeft((Seq[Page](), Seq[Page]())) { - case ((pAcc, ptrAcc), (p, ptr)) => (pAcc :+ p, ptrAcc ++ ptr) - } - hiddenPages.find(_.link == page.link) match - case None => - (page.copy(children = newChildren), newPagesToRemove) - case Some(newPage) => - (newPage.copy(children = newChildren), newPagesToRemove :+ newPage) - - val (newNavigablePage, pagesToRemove) = traversePages(navigablePage) - - val all = newNavigablePage +: hiddenPages.filterNot(pagesToRemove.contains) - // We need to check for conflicts only if we have top-level member called blog or docs - val hasPotentialConflict = - rootPackage.members.exists(m => m.name.startsWith("docs") || m.name.startsWith("blog")) - - if hasPotentialConflict then - def walk(page: Page): Unit = - if page.link.dri.isStaticFile then - val dest = absolutePath(page.link.dri) - if apiPaths.contains(dest) then - report.error(s"Conflict between static page and API member for $dest. $pathsConflictResoultionMsg") - page.children.foreach(walk) - - all.foreach (walk) - - all - - def renderContent(page: Page) = page.content match - case m: Member => - val signatureRenderer = new SignatureRenderer: - def currentDri: DRI = page.link.dri - def link(dri: DRI): Option[String] = - Some(pathToPage(currentDri, dri)).filter(_ != UnresolvedLocationLink) - - MemberRenderer(signatureRenderer).fullMember(m) - case t: ResolvedTemplate => siteContent(page.link.dri, t) - case a: String => raw(a) - - - def renderPage(page: Page, parents: Vector[Link]): Seq[String] = - val newParents = parents :+ page.link - val content = html( + override def pageContent(page: Page, parents: Vector[Link]): AppliedTag = + html( mkHead(page), body( if !page.hasFrame then renderContent(page) - else mkFrame(page.link, newParents, renderContent(page)) + else mkFrame(page.link, parents, renderContent(page)) ) ) - write(page.link.dri, content) +: page.children.flatMap(renderPage(_, newParents)) + + override def render(): Unit = + val renderedResources = renderResources() + super.render() private def specificResources(page: Page): Set[String] = page.children.toSet.flatMap(specificResources) ++ (page.content match @@ -157,10 +58,6 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx val resources = siteResourcesPaths.toSeq.map(pathToResource) ++ allResources(allPages) ++ onlyRenderedResources resources.flatMap(renderResource) - def render(): Unit = - val renderedResources = renderResources() - val sites = allPages.map(renderPage(_, Vector.empty)) - def mkHead(page: Page): AppliedTag = val resources = page.content match case t: ResolvedTemplate => @@ -229,14 +126,6 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx renderNested(navigablePage, toplevel = true)._2 - private def canonicalUrl(l: String): AppliedTag | String = - val canon = args.docCanonicalBaseUrl - if !canon.isEmpty then - val canonicalUrl = if canon.endsWith("/") then canon else canon + "/" - link(rel := "canonical", href := canonicalUrl + l) - else - "" // return empty tag - private def hasSocialLinks = !args.socialLinks.isEmpty private def socialLinks(whiteIcon: Boolean = true) = diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala index 23b5c9d9479a..81baf34b778e 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala @@ -21,7 +21,7 @@ trait Locations(using ctx: DocContext): // We generate this collection only if there may be a conflict with resources. // Potentially can be quite big. - lazy val apiPaths = effectiveMembers.keySet.filterNot(_.isStaticFile).map(absolutePath) + lazy val apiPaths = effectiveMembers.keySet.filterNot(_.isStaticFile).map(absolutePath(_)) var cache = new JHashMap[DRI, Seq[String]]() @@ -80,7 +80,7 @@ trait Locations(using ctx: DocContext): pathToRaw(from, to.split("/").toList) def resolveRoot(dri: DRI, path: String): String = resolveRoot(rawLocation(dri), path) - def absolutePath(dri: DRI): String = rawLocation(dri).mkString("", "/", ".html") + def absolutePath(dri: DRI, extension: String = "html"): String = rawLocation(dri).mkString("", "/", s".$extension") def resolveLink(dri: DRI, url: String): String = if URI(url).isAbsolute then url else resolveRoot(dri, url) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/MarkdownRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/MarkdownRenderer.scala new file mode 100644 index 000000000000..b49c1e268678 --- /dev/null +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/MarkdownRenderer.scala @@ -0,0 +1,28 @@ +package dotty.tools.scaladoc +package renderers + +import util.HTML._ +import collection.JavaConverters._ +import java.net.URI +import java.net.URL +import dotty.tools.scaladoc.site._ +import scala.util.Try +import org.jsoup.Jsoup +import java.nio.file.Paths +import java.nio.file.Path +import java.nio.file.Files +import java.nio.file.FileVisitOption +import java.io.File + +class MarkdownRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: DocContext) + extends Renderer(rootPackage, members, extension = "md"): + + override def render(): Unit = + renderResources() + super.render() + + override def pageContent(page: Page, parents: Vector[Link]): AppliedTag = + renderContent(page) + + private def renderResources(): Seq[String] = + allResources(Nil).flatMap(renderResource) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala new file mode 100644 index 000000000000..7664a542c2bb --- /dev/null +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala @@ -0,0 +1,149 @@ +package dotty.tools.scaladoc +package renderers + +import util.HTML._ +import collection.JavaConverters._ +import java.net.URI +import java.net.URL +import dotty.tools.scaladoc.site._ +import scala.util.Try +import org.jsoup.Jsoup +import java.nio.file.Paths +import java.nio.file.Path +import java.nio.file.Files +import java.nio.file.FileVisitOption +import java.io.File + +case class Page(link: Link, content: Member | ResolvedTemplate | String, children: Seq[Page]): + def withNewChildren(newChildren: Seq[Page]) = copy(children = children ++ newChildren) + + def withTitle(newTitle: String) = copy(link = link.copy(name = newTitle)) + + def hasFrame = content match + case t: ResolvedTemplate => t.hasFrame + case _ => true + +abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], protected val extension: String = "html")(using ctx: DocContext) + extends SiteRenderer, Resources, Locations, Writer: + protected val args = summon[DocContext].args + val staticSite = summon[DocContext].staticSiteContext + + val effectiveMembers = members + + protected def memberPage(member: Member): Page = + val childrenPages = member.members.filter(_.needsOwnPage) + Page(Link(member.name, member.dri), member, childrenPages.map(memberPage)) + + val navigablePage: Page = + val rootPckPage = memberPage(rootPackage) + staticSite match + case None => rootPckPage.withTitle(args.name) + case Some(siteContext) => + val (indexes, templates) = siteContext.templates.partition(f => + f.templateFile.isIndexPage() && f.file.toPath.getParent() == siteContext.docsPath) + if (indexes.size > 1) + val msg = s"ERROR: Multiple index pages for doc found ${indexes.map(_.file)}" + report.error(msg) + + val templatePages = templates.map(templateToPage(_, siteContext)) + + indexes.headOption match + case None if templatePages.isEmpty=> + rootPckPage.withTitle(args.name) + case None => + Page(Link(args.name, docsRootDRI),"", templatePages :+ rootPckPage.withTitle("API")) + case Some(indexPage) => + val newChildren = templatePages :+ rootPckPage.withTitle("API") + templateToPage(indexPage, siteContext).withNewChildren(newChildren) + + val hiddenPages: Seq[Page] = + staticSite match + case None => + Seq(navigablePage.copy( // Add index page that is a copy of api/index.html + link = navigablePage.link.copy(dri = docsRootDRI), + children = Nil + )) + case Some(siteContext) => + // In case that we do not have an index page and we do not have any API entries + // we want to create empty index page, so there is one + val actualIndexTemplate = siteContext.indexTemplate() match { + case None if effectiveMembers.isEmpty => Seq(siteContext.emptyIndexTemplate) + case templates => templates.toSeq + } + + (siteContext.orphanedTemplates ++ actualIndexTemplate).map(templateToPage(_, siteContext)) + + /** + * Here we have to retrive index pages from hidden pages and replace fake index pages in navigable page tree. + */ + val allPages: Seq[Page] = + def traversePages(page: Page): (Page, Seq[Page]) = + val (newChildren, newPagesToRemove): (Seq[Page], Seq[Page]) = page.children.map(traversePages(_)).foldLeft((Seq[Page](), Seq[Page]())) { + case ((pAcc, ptrAcc), (p, ptr)) => (pAcc :+ p, ptrAcc ++ ptr) + } + hiddenPages.find(_.link == page.link) match + case None => + (page.copy(children = newChildren), newPagesToRemove) + case Some(newPage) => + (newPage.copy(children = newChildren), newPagesToRemove :+ newPage) + + val (newNavigablePage, pagesToRemove) = traversePages(navigablePage) + + val all = newNavigablePage +: hiddenPages.filterNot(pagesToRemove.contains) + // We need to check for conflicts only if we have top-level member called blog or docs + val hasPotentialConflict = + rootPackage.members.exists(m => m.name.startsWith("docs") || m.name.startsWith("blog")) + + if hasPotentialConflict then + def walk(page: Page): Unit = + if page.link.dri.isStaticFile then + val dest = absolutePath(page.link.dri) + if apiPaths.contains(dest) then + report.error(s"Conflict between static page and API member for $dest. $pathsConflictResoultionMsg") + page.children.foreach(walk) + + all.foreach(walk) + + all + + def renderContent(page: Page) = page.content match + case m: Member => + val signatureRenderer = new SignatureRenderer: + def currentDri: DRI = page.link.dri + def link(dri: DRI): Option[String] = + Some(pathToPage(currentDri, dri)).filter(_ != UnresolvedLocationLink) + + MemberRenderer(signatureRenderer).fullMember(m) + case t: ResolvedTemplate => siteContent(page.link.dri, t) + case a: String => raw(a) + + + + protected def canonicalUrl(l: String): AppliedTag | String = + val canon = args.docCanonicalBaseUrl + if !canon.isEmpty then + val canonicalUrl = if canon.endsWith("/") then canon else canon + "/" + link(rel := "canonical", href := canonicalUrl + l) + else + "" // return empty tag + + /** + * Main method rendering all the pages + */ + def render(): Unit = + val sites = allPages.map(renderPage(_, Vector.empty)) + + /** + * Handler to prepare the content to be rendered. It's a good place to organize frame, footers, front-matter, etc. + */ + def pageContent(page: Page, parents: Vector[Link]): AppliedTag + + /** + * Method to be overriden by concrete renderer to render single page + */ + def renderPage(page: Page, parents: Vector[Link]): Seq[String] = + val newParents = parents :+ page.link + val content = pageContent(page, newParents) + write(page.link.dri, content, extension) +: page.children.flatMap(renderPage(_, newParents)) + + diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala index 7dc40f68c322..3cb97316ad2f 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala @@ -105,7 +105,7 @@ trait Resources(using ctx: DocContext) extends Locations, Writer: "scripts/components/Input.js", "scripts/components/FilterGroup.js", "scripts/components/Filter.js", - "scripts/searchbar.js" + "scripts/scaladoc-scalajs.js" ).map(dottyRes) val urls = List( diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala index a1dd1e4e71fb..a5a30b41681b 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala @@ -56,11 +56,24 @@ trait SiteRenderer(using DocContext) extends Locations: else processLocalLink(str) - val document = Jsoup.parse(content.resolved.code) - document.select("a").forEach(element => - element.attr("href", processLocalLinkWithGuard(element.attr("href"))) - ) - document.select("img").forEach { element => - element.attr("src", processLocalLink(element.attr("src"))) - } // foreach does not work here. Why? - raw(document.outerHtml()) + summon[DocContext].args.projectFormat match + case "html" => + val document = Jsoup.parse(content.resolved.code) + document.select("a").forEach(element => + element.attr("href", processLocalLinkWithGuard(element.attr("href"))) + ) + document.select("img").forEach { element => + element.attr("src", processLocalLink(element.attr("src"))) + } // foreach does not work here. Why? + raw(document.outerHtml()) + case "md" => + val links = """(? s"[${m.group(1)}](${processLocalLink(m.group(2))})" + ), + m => s"[${m.group(1)}](${processLocalLinkWithGuard(m.group(2))})" + )) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala index 313cef340d41..029da21bdda7 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala @@ -18,8 +18,8 @@ trait Writer(using ctx: DocContext) extends Locations: if !Files.exists(absPath.getParent) then Files.createDirectories(absPath.getParent) absPath - def write(dri: DRI, content: AppliedTag): String = - val path = absolutePath(dri) + def write(dri: DRI, content: AppliedTag, extension: String = "html"): String = + val path = absolutePath(dri, extension) Files.write(dest(path), content.toString.getBytes) path diff --git a/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala new file mode 100644 index 000000000000..7590927cb248 --- /dev/null +++ b/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala @@ -0,0 +1,20 @@ +package dotty.tools.scaladoc +package site + + +/** + * Object for rendering yaml front-matter for preprocessed markdowns. + */ +object FrontMatterRenderer: + def render(properties: Map[String, Object]): String = + + def renderProperties(newProps: Map[String, Object]): List[String] = newProps.collect { + case (k: String, v: String) => s"$p: $v" + } + + val rows = renderProperties(properties) ++ renderProperties(properties("page")) + + rows.mkString("---\n", "\n", "\n---") + "\n\n\n\n" + + diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala index 8d09a949c143..ded1a1ff20db 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala @@ -40,7 +40,7 @@ class StaticSiteContext( lazy val layouts: Map[String, TemplateFile] = val layoutRoot = new File(root, "_layouts") val dirs: Array[File] = Option(layoutRoot.listFiles()).getOrElse(Array()) - dirs.map { it => loadTemplateFile(it) }.map { it => it.name -> it }.toMap + dirs.map { it => loadTemplateFile(it)(using this) }.map { it => it.name -> it }.toMap lazy val sideBarConfig = val sidebarFile = root.toPath.resolve("sidebar.yml") @@ -96,7 +96,7 @@ class StaticSiteContext( val msg = s"ERROR: Multiple index pages for $from found in ${indexes.map(_.file)}" throw new java.lang.RuntimeException(msg) - val templateFile = if (from.isDirectory) loadIndexPage() else loadTemplateFile(from) + val templateFile = if (from.isDirectory) loadIndexPage() else loadTemplateFile(from)(using this) def dateFrom(p: LoadedTemplate, default: String = "1900-01-01"): String = val pageSettings = p.templateFile.settings.get("page").collect{ case m: Map[String @unchecked, _] => m } diff --git a/scaladoc/src/dotty/tools/scaladoc/site/common.scala b/scaladoc/src/dotty/tools/scaladoc/site/common.scala index bb09cd92f452..5873863ed6c0 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/common.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/common.scala @@ -14,13 +14,14 @@ import com.vladsch.flexmark.ext.yaml.front.matter.{AbstractYamlFrontMatterVisito import com.vladsch.flexmark.parser.{Parser, ParserEmulationProfile} import com.vladsch.flexmark.util.options.{DataHolder, MutableDataSet} import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension +import com.vladsch.flexmark.formatter.Formatter import scala.collection.JavaConverters._ val docsRootDRI: DRI = DRI(location = "docs/index", symbolUUID = staticFileSymbolUUID) val apiPageDRI: DRI = DRI(location = "api/index") -val defaultMarkdownOptions: DataHolder = +def defaultMarkdownOptions(using ctx: StaticSiteContext): DataHolder = new MutableDataSet() .setFrom(ParserEmulationProfile.COMMONMARK.getOptions) .set(AnchorLinkExtension.ANCHORLINKS_WRAP_TEXT, false) @@ -36,7 +37,10 @@ val defaultMarkdownOptions: DataHolder = YamlFrontMatterExtension.create(), StrikethroughExtension.create(), WikiLinkExtension.create(), - tasty.comments.markdown.SnippetRenderingExtension + (ctx.args.projectFormat match + case "html" => tasty.comments.markdown.SnippetRenderingExtension + case "md" => tasty.comments.markdown.SnippetFormattingExtension + ), )) def emptyTemplate(file: File, title: String): TemplateFile = TemplateFile( @@ -55,9 +59,9 @@ def emptyTemplate(file: File, title: String): TemplateFile = TemplateFile( final val ConfigSeparator = "---" final val LineSeparator = "\n" -val yamlParser: Parser = Parser.builder(defaultMarkdownOptions).build() +def yamlParser(using ctx: StaticSiteContext): Parser = Parser.builder(defaultMarkdownOptions).build() -def loadTemplateFile(file: File): TemplateFile = { +def loadTemplateFile(file: File)(using ctx: StaticSiteContext): TemplateFile = { val lines = Files.readAllLines(file.toPath).asScala.toList val (config, content) = if (lines.head == ConfigSeparator) { @@ -77,7 +81,7 @@ def loadTemplateFile(file: File): TemplateFile = { val globalKeys = Set("extraJS", "extraCSS", "layout", "hasFrame", "name", "title") val allSettings = yamlCollector.getData.asScala.toMap.transform(getSettingValue) val (global, inner) = allSettings.partition((k,_) => globalKeys.contains(k)) - val settings = Map("page" -> inner) + val settings = Map("page" -> inner) ++ global def stringSetting(settings: Map[String, Object], name: String): Option[String] = settings.get(name).map { case List(elem: String) => elem diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala index 6d59a87e5f85..7b4f4939f72e 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala @@ -14,6 +14,7 @@ import com.vladsch.flexmark.ext.yaml.front.matter.{AbstractYamlFrontMatterVisito import com.vladsch.flexmark.parser.{Parser, ParserEmulationProfile} import com.vladsch.flexmark.util.options.{DataHolder, MutableDataSet} import com.vladsch.flexmark.html.HtmlRenderer +import com.vladsch.flexmark.formatter.Formatter import liqp.Template import scala.collection.JavaConverters._ @@ -88,7 +89,7 @@ case class TemplateFile( if (ctx.resolving.contains(file.getAbsolutePath)) throw new RuntimeException(s"Cycle in templates involving $file: ${ctx.resolving}") - val layoutTemplate = layout.map(name => + val layoutTemplate = layout.filter(_ => ssctx.args.projectFormat == "html").map(name => ctx.layouts.getOrElse(name, throw new RuntimeException(s"No layouts named $name in ${ctx.layouts}"))) def asJavaElement(o: Object): Object = o match @@ -107,9 +108,15 @@ case class TemplateFile( val parser: Parser = Parser.builder(defaultMarkdownOptions).build() val parsedMd = parser.parse(rendered) val processed = FlexmarkSnippetProcessor.processSnippets(parsedMd, None, snippetCheckingFunc, withContext = false)(using ssctx.outerCtx) - HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed) - layoutTemplate match - case None => ResolvedPage(code, resources ++ ctx.resources) - case Some(layoutTemplate) => - layoutTemplate.resolveInner(ctx.nest(code, file, resources)) + ssctx.args.projectFormat match + case "html" => HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed) + case "md" => + FrontMatterRenderer.render(settings) + + Formatter.builder(defaultMarkdownOptions).build().render(processed) + + + if layoutTemplate.isEmpty || ssctx.args.projectFormat == "md" then + ResolvedPage(code, resources ++ ctx.resources) + else + layoutTemplate.get.resolveInner(ctx.nest(code, file, resources)) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetFormattingExtension.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetFormattingExtension.scala new file mode 100644 index 000000000000..7833c0c5d669 --- /dev/null +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetFormattingExtension.scala @@ -0,0 +1,40 @@ +package dotty.tools.scaladoc +package tasty.comments.markdown + +import dotty.tools.scaladoc.snippets._ + +import com.vladsch.flexmark.formatter._ +import com.vladsch.flexmark.parser._ +import com.vladsch.flexmark.ext.wikilink._ +import com.vladsch.flexmark.ext.wikilink.internal.WikiLinkLinkRefProcessor +import com.vladsch.flexmark.util.ast._ +import com.vladsch.flexmark.util.options._ +import com.vladsch.flexmark.util.sequence.BasedSequence +import com.vladsch.flexmark._ + +/** + * SnippetFormattingExtension is a clone of the [[SnippetRenderingExtension]] used as a fallback strategy when the `-format` setting is set up to `md` + */ +object SnippetFormattingExtension extends Formatter.FormatterExtension: + + def rendererOptions(opt: MutableDataHolder): Unit = () + + object ExtendedFencedCodeBlockHandler extends CustomNodeFormatter[ExtendedFencedCodeBlock]: + override def render(node: ExtendedFencedCodeBlock, c: NodeFormatterContext, markdown: MarkdownWriter): Unit = + markdown.append( + SnippetRenderer.renderSnippetWithMessages(node) + ) + + object Format extends NodeFormatter: + override def getNodeFormattingHandlers: JSet[NodeFormattingHandler[?]] = + JSet( + new NodeFormattingHandler(classOf[ExtendedFencedCodeBlock], ExtendedFencedCodeBlockHandler), + ) + + def getNodeClasses: JSet[Class[?]] = null + + object Factory extends NodeFormatterFactory: + override def create(options: DataHolder): NodeFormatter = Format + + def extend(formatterBuilder: Formatter.Builder) = + formatterBuilder.nodeFormatterFactory(Factory) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala index 7a27bddab892..55f3ac31a7bb 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala @@ -137,4 +137,12 @@ object SnippetRenderer: def renderSnippetWithMessages(snippetName: Option[String], codeLines: Seq[String], messages: Seq[SnippetCompilerMessage], hasContext: Boolean): String = val transformedLines = wrapCodeLines.andThen(addCompileMessages(messages)).apply(codeLines).map(_.toHTML) val codeHTML = s"""${transformedLines.mkString("")}""" - s"""
$codeHTML
${snippetName.fold("")(snippetLabel(_))}
""" \ No newline at end of file + s"""
$codeHTML
${snippetName.fold("")(snippetLabel(_))}
""" + + def renderSnippetWithMessages(node: ExtendedFencedCodeBlock): String = + renderSnippetWithMessages( + node.name, + node.codeBlock.getContentChars.toString.split("\n").map(_ + "\n").toSeq, + node.compilationResult.toSeq.flatMap(_.messages), + node.hasContext + ) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala index ae2de8afdef9..7a7edc0f5e86 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala @@ -13,17 +13,17 @@ import com.vladsch.flexmark.util.options._ import com.vladsch.flexmark.util.sequence.BasedSequence import com.vladsch.flexmark._ +/** + * SnippetRenderingExtension is responsible for running an analysis for scala codeblocks in the static documentation/scaladoc comments. + * For each codeblock we run compiler to check whether snippet works in the newest scala version and to produce rich html codeblocks with + * compiler warnings/errors for IDE-like live experience. + */ object SnippetRenderingExtension extends HtmlRenderer.HtmlRendererExtension: def rendererOptions(opt: MutableDataHolder): Unit = () object ExtendedFencedCodeBlockHandler extends CustomNodeRenderer[ExtendedFencedCodeBlock]: override def render(node: ExtendedFencedCodeBlock, c: NodeRendererContext, html: HtmlWriter): Unit = html.raw( - SnippetRenderer.renderSnippetWithMessages( - node.name, - node.codeBlock.getContentChars.toString.split("\n").map(_ + "\n").toSeq, - node.compilationResult.toSeq.flatMap(_.messages), - node.hasContext - ) + SnippetRenderer.renderSnippetWithMessages(node) ) object Render extends NodeRenderer: @@ -36,4 +36,4 @@ object SnippetRenderingExtension extends HtmlRenderer.HtmlRendererExtension: override def create(options: DataHolder): NodeRenderer = Render def extend(htmlRendererBuilder: HtmlRenderer.Builder, tpe: String): Unit = - htmlRendererBuilder.nodeRendererFactory(Factory) \ No newline at end of file + htmlRendererBuilder.nodeRendererFactory(Factory) From 66946ff5ac61de0646028f8b007782f0f82ea137 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Tue, 28 Sep 2021 11:10:52 +0200 Subject: [PATCH 0728/1244] Fix API after rebase conflicts --- project/Build.scala | 2 +- project/scripts/genDocsScalaLang | 14 +++++++++----- .../tools/scaladoc/site/FrontMatterRenderer.scala | 6 +++--- .../src/dotty/tools/scaladoc/site/templates.scala | 15 ++++++++++++++- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index bc9121bdcac3..65daf5ee280c 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1365,7 +1365,7 @@ object Build { Seq(inkuireDestinationFile) }.taskValue, libraryDependencies ++= Dependencies.flexmarkDeps ++ Seq( - "nl.big-o" % "liqp" % "0.6.7", + "nl.big-o" % "liqp" % "0.6.8", "org.jsoup" % "jsoup" % "1.13.1", // Needed to process .html files for static site Dependencies.`jackson-dataformat-yaml`, diff --git a/project/scripts/genDocsScalaLang b/project/scripts/genDocsScalaLang index 8125c5cc0e8b..a59cc4509fd9 100755 --- a/project/scripts/genDocsScalaLang +++ b/project/scripts/genDocsScalaLang @@ -19,7 +19,7 @@ git clone "https://github.com/scala/docs.scala-lang.git" $DOCS_SCALA_LANG_DIR SBT="$SCRIPT_DIR/sbt" mkdir -pv $SITE_OUT_DIR env "scaladoc.projectFormat=md" "$SBT" "scaladoc/renderScaladocScalajsToFile $DOCS_SCALA_LANG_DIR/scripts/scaladoc-scalajs.js $DOCS_SCALA_LANG_DIR/resources/css code-snippets.css" -"dist/target/pack/bin/scaladoc" "-d" "$SITE_OUT_DIR" "-format" "md" "-siteroot" "docs" "/dev/null" +"bin/scaladoc" "-d" "$SITE_OUT_DIR" "-format" "md" "-siteroot" "docs" "/dev/null" if [ ! -d "$SITE_OUT_DIR" ]; then echo "Output directory did not exist: $SITE_OUT_DIR" 1>&2 @@ -30,12 +30,9 @@ fi cp -rf "$SITE_OUT_DIR/docs/reference"/* "$DOCS_SCALA_LANG_DIR/_scala3-reference" cp -rf "$SITE_OUT_DIR/docs/usage/scaladoc"/* "$DOCS_SCALA_LANG_DIR/_overviews/scala3-scaladoc" -cp -rf "$SITE_OUT_DIR/docs/reference/contextual/motivation.md" "$DOCS_SCALA_LANG_DIR/_scala3-reference/contextual.md" -cp -rf "$SITE_OUT_DIR/docs/reference/metaprogramming/toc.md" "$DOCS_SCALA_LANG_DIR/_scala3-reference/metaprogramming.md" cp -rf "$SITE_OUT_DIR/docs/resources/talks.md" "$DOCS_SCALA_LANG_DIR/scala3/talks.md" cp -rf "$SITE_OUT_DIR/docs/usage/getting-started.md" "$DOCS_SCALA_LANG_DIR/scala3/getting-started.md" -cp -rf "$SITE_OUT_DIR/docs/usage/language-versions.md" "$DOCS_SCALA_LANG_DIR/_scala3-reference/language-versions.md" -cp -rf "$SITE_OUT_DIR/docs/usage/worksheet-mode.md" "$DOCS_SCALA_LANG_DIR/_overviews/scala3-book/tools-worksheets.md" +cp -rf "$SITE_OUT_DIR/docs/usage/tools-worksheets.md" "$DOCS_SCALA_LANG_DIR/_overviews/scala3-book/tools-worksheets.md" # Copy csses and html importing these assets @@ -44,3 +41,10 @@ cp -f "$PWD/docs/docsScalaLangResources/scaladoc-assets.html" "$DOCS_SCALA_LANG_ # Hack inclusion of these assests by the docs.scala-lang jekyll builder echo "{% include scaladoc-assets.html %}" >> "$DOCS_SCALA_LANG_DIR/_layouts/inner-page-parent-dropdown.html" + +# Push changes to fork branch +cd $DOCS_SCALA_LANG_DIR +git remote add barkingbad git@github.com:BarkingBad/docs.scala-lang.git +git add . +git commit -m "Update docs from dotty repo" +git push -f barkingbad main:pregenerated-page diff --git a/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala index 7590927cb248..dde7650a9480 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala @@ -9,10 +9,10 @@ object FrontMatterRenderer: def render(properties: Map[String, Object]): String = def renderProperties(newProps: Map[String, Object]): List[String] = newProps.collect { - case (k: String, v: String) => s"$p: $v" - } + case (k: String, v: String) => s"$k: $v" + }.toList - val rows = renderProperties(properties) ++ renderProperties(properties("page")) + val rows = renderProperties(properties) ++ renderProperties(properties("page").asInstanceOf[Map[String, Object]]) rows.mkString("---\n", "\n", "\n---") + "\n\n\n\n" diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala index 7b4f4939f72e..22755290840e 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala @@ -16,6 +16,9 @@ import com.vladsch.flexmark.util.options.{DataHolder, MutableDataSet} import com.vladsch.flexmark.html.HtmlRenderer import com.vladsch.flexmark.formatter.Formatter import liqp.Template +import liqp.TemplateContext +import liqp.tags.Tag +import liqp.nodes.LNode import scala.collection.JavaConverters._ import scala.io.Source @@ -101,7 +104,17 @@ case class TemplateFile( // Library requires mutable maps.. val mutableProperties = new JHashMap(ctx.properties.transform((_, v) => asJavaElement(v)).asJava) - val rendered = Template.parse(this.rawCode).render(mutableProperties) + + // Register escaping {% link ... %} in markdown + val tag = new Tag("link"): + override def render(context: TemplateContext, nodes: Array[? <: LNode]): Object = + val link = super.asString(nodes(0).render(context)) + s"{% link $link %}" + + val rendered = ssctx.args.projectFormat match + case "html" => Template.parse(this.rawCode).`with`(tag).render(mutableProperties) + case "md" => this.rawCode + // We want to render markdown only if next template is html val code = if (isHtml || layoutTemplate.exists(!_.isHtml)) rendered else // Snippet compiler currently supports markdown only From 1d928bcaa1c855f6bb1480769b00c07f358e017c Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Mon, 4 Oct 2021 13:36:02 +0200 Subject: [PATCH 0729/1244] Fix some broken likns for static site and configure CI for nightly pushes to docs.scala-lang --- .github/workflows/ci.yaml | 25 +++++++++++++++---- docs/docs/usage/getting-started.md | 8 +++--- docs/docs/usage/scaladoc/search-engine.md | 2 +- project/CopyDocs.scala | 30 ++++++++++++++++++----- project/scripts/genDocsScalaLang | 7 ------ 5 files changed, 49 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fa8c67c5990c..24d04be110f5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -470,9 +470,12 @@ jobs: if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'" env: NIGHTLYBUILD: yes - BOT_TOKEN: ${{ secrets.BOT_TOKEN }} # If you need to change this: - # Generate one at https://github.com/settings/tokens - # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website + DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }} # If you need to change this: + # Generate one at https://github.com/settings/tokens + # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website + DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }} # If you need to change this: + # Generate one at https://github.com/settings/tokens + # Make sure you have the write permissions to the repo: https://github.com/scala/docs.scala-lang steps: - name: Reset existing repo @@ -494,14 +497,26 @@ jobs: run: | ./project/scripts/genDocs -doc-snapshot - - name: Deploy Website + - name: Deploy Website to dotty-website uses: peaceiris/actions-gh-pages@v3 with: - personal_token: ${{ secrets.BOT_TOKEN }} + personal_token: ${{ DOTTY_WEBSITE_BOT_TOKEN }} publish_dir: docs/_site external_repository: lampepfl/dotty-website publish_branch: gh-pages + - name: Generate docs.scala-lang preprocessed files + run: | + ./project/scripts/genDocsScalaLang + + - name: Deploy Website to docs.scala-lang + uses: peaceiris/actions-gh-pages@v3 + with: + personal_token: ${{ DOCS_SCALALANG_BOT_TOKEN }} + publish_dir: docsScalaLang + external_repository: scala/docs.scala-lang + publish_branch: dev + publish_release: runs-on: [self-hosted, Linux] container: diff --git a/docs/docs/usage/getting-started.md b/docs/docs/usage/getting-started.md index c888285fb39c..1c43d6e5adbb 100644 --- a/docs/docs/usage/getting-started.md +++ b/docs/docs/usage/getting-started.md @@ -50,7 +50,7 @@ For more information, read the [coursier-cli documentation](https://get-coursier You only need two tools to compile, run, test, and package a Scala project: Java 8 or 11, and sbt. To install these manually: -1. Download Java from [Oracle Java 8](https://www.oracle.com/java/technologies/javase-jdk8-downloads.html), [Oracle Java 11](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html), or [AdoptOpenJDK 8/11](https://adoptopenjdk.net/). Refer to [JDK Compatibility](/overviews/jdk-compatibility/overview.html) for Scala/Java compatibility detail. +1. Download Java from [Oracle Java 8](https://www.oracle.com/java/technologies/javase-jdk8-downloads.html), [Oracle Java 11](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html), or [AdoptOpenJDK 8/11](https://adoptopenjdk.net/). Refer to [JDK Compatibility](https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html) for Scala/Java compatibility detail. 2. Install [sbt](https://www.scala-sbt.org/download.html) @@ -87,7 +87,7 @@ hello-world/ ``` The scala file `Main.scala` in `src/main/scala` is all we need for now. -More documentation about sbt can be found in the [Scala Book](/scala3/book/scala-tools.html) and in the official sbt [documentation](https://www.scala-sbt.org/1.x/docs/index.html) +More documentation about sbt can be found in the [Scala Book](https://docs.scala-lang.org/scala3/book/scala-tools.html) and in the official sbt [documentation](https://www.scala-sbt.org/1.x/docs/index.html) {% comment %} @@ -156,8 +156,8 @@ Then type `exit` or press `[Ctrl][d]` to exit sbt and return to your command lin Now that you’ve created a first “Hello, world” example with Scala 3, you’re ready for some next steps. Consider checking out: -- [The Scala 3 Book](/scala3/book/introduction.html), which provides a set of short lessons introducing Scala’s main features -- [The migration guide](/scala3/guides/migration/compatibility-intro.html) helps you to migrate your existing Scala 2 code base to Scala 3. +- [The Scala 3 Book](https://docs.scala-lang.org/scala3/book/introduction.html), which provides a set of short lessons introducing Scala’s main features +- [The migration guide](https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html) helps you to migrate your existing Scala 2 code base to Scala 3. When you want to connect with other Scala users, there are several mailing lists and real-time chat rooms available. Check out our [Scala community page](https://scala-lang.org/community/) for a list of these resources, and for where to reach out for help. diff --git a/docs/docs/usage/scaladoc/search-engine.md b/docs/docs/usage/scaladoc/search-engine.md index b338d38792a7..1bac1d37635d 100644 --- a/docs/docs/usage/scaladoc/search-engine.md +++ b/docs/docs/usage/scaladoc/search-engine.md @@ -83,4 +83,4 @@ Inkuire works as a JavaScript worker in the browser thanks to the power of [Scal To enable Inkuire when running scaladoc, add the flag `-Ygenerate-inkuire`. By adding this flag two files are generated: - `inkuire-db.json` - this is the file containing all the searchable declarations from the currently documented project in a format readable to the Inkuire search engine. -- `inkuire-config.json` - this file contains the locations of the database files that should be searchable from the documentation of the current project. By default, it will be generated with the location of the local db file as well as the default implied locations of database files in [External mappings](/scala3/guides/scaladoc/settings.html#-external-mappings). +- `inkuire-config.json` - this file contains the locations of the database files that should be searchable from the documentation of the current project. By default, it will be generated with the location of the local db file as well as the default implied locations of database files in [External mappings](https://docs.scala-lang.org/scala3/guides/scaladoc/settings.html#-external-mappings). diff --git a/project/CopyDocs.scala b/project/CopyDocs.scala index 5713f15e71ef..29760ce85e42 100644 --- a/project/CopyDocs.scala +++ b/project/CopyDocs.scala @@ -22,11 +22,11 @@ object CopyDocs { implicit def stringToFun(s: String): MyParams => String = _ => s // Patterns, for convenience - val titlePattern = "(?s)^---\n.*title: ([^\n]*).*---" - val jekyllLinkPattern = """\{\% link _overviews/scala3-scaladoc(.*) %\}""" + val titlePattern = "(?s)^---\n.*?title: ([^\n]*).*?---" + val jekyllLinkPattern = """\{\% link _overviews/scala3-reference(.*) %\}""" val jekyllLinkSubstitution = "..$1" - val jekyllLinkPattern2 = """\{\% link |_overviews/scala3-scaladoc/(.*) %\}""" - val jekyllLinkSubstitution2 = "$1" + val jekyllLinkPattern2 = """\{\% link _overviews/scala3-scaladoc(.*) %\}""" + val jekyllLinkSubstitution2 = ".$1" val localLinkPattern = """\((?!http|www)(.*).html\)""" val localLinkSubstitution = "($1.md)" @@ -44,6 +44,22 @@ object CopyDocs { * The inner set is a collection of pairs `regex pattern` -> `substitution value`. */ val transformationMap: Map[String, Set[(String, MyParams => String)]] = Map( + "docs/docs/usage/scaladoc/index.md" -> Set( + ("""\{\{ site\.baseurl \}\}/resources/images/scala3/scaladoc/logo\.svg""" -> "images/scaladoc-logo.png"), + ), + + "docs/docs/usage/scaladoc/site-versioning.md" -> Set( + ("""/resources/images/scala3/scaladoc/nightly\.gif""" -> "images/scaladoc/nightly.gif"), + ), + + "docs/docs/usage/scaladoc/search-engine.md" -> Set( + ("""/resources/images/scala3/scaladoc/inkuire-1\.0\.0-M2_js_flatMap\.gif""" -> "images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif"), + ), + + "docs/docs/reference/other-new-features/explicit-nulls.md" -> Set( + ("""/resources/images/scala3/explicit-nulls/explicit-nulls-type-hierarchy\.png""" -> "images/explicit-nulls/explicit-nulls-type-hierarchy.png"), + ), + "docs/docs/reference/" -> (commonTransformations + (titlePattern -> ((p) => s"---\nlayout: doc-page\ntitle: $$1\nmovedTo: https://docs.scala-lang.org/scala3/reference/${p.newPath}.html\n---")), ), @@ -57,7 +73,9 @@ object CopyDocs { ), "docs/docs/usage/tools-worksheets" -> (commonTransformations + - (titlePattern -> "---\nlayout: doc-page\ntitle: \"Worksheet mode with Dotty IDE\"\nmovedTo: https://docs.scala-lang.org/scala3/book/tools-worksheets.html\n---") + (titlePattern -> "---\nlayout: doc-page\ntitle: \"Worksheet mode with Dotty IDE\"\nmovedTo: https://docs.scala-lang.org/scala3/book/tools-worksheets.html\n---") + + ("""/resources/images/scala3-book/intellij-worksheet\.png""" -> "images/worksheets/intellij-worksheet.png") + + ("""/resources/images/scala3-book/metals-worksheet\.png""" -> "images/worksheets/metals-worksheet.png") ), "docs/docs/resources/talks" -> (commonTransformations + @@ -76,7 +94,7 @@ object CopyDocs { val fileContent = inputStream.getLines().mkString("\n") new PrintStream(newPath.toFile) { - val patterns = transformationMap.find { case (k, v) => path.toString.startsWith(k) }.map(_._2).getOrElse(Set.empty) + val patterns = transformationMap.filter { case (k, v) => path.toString.startsWith(k) }.flatMap(_._2) val params = MyParams(newPath = s.stripPrefix("docs/docs/reference/").stripSuffix(".md")) val transformed = patterns.foldLeft(fileContent) { case (res, (pattern, substitution)) => res.replaceAll(pattern, substitution(params)) } write(transformed.getBytes("UTF8")) diff --git a/project/scripts/genDocsScalaLang b/project/scripts/genDocsScalaLang index a59cc4509fd9..40703bc0dac7 100755 --- a/project/scripts/genDocsScalaLang +++ b/project/scripts/genDocsScalaLang @@ -41,10 +41,3 @@ cp -f "$PWD/docs/docsScalaLangResources/scaladoc-assets.html" "$DOCS_SCALA_LANG_ # Hack inclusion of these assests by the docs.scala-lang jekyll builder echo "{% include scaladoc-assets.html %}" >> "$DOCS_SCALA_LANG_DIR/_layouts/inner-page-parent-dropdown.html" - -# Push changes to fork branch -cd $DOCS_SCALA_LANG_DIR -git remote add barkingbad git@github.com:BarkingBad/docs.scala-lang.git -git add . -git commit -m "Update docs from dotty repo" -git push -f barkingbad main:pregenerated-page From a59db44734663b8c8fee0bb6334612e6f599b64a Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Tue, 5 Oct 2021 12:13:45 +0200 Subject: [PATCH 0730/1244] Fix publishing nightly docs do BarkingBad fork. --- .github/workflows/ci.yaml | 2 +- project/scripts/genDocsScalaLang | 16 +++++++++++++++- .../dotty/tools/scaladoc/ScaladocSettings.scala | 2 +- .../scaladoc/site/FrontMatterRenderer.scala | 8 ++++++-- .../tools/scaladoc/site/LoadedTemplate.scala | 8 +------- .../dotty/tools/scaladoc/site/templates.scala | 13 +++++++++++-- 6 files changed, 35 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 24d04be110f5..037229da32fc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -514,7 +514,7 @@ jobs: with: personal_token: ${{ DOCS_SCALALANG_BOT_TOKEN }} publish_dir: docsScalaLang - external_repository: scala/docs.scala-lang + external_repository: BarkingBad/docs.scala-lang publish_branch: dev publish_release: diff --git a/project/scripts/genDocsScalaLang b/project/scripts/genDocsScalaLang index 40703bc0dac7..1404cd5ef0f7 100755 --- a/project/scripts/genDocsScalaLang +++ b/project/scripts/genDocsScalaLang @@ -18,8 +18,22 @@ git clone "https://github.com/scala/docs.scala-lang.git" $DOCS_SCALA_LANG_DIR SBT="$SCRIPT_DIR/sbt" mkdir -pv $SITE_OUT_DIR + env "scaladoc.projectFormat=md" "$SBT" "scaladoc/renderScaladocScalajsToFile $DOCS_SCALA_LANG_DIR/scripts/scaladoc-scalajs.js $DOCS_SCALA_LANG_DIR/resources/css code-snippets.css" -"bin/scaladoc" "-d" "$SITE_OUT_DIR" "-format" "md" "-siteroot" "docs" "/dev/null" + +DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyNonBootstrappedVersion)\"" +DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1) + +DOTTY_BOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyVersion)\"" +DOTTY_BOOTSTRAPPED_VERSION=$(eval $DOTTY_BOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1) + +GITHUB_REPOSITORY="lampepfl/dotty" +GITHUB_SHA="3.0.0" + +"bin/scaladoc" "-d" "$SITE_OUT_DIR" "-format" "md" "-siteroot" "docs" "/dev/null " \ + -source-links:out/bootstrap/stdlib-bootstrapped/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/src_managed/main/scala-library-src=github://scala/scala/v"${STDLIB_VERSION}"#src/library \ + -source-links:out/bootstrap/stdlib-bootstrapped/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/src_managed/main/dotty-library-src=github://"${GITHUB_REPOSITORY}"/"${GITHUB_SHA}"\#library/src \ + -source-links:github://"${GITHUB_REPOSITORY}"/"${GITHUB_SHA}" \ if [ ! -d "$SITE_OUT_DIR" ]; then echo "Output directory did not exist: $SITE_OUT_DIR" 1>&2 diff --git a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala index ba077d31a8fd..4697783de20c 100644 --- a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala +++ b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala @@ -128,7 +128,7 @@ class ScaladocSettings extends SettingGroup with AllScalaSettings: val scastieConfiguration: Setting[String] = StringSetting("-scastie-configuration", "Scastie configuration", "Additional configuration passed to Scastie in code snippets", "") - + val projectFormat: Setting[String] = ChoiceSetting( "-format", diff --git a/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala index dde7650a9480..2e02918b5b39 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala @@ -14,7 +14,11 @@ object FrontMatterRenderer: val rows = renderProperties(properties) ++ renderProperties(properties("page").asInstanceOf[Map[String, Object]]) - rows.mkString("---\n", "\n", "\n---") + "\n\n\n\n" + rows.mkString("---\n", "\n", "\n---") + "\n\n\n\n" + diff --git a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala index f7623d79c7c0..3a7ba6c98d07 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala @@ -40,15 +40,9 @@ case class LoadedTemplate( def resolveToHtml(ctx: StaticSiteContext): ResolvedPage = val posts = children.map(_.lazyTemplateProperties(ctx)) def getMap(key: String) = templateFile.settings.getOrElse(key, Map.empty).asInstanceOf[Map[String, Object]] - val sourceLinks = if !file.exists() then Nil else - // TODO (https://github.com/lampepfl/scala3doc/issues/240): configure source root - // toRealPath is used to turn symlinks into proper paths - val actualPath = Paths.get("").toAbsolutePath.relativize(file.toPath.toRealPath()) - ctx.sourceLinks.pathTo(actualPath).map("viewSource" -> _ ) ++ - ctx.sourceLinks.pathTo(actualPath, operation = "edit", optionalRevision = Some("master")).map("editSource" -> _ ) val updatedSettings = templateFile.settings ++ ctx.projectWideProperties + - ("site" -> (getMap("site") + ("posts" -> posts))) + ("urls" -> sourceLinks.toMap) + + ("site" -> (getMap("site") + ("posts" -> posts))) + ("page" -> (getMap("page") + ("title" -> templateFile.title.name))) templateFile.resolveInner(RenderingContext(updatedSettings, ctx.layouts))(using ctx) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala index 22755290840e..3149023d3613 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala @@ -114,7 +114,15 @@ case class TemplateFile( val rendered = ssctx.args.projectFormat match case "html" => Template.parse(this.rawCode).`with`(tag).render(mutableProperties) case "md" => this.rawCode - + + val sourceLinks = if !file.exists() then Nil else + // TODO (https://github.com/lampepfl/scala3doc/issues/240): configure source root + // toRealPath is used to turn symlinks into proper paths + val actualPath = Paths.get("").toAbsolutePath.relativize(file.toPath.toRealPath()) + ssctx.sourceLinks.pathTo(actualPath).map("viewSource" -> _ ) ++ + // List("editSource" -> ssctx.sourceLinks.pathTo(actualPath)) + ssctx.sourceLinks.pathTo(actualPath, operation = "edit", optionalRevision = Some("master")).map("editSource" -> _ ) + // We want to render markdown only if next template is html val code = if (isHtml || layoutTemplate.exists(!_.isHtml)) rendered else // Snippet compiler currently supports markdown only @@ -125,7 +133,8 @@ case class TemplateFile( ssctx.args.projectFormat match case "html" => HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed) case "md" => - FrontMatterRenderer.render(settings) + + + FrontMatterRenderer.render(settings + ("urls" -> sourceLinks.toMap)) + Formatter.builder(defaultMarkdownOptions).build().render(processed) From 9a84b7032fa7ce520a82d4e729b4b55d88a52a68 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Thu, 14 Oct 2021 15:41:59 +0200 Subject: [PATCH 0731/1244] Fix docs and resources copying --- docs/docs/reference/changed-features.md | 4 +- .../changed-features/compiler-plugins.md | 2 +- .../changed-features/eta-expansion.md | 2 +- .../changed-features/implicit-conversions.md | 2 +- .../changed-features/implicit-resolution.md | 2 +- .../reference/changed-features/imports.md | 2 +- .../changed-features/lazy-vals-init.md | 2 +- .../changed-features/main-functions.md | 2 +- .../changed-features/match-syntax.md | 2 +- .../changed-features/numeric-literals.md | 4 +- .../reference/changed-features/operators.md | 2 +- .../changed-features/overload-resolution.md | 2 +- .../changed-features/pattern-bindings.md | 2 +- .../changed-features/pattern-matching.md | 2 +- .../changed-features/structural-types.md | 2 +- .../changed-features/type-checking.md | 2 +- .../changed-features/type-inference.md | 2 +- .../changed-features/vararg-splices.md | 2 +- .../reference/changed-features/wildcards.md | 4 +- docs/docs/reference/dropped-features.md | 2 +- .../reference/dropped-features/auto-apply.md | 2 +- .../dropped-features/class-shadowing.md | 2 +- .../dropped-features/delayed-init.md | 2 +- .../reference/dropped-features/do-while.md | 2 +- .../dropped-features/early-initializers.md | 2 +- .../dropped-features/existential-types.md | 2 +- .../reference/dropped-features/limit22.md | 2 +- .../docs/reference/dropped-features/macros.md | 2 +- .../dropped-features/package-objects.md | 2 +- .../dropped-features/procedure-syntax.md | 2 +- .../reference/dropped-features/symlits.md | 2 +- .../dropped-features/this-qualifier.md | 2 +- .../dropped-features/type-projection.md | 2 +- .../dropped-features/weak-conformance.md | 2 +- .../dropped-features/wildcard-init.md | 2 +- docs/docs/reference/dropped-features/xml.md | 2 +- docs/docs/reference/language-versions.md | 2 +- .../other-new-features/experimental-defs.md | 6 +- .../reference/other-new-features/type-test.md | 2 +- docs/docs/reference/syntax.md | 2 +- docs/docs/resources/talks.md | 69 ------- docs/docs/usage/getting-started.md | 193 ------------------ docs/docs/usage/tools-worksheets.md | 56 ----- .../scaladoc/inkuire-1.0.0-M2_js_flatMap.gif | Bin 0 -> 352175 bytes docs/sidebar.yml | 5 - project/CopyDocs.scala | 16 +- project/scripts/genDocsScalaLang | 11 +- .../dotty/tools/scaladoc/site/templates.scala | 6 +- 48 files changed, 56 insertions(+), 390 deletions(-) delete mode 100644 docs/docs/resources/talks.md delete mode 100644 docs/docs/usage/getting-started.md delete mode 100644 docs/docs/usage/tools-worksheets.md create mode 100644 docs/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif diff --git a/docs/docs/reference/changed-features.md b/docs/docs/reference/changed-features.md index c23a9031bef0..7a8f717f2394 100644 --- a/docs/docs/reference/changed-features.md +++ b/docs/docs/reference/changed-features.md @@ -1,8 +1,8 @@ --- title: "Other Changed Features" type: chapter -num: 51 -previous-page: /scala3/reference/other-new-features/type-test +num: 52 +previous-page: /scala3/reference/other-new-features/experimental-defs next-page: /scala3/reference/changed-features/numeric-literals --- diff --git a/docs/docs/reference/changed-features/compiler-plugins.md b/docs/docs/reference/changed-features/compiler-plugins.md index c77796d71df1..b8e108c560c4 100644 --- a/docs/docs/reference/changed-features/compiler-plugins.md +++ b/docs/docs/reference/changed-features/compiler-plugins.md @@ -1,7 +1,7 @@ --- title: "Changes in Compiler Plugins" type: section -num: 67 +num: 68 previous-page: /scala3/reference/changed-features/eta-expansion next-page: /scala3/reference/changed-features/lazy-vals-init --- diff --git a/docs/docs/reference/changed-features/eta-expansion.md b/docs/docs/reference/changed-features/eta-expansion.md index 91516edca5a5..f21cb54406ad 100644 --- a/docs/docs/reference/changed-features/eta-expansion.md +++ b/docs/docs/reference/changed-features/eta-expansion.md @@ -1,7 +1,7 @@ --- title: "Automatic Eta Expansion" type: section -num: 66 +num: 67 previous-page: /scala3/reference/changed-features/pattern-matching next-page: /scala3/reference/changed-features/compiler-plugins --- diff --git a/docs/docs/reference/changed-features/implicit-conversions.md b/docs/docs/reference/changed-features/implicit-conversions.md index 39b4cde31e63..aab1baa32373 100644 --- a/docs/docs/reference/changed-features/implicit-conversions.md +++ b/docs/docs/reference/changed-features/implicit-conversions.md @@ -1,7 +1,7 @@ --- title: "Implicit Conversions" type: section -num: 60 +num: 61 previous-page: /scala3/reference/changed-features/implicit-resolution next-page: /scala3/reference/changed-features/overload-resolution --- diff --git a/docs/docs/reference/changed-features/implicit-resolution.md b/docs/docs/reference/changed-features/implicit-resolution.md index 410784834f95..2a563aceeb19 100644 --- a/docs/docs/reference/changed-features/implicit-resolution.md +++ b/docs/docs/reference/changed-features/implicit-resolution.md @@ -1,7 +1,7 @@ --- title: "Changes in Implicit Resolution" type: section -num: 59 +num: 60 previous-page: /scala3/reference/changed-features/type-inference next-page: /scala3/reference/changed-features/implicit-conversions --- diff --git a/docs/docs/reference/changed-features/imports.md b/docs/docs/reference/changed-features/imports.md index 39568769a270..e46fbc8fc44b 100644 --- a/docs/docs/reference/changed-features/imports.md +++ b/docs/docs/reference/changed-features/imports.md @@ -1,7 +1,7 @@ --- title: "Imports" type: section -num: 56 +num: 57 previous-page: /scala3/reference/changed-features/wildcards next-page: /scala3/reference/changed-features/type-checking --- diff --git a/docs/docs/reference/changed-features/lazy-vals-init.md b/docs/docs/reference/changed-features/lazy-vals-init.md index a065cebb2a49..f70ec622f6e1 100644 --- a/docs/docs/reference/changed-features/lazy-vals-init.md +++ b/docs/docs/reference/changed-features/lazy-vals-init.md @@ -1,7 +1,7 @@ --- title: Lazy Vals Initialization type: section -num: 68 +num: 69 previous-page: /scala3/reference/changed-features/compiler-plugins next-page: /scala3/reference/changed-features/main-functions --- diff --git a/docs/docs/reference/changed-features/main-functions.md b/docs/docs/reference/changed-features/main-functions.md index 6f035278ed05..777532e7110b 100644 --- a/docs/docs/reference/changed-features/main-functions.md +++ b/docs/docs/reference/changed-features/main-functions.md @@ -1,7 +1,7 @@ --- title: "Main Methods" type: section -num: 69 +num: 70 previous-page: /scala3/reference/changed-features/lazy-vals-init next-page: /scala3/reference/dropped-features --- diff --git a/docs/docs/reference/changed-features/match-syntax.md b/docs/docs/reference/changed-features/match-syntax.md index 7ebc85b6d003..12e35cfa94df 100644 --- a/docs/docs/reference/changed-features/match-syntax.md +++ b/docs/docs/reference/changed-features/match-syntax.md @@ -1,7 +1,7 @@ --- title: "Match Expressions" type: section -num: 62 +num: 63 previous-page: /scala3/reference/changed-features/overload-resolution next-page: /scala3/reference/changed-features/vararg-splices --- diff --git a/docs/docs/reference/changed-features/numeric-literals.md b/docs/docs/reference/changed-features/numeric-literals.md index 8a21d97bd4a4..1cc07e3b1c8e 100644 --- a/docs/docs/reference/changed-features/numeric-literals.md +++ b/docs/docs/reference/changed-features/numeric-literals.md @@ -1,9 +1,9 @@ --- title: "Numeric Literals" type: section -num: 52 +num: 53 previous-page: /scala3/reference/changed-features next-page: /scala3/reference/changed-features/structural-types --- -[Document was moved](../experimental/numeric-literals.md) \ No newline at end of file +[Document was moved](../experimental/numeric-literals.md) diff --git a/docs/docs/reference/changed-features/operators.md b/docs/docs/reference/changed-features/operators.md index 5e05c6bfbcae..953aa18c8408 100644 --- a/docs/docs/reference/changed-features/operators.md +++ b/docs/docs/reference/changed-features/operators.md @@ -1,7 +1,7 @@ --- title: "Rules for Operators" type: section -num: 54 +num: 55 previous-page: /scala3/reference/changed-features/structural-types next-page: /scala3/reference/changed-features/wildcards --- diff --git a/docs/docs/reference/changed-features/overload-resolution.md b/docs/docs/reference/changed-features/overload-resolution.md index 6b203299707f..4205acdd412f 100644 --- a/docs/docs/reference/changed-features/overload-resolution.md +++ b/docs/docs/reference/changed-features/overload-resolution.md @@ -1,7 +1,7 @@ --- title: "Changes in Overload Resolution" type: section -num: 61 +num: 62 previous-page: /scala3/reference/changed-features/implicit-conversions next-page: /scala3/reference/changed-features/match-syntax --- diff --git a/docs/docs/reference/changed-features/pattern-bindings.md b/docs/docs/reference/changed-features/pattern-bindings.md index 307ff6387cce..a5eb39e98da6 100644 --- a/docs/docs/reference/changed-features/pattern-bindings.md +++ b/docs/docs/reference/changed-features/pattern-bindings.md @@ -1,7 +1,7 @@ --- title: "Pattern Bindings" type: section -num: 64 +num: 65 previous-page: /scala3/reference/changed-features/vararg-splices next-page: /scala3/reference/changed-features/pattern-matching --- diff --git a/docs/docs/reference/changed-features/pattern-matching.md b/docs/docs/reference/changed-features/pattern-matching.md index 2216d145a80d..93712f004307 100644 --- a/docs/docs/reference/changed-features/pattern-matching.md +++ b/docs/docs/reference/changed-features/pattern-matching.md @@ -1,7 +1,7 @@ --- title: "Option-less pattern matching" type: section -num: 65 +num: 66 previous-page: /scala3/reference/changed-features/pattern-bindings next-page: /scala3/reference/changed-features/eta-expansion --- diff --git a/docs/docs/reference/changed-features/structural-types.md b/docs/docs/reference/changed-features/structural-types.md index fe20a3aa5483..3ce3d6ac88bd 100644 --- a/docs/docs/reference/changed-features/structural-types.md +++ b/docs/docs/reference/changed-features/structural-types.md @@ -1,7 +1,7 @@ --- title: "Programmatic Structural Types" type: section -num: 53 +num: 54 previous-page: /scala3/reference/changed-features/numeric-literals next-page: /scala3/reference/changed-features/operators --- diff --git a/docs/docs/reference/changed-features/type-checking.md b/docs/docs/reference/changed-features/type-checking.md index 81ca345a6c7e..f647e57ac462 100644 --- a/docs/docs/reference/changed-features/type-checking.md +++ b/docs/docs/reference/changed-features/type-checking.md @@ -1,7 +1,7 @@ --- title: "Changes in Type Checking" type: section -num: 57 +num: 58 previous-page: /scala3/reference/changed-features/imports next-page: /scala3/reference/changed-features/type-inference --- diff --git a/docs/docs/reference/changed-features/type-inference.md b/docs/docs/reference/changed-features/type-inference.md index 873c91831210..2432cb8e4339 100644 --- a/docs/docs/reference/changed-features/type-inference.md +++ b/docs/docs/reference/changed-features/type-inference.md @@ -1,7 +1,7 @@ --- title: "Changes in Type Inference" type: section -num: 58 +num: 59 previous-page: /scala3/reference/changed-features/type-checking next-page: /scala3/reference/changed-features/implicit-resolution --- diff --git a/docs/docs/reference/changed-features/vararg-splices.md b/docs/docs/reference/changed-features/vararg-splices.md index efa7f034acea..2da55ee79945 100644 --- a/docs/docs/reference/changed-features/vararg-splices.md +++ b/docs/docs/reference/changed-features/vararg-splices.md @@ -1,7 +1,7 @@ --- title: "Vararg Splices" type: section -num: 63 +num: 64 previous-page: /scala3/reference/changed-features/match-syntax next-page: /scala3/reference/changed-features/pattern-bindings --- diff --git a/docs/docs/reference/changed-features/wildcards.md b/docs/docs/reference/changed-features/wildcards.md index fdf69fdcd954..0a84ebbf2a48 100644 --- a/docs/docs/reference/changed-features/wildcards.md +++ b/docs/docs/reference/changed-features/wildcards.md @@ -1,7 +1,7 @@ --- title: Wildcard Arguments in Types type: section -num: 55 +num: 56 previous-page: /scala3/reference/changed-features/operators next-page: /scala3/reference/changed-features/imports --- @@ -49,4 +49,4 @@ These rules make it possible to cross build between Scala 2 using the kind proje There is also a migration path for users that want a one-time transition to syntax with `_` as a type parameter placeholder. With option `-Ykind-projector:underscores` Scala 3 will regard `_` as a type parameter placeholder, leaving `?` as the only syntax for wildcards. -To cross-compile with old Scala 2 sources, while using `_` a placeholder, you must use options `-Xsource:3 -P:kind-projector:underscore-placeholders` together with a recent version of kind-projector (`0.13` and higher) and most recent versions of Scala 2 (`2.13.5` and higher and `2.12.14` and higher) +To cross-compile with old Scala 2 sources, while using `_` a placeholder, you must use options `-Xsource:3 -P:kind-projector:underscore-placeholders` together with a recent version of kind-projector (`0.13` and higher) and most recent versions of Scala 2 (`2.13.5` and higher and `2.12.14` and higher) diff --git a/docs/docs/reference/dropped-features.md b/docs/docs/reference/dropped-features.md index b2fb1fbe9fe2..6ccff5c40425 100644 --- a/docs/docs/reference/dropped-features.md +++ b/docs/docs/reference/dropped-features.md @@ -1,7 +1,7 @@ --- title: "Dropped Features" type: chapter -num: 70 +num: 71 previous-page: /scala3/reference/changed-features/main-functions next-page: /scala3/reference/dropped-features/delayed-init --- diff --git a/docs/docs/reference/dropped-features/auto-apply.md b/docs/docs/reference/dropped-features/auto-apply.md index 8670850f7903..6696bd8165d8 100644 --- a/docs/docs/reference/dropped-features/auto-apply.md +++ b/docs/docs/reference/dropped-features/auto-apply.md @@ -1,7 +1,7 @@ --- title: "Dropped: Auto-Application" type: section -num: 83 +num: 84 previous-page: /scala3/reference/dropped-features/symlits next-page: /scala3/reference/dropped-features/weak-conformance --- diff --git a/docs/docs/reference/dropped-features/class-shadowing.md b/docs/docs/reference/dropped-features/class-shadowing.md index b3a4ab2dc1ad..50101bf1d0b4 100644 --- a/docs/docs/reference/dropped-features/class-shadowing.md +++ b/docs/docs/reference/dropped-features/class-shadowing.md @@ -1,7 +1,7 @@ --- title: "Dropped: Class Shadowing" type: section -num: 79 +num: 80 previous-page: /scala3/reference/dropped-features/early-initializers next-page: /scala3/reference/dropped-features/limit22 --- diff --git a/docs/docs/reference/dropped-features/delayed-init.md b/docs/docs/reference/dropped-features/delayed-init.md index 5673db5dfb8e..f0b65a242c1a 100644 --- a/docs/docs/reference/dropped-features/delayed-init.md +++ b/docs/docs/reference/dropped-features/delayed-init.md @@ -1,7 +1,7 @@ --- title: "Dropped: DelayedInit" type: section -num: 71 +num: 72 previous-page: /scala3/reference/dropped-features next-page: /scala3/reference/dropped-features/macros --- diff --git a/docs/docs/reference/dropped-features/do-while.md b/docs/docs/reference/dropped-features/do-while.md index 3fd59430ac3b..7bc3b73e0091 100644 --- a/docs/docs/reference/dropped-features/do-while.md +++ b/docs/docs/reference/dropped-features/do-while.md @@ -1,7 +1,7 @@ --- title: "Dropped: Do-While" type: section -num: 75 +num: 76 previous-page: /scala3/reference/dropped-features/type-projection next-page: /scala3/reference/dropped-features/procedure-syntax --- diff --git a/docs/docs/reference/dropped-features/early-initializers.md b/docs/docs/reference/dropped-features/early-initializers.md index 18d97640b12f..234de159c30c 100644 --- a/docs/docs/reference/dropped-features/early-initializers.md +++ b/docs/docs/reference/dropped-features/early-initializers.md @@ -1,7 +1,7 @@ --- title: "Dropped: Early Initializers" type: section -num: 78 +num: 79 previous-page: /scala3/reference/dropped-features/package-objects next-page: /scala3/reference/dropped-features/class-shadowing --- diff --git a/docs/docs/reference/dropped-features/existential-types.md b/docs/docs/reference/dropped-features/existential-types.md index df624cbd0721..ea176659fd77 100644 --- a/docs/docs/reference/dropped-features/existential-types.md +++ b/docs/docs/reference/dropped-features/existential-types.md @@ -1,7 +1,7 @@ --- title: "Dropped: Existential Types" type: section -num: 73 +num: 74 previous-page: /scala3/reference/dropped-features/macros next-page: /scala3/reference/dropped-features/type-projection --- diff --git a/docs/docs/reference/dropped-features/limit22.md b/docs/docs/reference/dropped-features/limit22.md index 2e21efec58f6..1c2bb0e2882a 100644 --- a/docs/docs/reference/dropped-features/limit22.md +++ b/docs/docs/reference/dropped-features/limit22.md @@ -1,7 +1,7 @@ --- title: "Dropped: Limit 22" type: section -num: 80 +num: 81 previous-page: /scala3/reference/dropped-features/class-shadowing next-page: /scala3/reference/dropped-features/xml --- diff --git a/docs/docs/reference/dropped-features/macros.md b/docs/docs/reference/dropped-features/macros.md index f7a23edb0057..8208e8ee630c 100644 --- a/docs/docs/reference/dropped-features/macros.md +++ b/docs/docs/reference/dropped-features/macros.md @@ -1,7 +1,7 @@ --- title: "Dropped: Scala 2 Macros" type: section -num: 72 +num: 73 previous-page: /scala3/reference/dropped-features/delayed-init next-page: /scala3/reference/dropped-features/existential-types --- diff --git a/docs/docs/reference/dropped-features/package-objects.md b/docs/docs/reference/dropped-features/package-objects.md index d9099eef9805..12004c37dea3 100644 --- a/docs/docs/reference/dropped-features/package-objects.md +++ b/docs/docs/reference/dropped-features/package-objects.md @@ -1,7 +1,7 @@ --- title: "Dropped: Package Objects" type: section -num: 77 +num: 78 previous-page: /scala3/reference/dropped-features/procedure-syntax next-page: /scala3/reference/dropped-features/early-initializers --- diff --git a/docs/docs/reference/dropped-features/procedure-syntax.md b/docs/docs/reference/dropped-features/procedure-syntax.md index f3bf8cc9d47f..d7a33cf374f8 100644 --- a/docs/docs/reference/dropped-features/procedure-syntax.md +++ b/docs/docs/reference/dropped-features/procedure-syntax.md @@ -1,7 +1,7 @@ --- title: "Dropped: Procedure Syntax" type: section -num: 76 +num: 77 previous-page: /scala3/reference/dropped-features/do-while next-page: /scala3/reference/dropped-features/package-objects --- diff --git a/docs/docs/reference/dropped-features/symlits.md b/docs/docs/reference/dropped-features/symlits.md index 3cb7243af964..1c71608f40fa 100644 --- a/docs/docs/reference/dropped-features/symlits.md +++ b/docs/docs/reference/dropped-features/symlits.md @@ -1,7 +1,7 @@ --- title: "Dropped: Symbol Literals" type: section -num: 82 +num: 83 previous-page: /scala3/reference/dropped-features/xml next-page: /scala3/reference/dropped-features/auto-apply --- diff --git a/docs/docs/reference/dropped-features/this-qualifier.md b/docs/docs/reference/dropped-features/this-qualifier.md index c25f896415f5..69906351ca67 100644 --- a/docs/docs/reference/dropped-features/this-qualifier.md +++ b/docs/docs/reference/dropped-features/this-qualifier.md @@ -1,7 +1,7 @@ --- title: "Dropped: private[this] and protected[this]" type: section -num: 85 +num: 86 previous-page: /scala3/reference/dropped-features/weak-conformance next-page: /scala3/reference/dropped-features/wildcard-init --- diff --git a/docs/docs/reference/dropped-features/type-projection.md b/docs/docs/reference/dropped-features/type-projection.md index fb87ef79be23..f2d2f215ed21 100644 --- a/docs/docs/reference/dropped-features/type-projection.md +++ b/docs/docs/reference/dropped-features/type-projection.md @@ -1,7 +1,7 @@ --- title: "Dropped: General Type Projection" type: section -num: 74 +num: 75 previous-page: /scala3/reference/dropped-features/existential-types next-page: /scala3/reference/dropped-features/do-while --- diff --git a/docs/docs/reference/dropped-features/weak-conformance.md b/docs/docs/reference/dropped-features/weak-conformance.md index deca70b60714..1b6db185fad8 100644 --- a/docs/docs/reference/dropped-features/weak-conformance.md +++ b/docs/docs/reference/dropped-features/weak-conformance.md @@ -1,7 +1,7 @@ --- title: "Dropped: Weak Conformance" type: section -num: 84 +num: 85 previous-page: /scala3/reference/dropped-features/auto-apply next-page: /scala3/reference/dropped-features/this-qualifier --- diff --git a/docs/docs/reference/dropped-features/wildcard-init.md b/docs/docs/reference/dropped-features/wildcard-init.md index be633fb1ca21..078ec138b3bb 100644 --- a/docs/docs/reference/dropped-features/wildcard-init.md +++ b/docs/docs/reference/dropped-features/wildcard-init.md @@ -1,7 +1,7 @@ --- title: "Dropped: Wildcard Initializer" type: section -num: 86 +num: 87 previous-page: /scala3/reference/dropped-features/this-qualifier next-page: /scala3/reference/syntax --- diff --git a/docs/docs/reference/dropped-features/xml.md b/docs/docs/reference/dropped-features/xml.md index cab3d0663a55..c094408909f4 100644 --- a/docs/docs/reference/dropped-features/xml.md +++ b/docs/docs/reference/dropped-features/xml.md @@ -1,7 +1,7 @@ --- title: "Dropped: XML Literals" type: section -num: 81 +num: 82 previous-page: /scala3/reference/dropped-features/limit22 next-page: /scala3/reference/dropped-features/symlits --- diff --git a/docs/docs/reference/language-versions.md b/docs/docs/reference/language-versions.md index ec16e8bed3cc..a17a567d7362 100644 --- a/docs/docs/reference/language-versions.md +++ b/docs/docs/reference/language-versions.md @@ -2,7 +2,7 @@ title: "Language Versions" type: chapter description: This page lists the different flavours of language supported by the Scala 3 compiler. -num: 100 +num: 101 previous-page: overview --- diff --git a/docs/docs/reference/other-new-features/experimental-defs.md b/docs/docs/reference/other-new-features/experimental-defs.md index 11121f1d0fcd..5060ffb889d5 100644 --- a/docs/docs/reference/other-new-features/experimental-defs.md +++ b/docs/docs/reference/other-new-features/experimental-defs.md @@ -1,8 +1,12 @@ --- -layout: doc-page title: "Experimental definitions" +type: section +num: 51 +previous-page: /scala3/reference/other-new-features/type-test +next-page: /scala3/reference/changed-features --- + ## Experimental definitions The `@experimental` annotation allows the definition of an API that is not guaranteed backward binary or source compatibility. diff --git a/docs/docs/reference/other-new-features/type-test.md b/docs/docs/reference/other-new-features/type-test.md index 1fab03490e98..62b8d59eec6d 100644 --- a/docs/docs/reference/other-new-features/type-test.md +++ b/docs/docs/reference/other-new-features/type-test.md @@ -3,7 +3,7 @@ title: "TypeTest" type: section num: 50 previous-page: /scala3/reference/other-new-features/safe-initialization -next-page: /scala3/reference/changed-features +next-page: /scala3/reference/other-new-features/experimental-defs --- ## TypeTest diff --git a/docs/docs/reference/syntax.md b/docs/docs/reference/syntax.md index 5bb53ddac00b..4561ad7c91b6 100644 --- a/docs/docs/reference/syntax.md +++ b/docs/docs/reference/syntax.md @@ -1,7 +1,7 @@ --- title: "Scala 3 Syntax Summary" type: chapter -num: 87 +num: 88 previous-page: /scala3/reference/dropped-features/wildcard-init --- diff --git a/docs/docs/resources/talks.md b/docs/docs/resources/talks.md deleted file mode 100644 index 9991d847fb9a..000000000000 --- a/docs/docs/resources/talks.md +++ /dev/null @@ -1,69 +0,0 @@ ---- -layout: singlepage-overview -title: "Talks" ---- - -Let’s Talk About Scala 3 Series -------------------------------- - -[Let’s Talk About Scala 3](https://www.youtube.com/playlist?list=PLTx-VKTe8yLxYQfX_eGHCxaTuWvvG28Ml) is a series -of short (around 15 min) talks about Scala 3. It covers a variety of themes like how to get started, how to take -advantage of the new language features, or how to migrate from Scala 2. - -Talks on Scala 3 ----------------- -- (ScalaDays 2019, Lausanne) [A Tour of Scala 3](https://www.youtube.com/watch?v=_Rnrx2lo9cw) by [Martin Odersky](http://twitter.com/odersky) [\[slides\]](https://www.slideshare.net/Odersky/a-tour-of-scala-3) - -- (ScalaDays 2016, Berlin) [Scala's Road Ahead](https://www.youtube.com/watch?v=GHzWqJKFCk4) by [Martin Odersky](http://twitter.com/odersky) [\[slides\]](http://www.slideshare.net/Odersky/scala-days-nyc-2016) - -- (JVMLS 2015) [Compilers are Databases](https://www.youtube.com/watch?v=WxyyJyB_Ssc) by [Martin Odersky](http://twitter.com/odersky) [\[slides\]](http://www.slideshare.net/Odersky/compilers-are-databases) - -- (Scala World 2015) [Dotty: Exploring the future of Scala](https://www.youtube.com/watch?v=aftdOFuVU1o) by [Dmitry Petrashko](http://twitter.com/darkdimius) [\[slides\]](https://d-d.me/scalaworld2015/#/). - Dmitry covers many of the new features that Dotty brings on the table such as Intersection and Union types, improved lazy val initialization and more. - Dmitry also covers dotty internals and in particular the high-level of contextual abstractions of Dotty. You will get to - become familiar with many core concepts such as `Denotations`, their evolution through (compilation) time, their - transformations and more. - -Deep Dive with Scala 3 ----------------------- -- (ScalaDays 2019, Lausanne) [Metaprogramming in Dotty](https://www.youtube.com/watch?v=ZfDS_gJyPTc) by [Nicolas Stucki](https://github.com/nicolasstucki). - -- (ScalaDays 2019, Lausanne) [Future-proofing Scala: the TASTY intermediate representation](https://www.youtube.com/watch?v=zQFjC3zLYwo) by [Guillaume Martres](http://guillaume.martres.me/). - -- (Mar 21, 2017) [Dotty Internals 1: Trees & Symbols](https://www.youtube.com/watch?v=yYd-zuDd3S8) by [Dmitry Petrashko](http://twitter.com/darkdimius) [\[meeting notes\]](https://dotty.epfl.ch/docs/internals/dotty-internals-1-notes.html). - This is a recorded meeting between EPFL and Waterloo, where we introduce first notions inside Dotty: Trees and Symbols. - -- (Mar 21, 2017) [Dotty Internals 2: Types](https://www.youtube.com/watch?v=3gmLIYlGbKc) by [Martin Odersky](http://twitter.com/odersky) and [Dmitry Petrashko](http://twitter.com/darkdimius). - This is a recorded meeting between EPFL and Waterloo, where we introduce how types are represented inside Dotty. - -- (Jun 15, 2017) [Dotty Internals 3: Denotations](https://youtu.be/9iPA7zMRGKY) by [Martin Odersky](http://twitter.com/odersky) and [Dmitry Petrashko](http://twitter.com/darkdimius). - This is a recorded meeting between EPFL and Waterloo, where we introduce denotations in Dotty. - -- (JVM Language Summit) [How do we make the Dotty compiler fast](https://www.youtube.com/watch?v=9xYoSwnSPz0) by [Dmitry Petrashko](http://twitter.com/darkdimius). - [Dmitry Petrashko](http://twitter.com/darkdimius) gives a high-level introduction on what was done to make Dotty . - - -- (Typelevel Summit Oslo, May 2016) [Dotty and types: the story so far](https://www.youtube.com/watch?v=YIQjfCKDR5A) by - Guillaume Martres [\[slides\]](http://guillaume.martres.me/talks/typelevel-summit-oslo/). - Guillaume focused on some of the practical improvements to the type system that Dotty makes, like the new type parameter - inference algorithm that is able to reason about the type safety of more situations than scalac. - -- (flatMap(Oslo) 2016) [AutoSpecialization in Dotty](https://vimeo.com/165928176) by [Dmitry Petrashko](http://twitter.com/darkdimius) [\[slides\]](https://d-d.me/talks/flatmap2016/#/). - The Dotty Linker analyses your program and its dependencies to - apply a new specialization scheme. It builds on our experience from Specialization, Miniboxing and the Valhalla Project, - and drastically reduces the size of the emitted bytecode. And, best of all, it's always enabled, happens behind the - scenes without annotations, and results in speedups in excess of 20x. Additionally, it "just works" on Scala collections. - -- (ScalaSphere 2016) [Hacking on Dotty: A live demo](https://www.youtube.com/watch?v=0OOYGeZLHs4) by Guillaume Martres [\[slides\]](http://guillaume.martres.me/talks/dotty-live-demo/). - Guillaume hacks on Dotty: a live demo during which he - creates a simple compiler phase to trace method calls at run-time. - -- (Scala By the Bay 2016) [Dotty: what is it and how it works](https://www.youtube.com/watch?v=wCFbYu7xEJA) by Guillaume - Martres [\[slides\]](http://guillaume.martres.me/talks/dotty-tutorial/#/). Guillaume provides a high-level view of the - compilation-pipeline of Dotty. - -- (ScalaDays 2015, Amsterdam) [Making your Scala applications smaller and faster with the Dotty linker](https://www.youtube.com/watch?v=xCeI1ArdXM4) by Dmitry Petrashko [\[slides\]](https://d-d.me/scaladays2015/#/). - Dmitry introduces the call-graph analysis algorithm - that Dotty implements and the performance benefits we can get in terms of number of methods, bytecode size, JVM code size - and the number of objects allocated in the end. - diff --git a/docs/docs/usage/getting-started.md b/docs/docs/usage/getting-started.md deleted file mode 100644 index 1c43d6e5adbb..000000000000 --- a/docs/docs/usage/getting-started.md +++ /dev/null @@ -1,193 +0,0 @@ ---- -layout: singlepage-overview -title: Getting Started with Scala 3 -languages: ["ja"] ---- - - - -## Try Scala without installing anything - -To start experimenting with Scala 3 right away, use “Scastie” in your browser. -_Scastie_ is an online “playground” where you can experiment with Scala examples to see how things work, with access to all Scala compilers and published libraries. - - - -## Install Scala on your computer - -Installing Scala means installing various command-line tools and build tools. -We recommend using the Scala installer tool "Coursier" that automatically installs all the requirements, but you can still manually install each tool. - - -### Using the Scala Installer (recommended way) - -The Scala installer is a tool named [Coursier](https://get-coursier.io/docs/cli-overview), whose main command is named `cs`. -It ensures that a JVM and standard Scala tools are installed on your system. -Install it on your system with the following instructions. - -
-
-

Follow the instructions to install the cs launcher then run:

-

$ cs install scala3-repl

-

$ cs install scala3-compiler

-
-
- -Along with managing JVMs, `cs setup` also installs useful command line tools: - -- A JDK -- The [sbt](https://www.scala-sbt.org) and [mill](https://com-lihaoyi.github.io/mill/) build tools -- [Ammonite](https://ammonite.io), an enhanced REPL -- [scalafmt](https://scalameta.org/scalafmt), the Scala formatter -- The [Coursier CLI](https://get-coursier.io/docs/cli-overview), to install further Scala-based applications -- (the `scala` and `scalac` command-line tools for Scala 2.13 -- not Scala 3). - -For more information, read the [coursier-cli documentation](https://get-coursier.io/docs/cli-overview). - - -### ... or manually - -You only need two tools to compile, run, test, and package a Scala project: Java 8 or 11, and sbt. -To install these manually: - -1. Download Java from [Oracle Java 8](https://www.oracle.com/java/technologies/javase-jdk8-downloads.html), [Oracle Java 11](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html), or [AdoptOpenJDK 8/11](https://adoptopenjdk.net/). Refer to [JDK Compatibility](https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html) for Scala/Java compatibility detail. -2. Install [sbt](https://www.scala-sbt.org/download.html) - - - -## Create a “Hello, world” project with sbt - -To create a project, you can either use a command-line tool or an IDE. -If you are familiar with the command line, we recommend that approach. - - -### Using the command line - -sbt is a build tool for Scala. -sbt compiles, runs, and tests your Scala code. -(It can also publish libraries and do many other tasks.) - -To create a new Scala project with sbt: - -1. `cd` to an empty folder. -1. Run this command `sbt new scala/scala3.g8`. -This pulls the ['hello-world' template][template-url] from GitHub. -It also creates a _target_ folder, which you can ignore. -1. When prompted, name the application `hello world`. - This will create a project called "hello-world". -1. Let’s take a look at what just got generated: - -``` -hello-world/ - project/ (sbt uses this for its own files) - build.properties - src/main/scala/ (all of your Scala code goes here) - Main.scala (entry point of program) - build.sbt (sbt’s build definition file) -``` -The scala file `Main.scala` in `src/main/scala` is all we need for now. - -More documentation about sbt can be found in the [Scala Book](https://docs.scala-lang.org/scala3/book/scala-tools.html) and in the official sbt [documentation](https://www.scala-sbt.org/1.x/docs/index.html) - - -{% comment %} -### With IntelliJ IDEA - -You can skip the rest of this page and go directly to [Building a Scala Project with IntelliJ and sbt](/getting-started/intellij-track/building-a-scala-project-with-intellij-and-sbt.html) -{% endcomment %} - - -## Open the “Hello, world” project - -Let’s use an IDE to open the project. -The most popular ones are IntelliJ IDEA and VS Code. -They both offer rich IDE features, but you can still use [many other editors.](https://scalameta.org/metals/docs/editors/overview.html) - -### Using IntelliJ IDEA - -1. Download and install [IntelliJ Community Edition](https://www.jetbrains.com/idea/download/) -1. Install the Scala plugin by following [the instructions on how to install IntelliJ plugins](https://www.jetbrains.com/help/idea/managing-plugins.html) -1. Open the _build.sbt_ file, then choose _Open as a project_ - -### Using VS Code with Metals - -1. Download [VS Code](https://code.visualstudio.com/Download) -1. Install the Metals extension from [the Marketplace](https://marketplace.visualstudio.com/items?itemName=scalameta.metals) -1. Next, open the directory containing your _build.sbt_ file. - When prompted to do so, select _Import build_. - ->[Metals](https://scalameta.org/metals) is a “Scala language server” that provides support for writing Scala code in VS Code and other editors like [Atom, Sublime Text, and more](https://scalameta.org/metals/docs/editors/overview.html), using the Language Server Protocol. -> -> Under the hood, Metals communicates with the build tool by using -> the [Build Server Protocol (BSP)](https://build-server-protocol.github.io/). For details on how Metals works, see, [“Write Scala in VS Code, Vim, Emacs, Atom and Sublime Text with Metals”](https://www.scala-lang.org/2019/04/16/metals.html). - - -### View the source code - -View these two files in your IDE: - -- _build.sbt_ -- _src/main/scala/Main.scala_ - -When you run your project in the next step, the configuration in _build.sbt_ will be used to run the code in _src/main/scala/Main.scala_. - - - -## Run the “Hello, world” project - -If you’re comfortable using your IDE, you can run the code in _Main.scala_ from your IDE. - -Otherwise, you can run the application from a terminal with these steps: - -1. `cd` into _hello-world_. -1. Run `sbt`. - This opens up the sbt console. -1. Type `~run`. - The `~` is optional and causes sbt to re-run on every file save, allowing for a fast edit/run/debug cycle. - sbt also generates a `target` directory for its own use, which you can ignore. - -When you’re finished experimenting with this project, press `[Enter]` to interrupt the `run` command. -Then type `exit` or press `[Ctrl][d]` to exit sbt and return to your command line prompt. - - - -## Next steps - -Now that you’ve created a first “Hello, world” example with Scala 3, you’re ready for some next steps. -Consider checking out: - -- [The Scala 3 Book](https://docs.scala-lang.org/scala3/book/introduction.html), which provides a set of short lessons introducing Scala’s main features -- [The migration guide](https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html) helps you to migrate your existing Scala 2 code base to Scala 3. - -When you want to connect with other Scala users, there are several mailing lists and real-time chat rooms available. -Check out our [Scala community page](https://scala-lang.org/community/) for a list of these resources, and for where to reach out for help. - - - - - - - - - - - -[template-url]: https://github.com/scala/scala3.g8 diff --git a/docs/docs/usage/tools-worksheets.md b/docs/docs/usage/tools-worksheets.md deleted file mode 100644 index e503e72f0c23..000000000000 --- a/docs/docs/usage/tools-worksheets.md +++ /dev/null @@ -1,56 +0,0 @@ ---- -title: Worksheets -type: section -description: This section looks at worksheets, an alternative to Scala projects. -num: 71 -previous-page: tools-sbt -next-page: interacting-with-java ---- - -A worksheet is a Scala file that is evaluated on save, and the result of each expression is shown -in a column to the right of your program. Worksheets are like a [REPL session] on steroids, and -enjoy 1st class editor support: completion, hyperlinking, interactive errors-as-you-type, etc. -Worksheets use the extension `.worksheet.sc`. - -In the following, we show how to use worksheets in IntelliJ, and in VS Code (with the Metals extension). - -1. Open a Scala project, or create one. - - To create a project in IntelliJ, select “File” -> “New” -> “Project…”, select “Scala” - in the left column, and click “Next” to set the project name and location. - - To create a project in VS Code, run the command “Metals: New Scala project”, select the - seed `scala/scala3.g8`, set the project location, open it in a new VS Code window, and - import its build. -1. Create a file named `hello.worksheet.sc` in the directory `src/main/scala/`. - - In IntelliJ, right-click on the directory `src/main/scala/`, and select “New”, and - then “File”. - - In VS Code, right-click on the directory `src/main/scala/`, and select “New File”. -1. Paste the following content in the editor: - ~~~ - println("Hello, world!") - - val x = 1 - x + x - ~~~ -1. Evaluate the worksheet. - - In IntelliJ, click on the green arrow at the top of the editor to evaluate the worksheet. - - In VS Code, save the file. - - You should see the result of the evaluation of every line on the right panel (IntelliJ), or - as comments (VS Code). - -![]({{ site.baseurl }}/resources/images/scala3-book/intellij-worksheet.png) - -A worksheet evaluated in IntelliJ. - -![]({{ site.baseurl }}/resources/images/scala3-book/metals-worksheet.png) - -A worksheet evaluated in VS Code (with the Metals extension). - -Note that the worksheet will use the Scala version defined by your project (set by the key `scalaVersion`, -in your file `build.sbt`, typically). - -Also note that worksheets don’t have a [program entry point]. Instead, top-level statements and expressions -are evaluated from top to bottom. - -[REPL session]: {% link _overviews/scala3-book/taste-repl.md %} -[program entry point]: {% link _overviews/scala3-book/methods-main-methods.md %} diff --git a/docs/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif b/docs/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif new file mode 100644 index 0000000000000000000000000000000000000000..1cc25b5683f757431e308a80fe3851f94034bf0c GIT binary patch literal 352175 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 z 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 b{x|~(2L11||DP}Y{|EkG>-_&*67By3sh%F; literal 0 HcmV?d00001 diff --git a/docs/sidebar.yml b/docs/sidebar.yml index 4b47033e64cb..7a534eb42ae8 100644 --- a/docs/sidebar.yml +++ b/docs/sidebar.yml @@ -2,10 +2,8 @@ sidebar: - title: Blog - title: Usage subsection: - - page: docs/usage/getting-started.md - page: docs/usage/sbt-projects.md - page: docs/usage/ide-support.md - - page: docs/usage/tools-worksheets.md - page: docs/usage/cbt-projects.md - page: docs/usage/scaladoc - title: Reference @@ -147,6 +145,3 @@ sidebar: - page: docs/internals/type-system.md - page: docs/internals/dotty-internals-1-notes.md - page: docs/internals/debug-macros.md - - title: Resources - subsection: - - page: docs/resources/talks.md diff --git a/project/CopyDocs.scala b/project/CopyDocs.scala index 29760ce85e42..d8bcd4474824 100644 --- a/project/CopyDocs.scala +++ b/project/CopyDocs.scala @@ -45,7 +45,7 @@ object CopyDocs { */ val transformationMap: Map[String, Set[(String, MyParams => String)]] = Map( "docs/docs/usage/scaladoc/index.md" -> Set( - ("""\{\{ site\.baseurl \}\}/resources/images/scala3/scaladoc/logo\.svg""" -> "images/scaladoc-logo.png"), + ("""\{\{ site\.baseurl \}\}/resources/images/scala3/scaladoc/logo\.svg""" -> "images/scaladoc_logo.svg"), ), "docs/docs/usage/scaladoc/site-versioning.md" -> Set( @@ -67,20 +67,6 @@ object CopyDocs { "docs/docs/usage/scaladoc/" -> (commonTransformations + (titlePattern -> s"---\ntitle: $$1\n---"), ), - - "docs/docs/usage/getting-started" -> (commonTransformations + - (titlePattern -> "---\nlayout: doc-page\ntitle: Getting Started: Users\nmovedTo: https://docs.scala-lang.org/scala3/getting-started.html\n---"), - ), - - "docs/docs/usage/tools-worksheets" -> (commonTransformations + - (titlePattern -> "---\nlayout: doc-page\ntitle: \"Worksheet mode with Dotty IDE\"\nmovedTo: https://docs.scala-lang.org/scala3/book/tools-worksheets.html\n---") + - ("""/resources/images/scala3-book/intellij-worksheet\.png""" -> "images/worksheets/intellij-worksheet.png") + - ("""/resources/images/scala3-book/metals-worksheet\.png""" -> "images/worksheets/metals-worksheet.png") - ), - - "docs/docs/resources/talks" -> (commonTransformations + - (titlePattern -> "---\nlayout: doc-page\ntitle: Talks\nmovedTo: https://docs.scala-lang.org/scala3/talks.html\n---") - ) ) def copyDocs() = { diff --git a/project/scripts/genDocsScalaLang b/project/scripts/genDocsScalaLang index 1404cd5ef0f7..1ce53899fd33 100755 --- a/project/scripts/genDocsScalaLang +++ b/project/scripts/genDocsScalaLang @@ -44,14 +44,15 @@ fi cp -rf "$SITE_OUT_DIR/docs/reference"/* "$DOCS_SCALA_LANG_DIR/_scala3-reference" cp -rf "$SITE_OUT_DIR/docs/usage/scaladoc"/* "$DOCS_SCALA_LANG_DIR/_overviews/scala3-scaladoc" -cp -rf "$SITE_OUT_DIR/docs/resources/talks.md" "$DOCS_SCALA_LANG_DIR/scala3/talks.md" -cp -rf "$SITE_OUT_DIR/docs/usage/getting-started.md" "$DOCS_SCALA_LANG_DIR/scala3/getting-started.md" -cp -rf "$SITE_OUT_DIR/docs/usage/tools-worksheets.md" "$DOCS_SCALA_LANG_DIR/_overviews/scala3-book/tools-worksheets.md" - - # Copy csses and html importing these assets cp -f "$SITE_OUT_DIR/styles/colors.css" "$DOCS_SCALA_LANG_DIR/resources/css/colors.css" cp -f "$PWD/docs/docsScalaLangResources/scaladoc-assets.html" "$DOCS_SCALA_LANG_DIR/_includes/scaladoc-assets.html" +# Copy images and resources +cp -f "$PWD/scaladoc/resources/dotty_res/images/scaladoc_logo.svg" "$DOCS_SCALA_LANG_DIR/resources/images/scala3/scaladoc/logo.svg" +cp -f "$PWD/docs/images/scaladoc/nightly.gif" "$DOCS_SCALA_LANG_DIR/resources/images/scala3/scaladoc/nightly.gif" +cp -f "$PWD/docs/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif" "$DOCS_SCALA_LANG_DIR/resources/images/scala3/scaladoc/inkuire-1\.0\.0-M2_js_flatMap.gif" +cp -f "$PWD/docs/images/explicit-nulls/explicit-nulls-type-hierarchy.png" "$DOCS_SCALA_LANG_DIR/resources/images/scala3/explicit-nulls/explicit-nulls-type-hierarchy.png" + # Hack inclusion of these assests by the docs.scala-lang jekyll builder echo "{% include scaladoc-assets.html %}" >> "$DOCS_SCALA_LANG_DIR/_layouts/inner-page-parent-dropdown.html" diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala index 3149023d3613..8ca2601f9b63 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala @@ -132,10 +132,8 @@ case class TemplateFile( ssctx.args.projectFormat match case "html" => HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed) - case "md" => - - FrontMatterRenderer.render(settings + ("urls" -> sourceLinks.toMap)) + - Formatter.builder(defaultMarkdownOptions).build().render(processed) + case "md" => FrontMatterRenderer.render(settings + ("urls" -> sourceLinks.toMap)) + + Formatter.builder(defaultMarkdownOptions).build().render(processed) if layoutTemplate.isEmpty || ssctx.args.projectFormat == "md" then From 3b2bcb23070675803b7f28deb8b1affbfb69bd99 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Thu, 14 Oct 2021 15:56:44 +0200 Subject: [PATCH 0732/1244] Rename secrets in github workflows --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 037229da32fc..70f69d1fd568 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -500,7 +500,7 @@ jobs: - name: Deploy Website to dotty-website uses: peaceiris/actions-gh-pages@v3 with: - personal_token: ${{ DOTTY_WEBSITE_BOT_TOKEN }} + personal_token: ${{ env.DOTTY_WEBSITE_BOT_TOKEN }} publish_dir: docs/_site external_repository: lampepfl/dotty-website publish_branch: gh-pages @@ -512,7 +512,7 @@ jobs: - name: Deploy Website to docs.scala-lang uses: peaceiris/actions-gh-pages@v3 with: - personal_token: ${{ DOCS_SCALALANG_BOT_TOKEN }} + personal_token: ${{ env.DOCS_SCALALANG_BOT_TOKEN }} publish_dir: docsScalaLang external_repository: BarkingBad/docs.scala-lang publish_branch: dev From 3538652e0075d51ddec9abd40e4c5e83d7aa36c0 Mon Sep 17 00:00:00 2001 From: danicheg Date: Mon, 18 Oct 2021 14:39:16 +0300 Subject: [PATCH 0733/1244] Use IArray.map in Tuple.fromIArray --- library/src/scala/Tuple.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/library/src/scala/Tuple.scala b/library/src/scala/Tuple.scala index fb08a0afe2b5..784170c524ae 100644 --- a/library/src/scala/Tuple.scala +++ b/library/src/scala/Tuple.scala @@ -228,18 +228,17 @@ object Tuple { case xs: Array[Object] => xs case xs => xs.map(_.asInstanceOf[Object]) } - runtime.Tuples.fromArray(xs2).asInstanceOf[Tuple] + runtime.Tuples.fromArray(xs2) } /** Convert an immutable array into a tuple of unknown arity and types */ def fromIArray[T](xs: IArray[T]): Tuple = { val xs2: IArray[Object] = xs match { case xs: IArray[Object] @unchecked => xs - case xs => - // TODO support IArray.map - xs.asInstanceOf[Array[T]].map(_.asInstanceOf[Object]).asInstanceOf[IArray[Object]] + case _ => + xs.map(_.asInstanceOf[Object]) } - runtime.Tuples.fromIArray(xs2).asInstanceOf[Tuple] + runtime.Tuples.fromIArray(xs2) } /** Convert a Product into a tuple of unknown arity and types */ From 57018b40d31f74dd64177564c733c5176b798dbf Mon Sep 17 00:00:00 2001 From: mzcu Date: Tue, 19 Oct 2021 08:45:41 +0200 Subject: [PATCH 0734/1244] Update canthrow.md Fix typo --- docs/docs/reference/experimental/canthrow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md index 8233627bf27b..aaf637b06806 100644 --- a/docs/docs/reference/experimental/canthrow.md +++ b/docs/docs/reference/experimental/canthrow.md @@ -54,7 +54,7 @@ This assumes a type `A throws E` to indicate computations of type `A` that can t But there is a way to avoid the ceremony. Instead of concentrating on possible _effects_ such as "this code might throw an exception", concentrate on _capabilities_ such as "this code needs the capability to throw an exception". From a standpoint of expressiveness this is quite similar. But capabilities can be expressed as parameters whereas traditionally effects are expressed as some addition to result values. It turns out that this can make a big difference! -## The CanThrow Cabability +## The CanThrow Capability In the _effects as capabilities_ model, an effect is expressed as an (implicit) parameter of a certain type. For exceptions we would expect parameters of type `CanThrow[E]` where `E` stands for the exception that can be thrown. Here is the definition of `CanThrow`: From a3e3bff8271f0ae55774659ccf7c4a82378f8706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Mon, 11 Oct 2021 18:05:46 +0200 Subject: [PATCH 0735/1244] Remove the last occurrence of the legacy JSInterop internal API. Now, everything goes through the extension methods in JSSymUtils. --- .../dotty/tools/backend/sjs/JSCodeGen.scala | 3 +- .../dotty/tools/backend/sjs/JSInterop.scala | 74 ------------------- 2 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 compiler/src/dotty/tools/backend/sjs/JSInterop.scala diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala index 1f707bcd17d9..e27da4a1edf4 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala @@ -42,7 +42,6 @@ import org.scalajs.ir.Trees.OptimizerHints import dotty.tools.dotc.transform.sjs.JSSymUtils._ import JSEncoding._ -import JSInterop._ import ScopedVar.withScopedVars /** Main codegen for Scala.js IR. @@ -526,7 +525,7 @@ class JSCodeGen()(using genCtx: Context) { /* We add symbols that we have to expose here. This way we also * get inherited stuff that is implemented in this class. */ - dispatchMethodNames += jsNameOf(sym) + dispatchMethodNames += sym.jsName } } diff --git a/compiler/src/dotty/tools/backend/sjs/JSInterop.scala b/compiler/src/dotty/tools/backend/sjs/JSInterop.scala deleted file mode 100644 index c22af60bd179..000000000000 --- a/compiler/src/dotty/tools/backend/sjs/JSInterop.scala +++ /dev/null @@ -1,74 +0,0 @@ -package dotty.tools.backend.sjs - -import dotty.tools.dotc.core._ -import Contexts._ -import Flags._ -import Symbols._ -import NameOps._ -import StdNames._ -import Phases._ - -import dotty.tools.dotc.transform.sjs.JSSymUtils._ - -/** Management of the interoperability with JavaScript. - * - * This object only contains forwarders for extension methods in - * `transform.sjs.JSSymUtils`. They are kept to minimize changes in - * `JSCodeGen` in the short term, but it will eventually be removed. - */ -object JSInterop { - - /** Is this symbol a JavaScript type? */ - def isJSType(sym: Symbol)(using Context): Boolean = - sym.isJSType - - /** Should this symbol be translated into a JS getter? - * - * This is true for any parameterless method, i.e., defined without `()`. - * Unlike `SymDenotations.isGetter`, it applies to user-defined methods as - * much as *accessor* methods created for `val`s and `var`s. - */ - def isJSGetter(sym: Symbol)(using Context): Boolean = - sym.isJSGetter - - /** Should this symbol be translated into a JS setter? - * - * This is true for any method whose name ends in `_=`. - * Unlike `SymDenotations.isGetter`, it applies to user-defined methods as - * much as *accessor* methods created for `var`s. - */ - def isJSSetter(sym: Symbol)(using Context): Boolean = - sym.isJSSetter - - /** Should this symbol be translated into a JS bracket access? - * - * This is true for methods annotated with `@JSBracketAccess`. - */ - def isJSBracketAccess(sym: Symbol)(using Context): Boolean = - sym.isJSBracketAccess - - /** Should this symbol be translated into a JS bracket call? - * - * This is true for methods annotated with `@JSBracketCall`. - */ - def isJSBracketCall(sym: Symbol)(using Context): Boolean = - sym.isJSBracketCall - - /** Is this symbol a default param accessor for a JS method? - * - * For default param accessors of *constructors*, we need to test whether - * the companion *class* of the owner is a JS type; not whether the owner - * is a JS type. - */ - def isJSDefaultParam(sym: Symbol)(using Context): Boolean = - sym.isJSDefaultParam - - /** Gets the unqualified JS name of a symbol. - * - * If it is not explicitly specified with an `@JSName` annotation, the - * JS name is inferred from the Scala name. - */ - def jsNameOf(sym: Symbol)(using Context): JSName = - sym.jsName - -} From 2bf6c608e3a0837657ad3b771ba49538e3c2e2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Mon, 11 Oct 2021 18:20:55 +0200 Subject: [PATCH 0736/1244] Scala.js: Correctly identify default accessors of native JS def params. Previously, we tested whether the default accessor itself had the `@js.native` annotation. That is however never the case. Instead, we now test whether the associated method has the annotation. We still emit the *definitions* of those default accessors, even though that they are never called anymore, because of backward binary compatibility. If we stopped emitting them, a library compiled with a newer Scala.js might not link anymore against an application built with a previous Scala.js. This is a forward port of https://github.com/scala-js/scala-js/commit/7e998b40f7ad5933233aafee6d7cb628aab7f97d --- .../dotty/tools/backend/sjs/JSCodeGen.scala | 67 ++++++++++++++++++- .../tools/dotc/transform/sjs/JSSymUtils.scala | 20 ------ 2 files changed, 66 insertions(+), 21 deletions(-) diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala index e27da4a1edf4..7b1ff2d4738b 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala @@ -2007,8 +2007,46 @@ class JSCodeGen()(using genCtx: Context) { val args = tree.args val sym = tree.fun.symbol + /* Is the method a JS default accessor, which should become an + * `UndefinedParam` rather than being compiled normally. + * + * This is true iff one of the following conditions apply: + * - It is a constructor default param for the constructor of a JS class. + * - It is a default param of an instance method of a native JS type. + * - It is a default param of an instance method of a non-native JS type + * and the attached method is exposed. + * - It is a default param for a native JS def. + */ + def isJSDefaultParam: Boolean = { + sym.name.is(DefaultGetterName) && { + val info = new DefaultParamInfo(sym) + if (info.isForConstructor) { + /* This is a default accessor for a constructor parameter. Check + * whether the attached constructor is a JS constructor, which is + * the case iff the linked class is a JS type. + */ + info.constructorOwner.isJSType + } else { + if (sym.owner.isJSType) { + /* The default accessor is in a JS type. It is a JS default + * param iff the enclosing class is native or the attached method + * is exposed. + */ + !sym.owner.isNonNativeJSClass || info.attachedMethod.isJSExposed + } else { + /* The default accessor is in a Scala type. It is a JS default + * param iff the attached method is a native JS def. This can + * only happen if the owner is a module class, which we test + * first as a fast way out. + */ + sym.owner.is(ModuleClass) && info.attachedMethod.hasAnnotation(jsdefn.JSNativeAnnot) + } + } + } + } + tree.fun match { - case _ if sym.isJSDefaultParam => + case _ if isJSDefaultParam => js.Transient(UndefinedParam) case Select(Super(_, _), _) => @@ -4578,4 +4616,31 @@ object JSCodeGen { out.print("") } + /** Info about a default param accessor. + * + * The method must have a default getter name for this class to make sense. + */ + private class DefaultParamInfo(sym: Symbol)(using Context) { + private val methodName = sym.name.exclude(DefaultGetterName) + + def isForConstructor: Boolean = methodName == nme.CONSTRUCTOR + + /** When `isForConstructor` is true, returns the owner of the attached + * constructor. + */ + def constructorOwner: Symbol = sym.owner.linkedClass + + /** When `isForConstructor` is false, returns the method attached to the + * specified default accessor. + */ + def attachedMethod: Symbol = { + // If there are overloads, we need to find the one that has default params. + val overloads = sym.owner.info.decl(methodName) + if (!overloads.isOverloaded) + overloads.symbol + else + overloads.suchThat(_.is(HasDefaultParams)).symbol + } + } + } diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala b/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala index f718d68e9588..58d93703ffc2 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala @@ -156,26 +156,6 @@ object JSSymUtils { def isJSBracketCall(using Context): Boolean = sym.hasAnnotation(jsdefn.JSBracketCallAnnot) - /** Is this symbol a default param accessor for a JS method? - * - * For default param accessors of *constructors*, we need to test whether - * the companion *class* of the owner is a JS type; not whether the owner - * is a JS type. - */ - def isJSDefaultParam(using Context): Boolean = { - sym.name.is(DefaultGetterName) && { - val owner = sym.owner - val methName = sym.name.exclude(DefaultGetterName) - if (methName == nme.CONSTRUCTOR) { - owner.linkedClass.isJSType - } else { - def isAttachedMethodExposed: Boolean = - owner.info.decl(methName).hasAltWith(_.symbol.isJSExposed) - owner.isJSType && (!owner.isNonNativeJSClass || isAttachedMethodExposed) - } - } - } - /** Is this symbol a default param accessor for the constructor of a native JS class? */ def isJSNativeCtorDefaultParam(using Context): Boolean = { sym.name.is(DefaultGetterName) From b1411e05f88f29c9516d72032ec547181994f9f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Mon, 11 Oct 2021 18:26:59 +0200 Subject: [PATCH 0737/1244] Scala.js: Allow default params of JS native defs to be `= js.native`. The default accessors matching that property are not emitted anymore. This is similar to how default accessors for JS native constructors are not emitted. Unfortunately, for backward binary compatibility reasons, we must still emit default accessors of JS native defs that are anything else than `= js.native`. Until Scala.js 1.7.0, those default accessors would actually be referenced by calling code (see https://github.com/scala-js/scala-js/issues/4554), so removing them now would create dangling references. This is a forward port of https://github.com/scala-js/scala-js/commit/e01dc1adcbc982860ff2248a3ae88901e95fca92 --- .../dotty/tools/backend/sjs/JSCodeGen.scala | 55 ++++++++++++++++++- .../tools/dotc/transform/sjs/JSSymUtils.scala | 7 --- 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala index 7b1ff2d4738b..5d9646e239e6 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala @@ -1402,6 +1402,53 @@ class JSCodeGen()(using genCtx: Context) { val vparamss = dd.termParamss val rhs = dd.rhs + /* Is this method a default accessor that should be ignored? + * + * This is the case iff one of the following applies: + * - It is a constructor default accessor and the linked class is a + * native JS class. + * - It is a default accessor for a native JS def, but with the caveat + * that its rhs must be `js.native` because of #4553. + * + * Both of those conditions can only happen if the default accessor is in + * a module class, so we use that as a fast way out. (But omitting that + * condition would not change the result.) + * + * This is different than `isJSDefaultParam` in `genApply`: we do not + * ignore default accessors of *non-native* JS types. Neither for + * constructor default accessor nor regular default accessors. We also + * do not need to worry about non-constructor members of native JS types, + * since for those, the entire member list is ignored in `genJSClassData`. + */ + def isIgnorableDefaultParam: Boolean = { + sym.name.is(DefaultGetterName) && sym.owner.is(ModuleClass) && { + val info = new DefaultParamInfo(sym) + if (info.isForConstructor) { + /* This is a default accessor for a constructor parameter. Check + * whether the attached constructor is a native JS constructor, + * which is the case iff the linked class is a native JS type. + */ + info.constructorOwner.hasAnnotation(jsdefn.JSNativeAnnot) + } else { + /* #4553 We need to ignore default accessors for JS native defs. + * However, because Scala.js <= 1.7.0 actually emitted code calling + * those accessors, we must keep default accessors that would + * compile. The only accessors we can actually get rid of are those + * that are `= js.native`. + */ + !sym.owner.isJSType && + info.attachedMethod.hasAnnotation(jsdefn.JSNativeAnnot) && { + dd.rhs match { + case MaybeAsInstanceOf(Apply(fun, _)) => + fun.symbol == jsdefn.JSPackage_native + case _ => + false + } + } + } + } + } + withPerMethodBodyState(sym) { assert(vparamss.isEmpty || vparamss.tail.isEmpty, "Malformed parameter list: " + vparamss) @@ -1421,7 +1468,7 @@ class JSCodeGen()(using genCtx: Context) { Some(js.MethodDef(js.MemberFlags.empty, methodName, originalName, jsParams, toIRType(patchedResultType(sym)), None)( OptimizerHints.empty, None)) - } else if (sym.isJSNativeCtorDefaultParam) { + } else if (isIgnorableDefaultParam) { // #11592 None } else if (sym.is(Bridge) && sym.name.is(DefaultGetterName) && currentClassSym.isNonNativeJSClass) { @@ -2016,6 +2063,12 @@ class JSCodeGen()(using genCtx: Context) { * - It is a default param of an instance method of a non-native JS type * and the attached method is exposed. * - It is a default param for a native JS def. + * + * This is different than `isIgnorableDefaultParam` in + * `genMethodWithCurrentLocalNameScope`: we include here the default + * accessors of *non-native* JS types (unless the corresponding methods are + * not exposed). We also need to handle non-constructor members of native + * JS types. */ def isJSDefaultParam: Boolean = { sym.name.is(DefaultGetterName) && { diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala b/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala index 58d93703ffc2..a78adaff6522 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala @@ -156,13 +156,6 @@ object JSSymUtils { def isJSBracketCall(using Context): Boolean = sym.hasAnnotation(jsdefn.JSBracketCallAnnot) - /** Is this symbol a default param accessor for the constructor of a native JS class? */ - def isJSNativeCtorDefaultParam(using Context): Boolean = { - sym.name.is(DefaultGetterName) - && sym.name.exclude(DefaultGetterName) == nme.CONSTRUCTOR - && sym.owner.linkedClass.hasAnnotation(jsdefn.JSNativeAnnot) - } - def jsCallingConvention(using Context): JSCallingConvention = JSCallingConvention.of(sym) From dcb3bfe8e75c22512c5129128bf9a3bf5c4f4db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 12 Oct 2021 17:47:00 +0200 Subject: [PATCH 0738/1244] Scala.js: Do not emit static forwarders for native JS defs. Nor for their default param accessors. This is a forward port of https://github.com/scala-js/scala-js/commit/a95f3f6ab4d844fe44ba601a57335e748f1d07d2 --- .../src/dotty/tools/backend/sjs/JSCodeGen.scala | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala index 5d9646e239e6..53885ba523ec 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala @@ -789,7 +789,21 @@ class JSCodeGen()(using genCtx: Context) { def isExcluded(m: Symbol): Boolean = { def hasAccessBoundary = m.accessBoundary(defn.RootClass) ne defn.RootClass - m.is(Deferred) || m.isConstructor || hasAccessBoundary || (m.owner eq defn.ObjectClass) + + def isOfJLObject: Boolean = m.owner eq defn.ObjectClass + + def isDefaultParamOfJSNativeDef: Boolean = { + m.name.is(DefaultGetterName) && { + val info = new DefaultParamInfo(m) + !info.isForConstructor && info.attachedMethod.hasAnnotation(jsdefn.JSNativeAnnot) + } + } + + m.is(Deferred) + || m.isConstructor + || hasAccessBoundary + || isOfJLObject + || m.hasAnnotation(jsdefn.JSNativeAnnot) || isDefaultParamOfJSNativeDef // #4557 } val forwarders = for { From b41b4cb5b66951059f0062e627de2d1eeb2053dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 12 Oct 2021 17:47:45 +0200 Subject: [PATCH 0739/1244] Upgrade to Scala.js 1.7.1. --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 861d9491e13e..4e70c7f3122a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ // // e.g. addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6") From 1a2892fc4cb142be4076b93a919da51a9972e446 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 15 Oct 2021 19:40:22 +0200 Subject: [PATCH 0740/1244] Change order of proxy evaluation when inlining Fixes #13747 --- .../src/dotty/tools/dotc/typer/Inliner.scala | 55 ++++++++++++------- tests/run/i13747.scala | 17 ++++++ 2 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 tests/run/i13747.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index 9bd293400d65..b4264dee6e64 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -37,6 +37,8 @@ import quoted.QuoteUtils object Inliner { import tpd._ + private type DefBuffer = mutable.ListBuffer[ValOrDefDef] + /** `sym` is an inline method with a known body to inline. */ def hasBodyToInline(sym: SymDenotation)(using Context): Boolean = @@ -413,7 +415,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { private val methPart = funPart(call) private val callTypeArgs = typeArgss(call).flatten - private val rawCallValueArgss = termArgss(call) + private val callValueArgss = termArgss(call) private val inlinedMethod = methPart.symbol private val inlineCallPrefix = qualifier(methPart).orElse(This(inlinedMethod.enclosingClass.asClass)) @@ -465,14 +467,14 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { /** A binding for the parameter of an inline method. This is a `val` def for * by-value parameters and a `def` def for by-name parameters. `val` defs inherit * inline annotations from their parameters. The generated `def` is appended - * to `bindingsBuf`. + * to `buf`. * @param name the name of the parameter * @param formal the type of the parameter * @param arg the argument corresponding to the parameter - * @param bindingsBuf the buffer to which the definition should be appended + * @param buf the buffer to which the definition should be appended */ private def paramBindingDef(name: Name, formal: Type, arg0: Tree, - bindingsBuf: mutable.ListBuffer[ValOrDefDef])(using Context): ValOrDefDef = { + buf: DefBuffer)(using Context): ValOrDefDef = { val isByName = formal.dealias.isInstanceOf[ExprType] val arg = arg0 match { case Typed(arg1, tpt) if tpt.tpe.isRepeatedParam && arg1.tpe.derivesFrom(defn.ArrayClass) => @@ -501,23 +503,25 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { else ValDef(boundSym, newArg) }.withSpan(boundSym.span) inlining.println(i"parameter binding: $binding, $argIsBottom") - bindingsBuf += binding + buf += binding binding } - /** Populate `paramBinding` and `bindingsBuf` by matching parameters with + /** Populate `paramBinding` and `buf` by matching parameters with * corresponding arguments. `bindingbuf` will be further extended later by * proxies to this-references. Issue an error if some arguments are missing. */ private def computeParamBindings( - tp: Type, targs: List[Tree], argss: List[List[Tree]], formalss: List[List[Type]]): Boolean = + tp: Type, targs: List[Tree], + argss: List[List[Tree]], formalss: List[List[Type]], + buf: DefBuffer): Boolean = tp match case tp: PolyType => tp.paramNames.lazyZip(targs).foreach { (name, arg) => paramSpan(name) = arg.span paramBinding(name) = arg.tpe.stripTypeVar } - computeParamBindings(tp.resultType, targs.drop(tp.paramNames.length), argss, formalss) + computeParamBindings(tp.resultType, targs.drop(tp.paramNames.length), argss, formalss, buf) case tp: MethodType => if argss.isEmpty then report.error(i"missing arguments for inline method $inlinedMethod", call.srcPos) @@ -529,9 +533,9 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { case _: SingletonType if isIdempotentPath(arg) => arg.tpe case _ => - paramBindingDef(name, formal, arg, bindingsBuf).symbol.termRef + paramBindingDef(name, formal, arg, buf).symbol.termRef } - computeParamBindings(tp.resultType, targs, argss.tail, formalss.tail) + computeParamBindings(tp.resultType, targs, argss.tail, formalss.tail, buf) case _ => assert(targs.isEmpty) assert(argss.isEmpty) @@ -810,7 +814,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { def inlined(sourcePos: SrcPos): Tree = { // Special handling of `requireConst` and `codeOf` - rawCallValueArgss match + callValueArgss match case (arg :: Nil) :: Nil => if inlinedMethod == defn.Compiletime_requireConst then arg match @@ -860,17 +864,25 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { case TypeApply(fn, _) => paramTypess(fn, acc) case _ => acc - val callValueArgss = rawCallValueArgss.nestedMapConserve(mapOpaquesInValueArg) + val paramBindings = + val mappedCallValueArgss = callValueArgss.nestedMapConserve(mapOpaquesInValueArg) + if mappedCallValueArgss ne callValueArgss then + inlining.println(i"mapped value args = ${mappedCallValueArgss.flatten}%, %") - if callValueArgss ne rawCallValueArgss then - inlining.println(i"mapped value args = ${callValueArgss.flatten}%, %") + val paramBindingsBuf = new DefBuffer + // Compute bindings for all parameters, appending them to bindingsBuf + if !computeParamBindings( + inlinedMethod.info, callTypeArgs, + mappedCallValueArgss, paramTypess(call, Nil), + paramBindingsBuf) + then + return call - // Compute bindings for all parameters, appending them to bindingsBuf - if !computeParamBindings(inlinedMethod.info, callTypeArgs, callValueArgss, paramTypess(call, Nil)) then - return call + paramBindingsBuf.toList + end paramBindings // make sure prefix is executed if it is impure - if (!isIdempotentExpr(inlineCallPrefix)) registerType(inlinedMethod.owner.thisType) + if !isIdempotentExpr(inlineCallPrefix) then registerType(inlinedMethod.owner.thisType) // Register types of all leaves of inlined body so that the `paramProxy` and `thisProxy` maps are defined. rhsToInline.foreachSubTree(registerLeaf) @@ -878,6 +890,9 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { // Compute bindings for all this-proxies, appending them to bindingsBuf computeThisBindings() + // Parameter bindings come after this bindings, reflecting order of evaluation + bindingsBuf ++= paramBindings + val inlineTyper = new InlineTyper(ctx.reporter.errorCount) val inlineCtx = inlineContext(call).fresh.setTyper(inlineTyper).setNewScope @@ -1190,7 +1205,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { private object InlineableArg { lazy val paramProxies = paramProxy.values.toSet def unapply(tree: Trees.Ident[?])(using Context): Option[Tree] = { - def search(buf: mutable.ListBuffer[ValOrDefDef]) = buf.find(_.name == tree.name) + def search(buf: DefBuffer) = buf.find(_.name == tree.name) if (paramProxies.contains(tree.typeOpt)) search(bindingsBuf) match { case Some(bind: ValOrDefDef) if bind.symbol.is(Inline) => @@ -1229,7 +1244,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { cpy.Inlined(cl)(call, bindings, recur(expr)) case _ => ddef.tpe.widen match case mt: MethodType if ddef.paramss.head.length == args.length => - val bindingsBuf = new mutable.ListBuffer[ValOrDefDef] + val bindingsBuf = new DefBuffer val argSyms = mt.paramNames.lazyZip(mt.paramInfos).lazyZip(args).map { (name, paramtp, arg) => arg.tpe.dealias match { case ref @ TermRef(NoPrefix, _) => ref.symbol diff --git a/tests/run/i13747.scala b/tests/run/i13747.scala new file mode 100644 index 000000000000..2167523bd754 --- /dev/null +++ b/tests/run/i13747.scala @@ -0,0 +1,17 @@ +var res = "" +trait Bar: + def +(that: Bar): Bar = new Plus(this, that) + transparent inline def -(that: Bar): Bar = new Minus(this, that) + +class LHS extends Bar {res += "LHS "} +class RHS extends Bar {res += "RHS "} + +class Plus(lhs: Bar, rhs: Bar) extends Bar {res += "op"} +class Minus(lhs: Bar, rhs: Bar) extends Bar {res += "op"} + +@main def Test = + val pls = new LHS + new RHS + val plsRes = res + res = "" + val min = new LHS - new RHS + assert(plsRes == res) \ No newline at end of file From 94a24c21f25611329a16c91321c5f05a12fb6604 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Wed, 20 Oct 2021 12:20:58 +0200 Subject: [PATCH 0741/1244] Add missing `@experimental` in `Tuples` --- library/src/scala/runtime/Tuples.scala | 4 ++++ project/MiMaFilters.scala | 1 + 2 files changed, 5 insertions(+) diff --git a/library/src/scala/runtime/Tuples.scala b/library/src/scala/runtime/Tuples.scala index e5018cce47a6..1c81782acecb 100644 --- a/library/src/scala/runtime/Tuples.scala +++ b/library/src/scala/runtime/Tuples.scala @@ -1,5 +1,7 @@ package scala.runtime +import scala.annotation.experimental + object Tuples { inline val MaxSpecialized = 22 @@ -422,11 +424,13 @@ object Tuples { } } + @experimental def init(self: NonEmptyTuple): Tuple = (self: Any) match { case xxl: TupleXXL => xxlInit(xxl) case _ => specialCaseInit(self) } + @experimental def last(self: NonEmptyTuple): Any = (self: Any) match { case self: Product => self.productElement(self.productArity - 1) } diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index 0f8dbfa896c0..9fe7da22fb2a 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -4,6 +4,7 @@ import com.typesafe.tools.mima.core.ProblemFilters._ object MiMaFilters { val Library: Seq[ProblemFilter] = Seq( + // Experimental APIs that can be added in 3.2.0 ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.init"), ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.last") ) From f3ea6fd9133b6a36efb7c8a0b42e26f36562d7cc Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 14 Oct 2021 18:01:36 +0200 Subject: [PATCH 0742/1244] Widen qualifier skolems Fixes #13422 --- .../src/scala/quoted/runtime/impl/QuotesImpl.scala | 2 +- tests/pos-macros/i13422/Macro_1.scala | 9 +++++++++ tests/pos-macros/i13422/Test_2.scala | 12 ++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 tests/pos-macros/i13422/Macro_1.scala create mode 100644 tests/pos-macros/i13422/Test_2.scala diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala index d64ecb1d33e5..ab651408a0c4 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala @@ -1777,7 +1777,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler given NamedTypeMethods: NamedTypeMethods with extension (self: NamedType) - def qualifier: TypeRepr = self.prefix + def qualifier: TypeRepr = self.prefix.widenSkolem def name: String = self.name.toString end extension end NamedTypeMethods diff --git a/tests/pos-macros/i13422/Macro_1.scala b/tests/pos-macros/i13422/Macro_1.scala new file mode 100644 index 000000000000..a141049523ff --- /dev/null +++ b/tests/pos-macros/i13422/Macro_1.scala @@ -0,0 +1,9 @@ +import scala.quoted._ + +inline def rule(inline r: Any): Unit = ${ ruleImpl('r) } + +def ruleImpl(r: Expr[Any])(using Quotes): Expr[Unit] = { + import quotes.reflect.* + r.asTerm.show + '{} +} diff --git a/tests/pos-macros/i13422/Test_2.scala b/tests/pos-macros/i13422/Test_2.scala new file mode 100644 index 000000000000..f6595825516a --- /dev/null +++ b/tests/pos-macros/i13422/Test_2.scala @@ -0,0 +1,12 @@ +def test = rule { + foo(bar(baz)) +} + +def foo[I](r: I): Nothing = ??? + +def bar(i: Baz): i.Out = ??? + +sealed trait Baz: + type Out = Nothing match { case Nothing => Nothing } + +def baz: Baz = ??? From 09eeb99c902bf22255b909a8c3954aac9257c8c6 Mon Sep 17 00:00:00 2001 From: danicheg Date: Thu, 21 Oct 2021 13:13:25 +0300 Subject: [PATCH 0743/1244] Add append operator to Tuple --- library/src/scala/Tuple.scala | 12 ++++ library/src/scala/runtime/Tuples.scala | 76 +++++++++++++++++++++++ project/MiMaFilters.scala | 3 +- tests/run-deep-subtype/Tuple-append.check | 76 +++++++++++++++++++++++ tests/run-deep-subtype/Tuple-append.scala | 65 +++++++++++++++++++ 5 files changed, 231 insertions(+), 1 deletion(-) create mode 100644 tests/run-deep-subtype/Tuple-append.check create mode 100644 tests/run-deep-subtype/Tuple-append.scala diff --git a/library/src/scala/Tuple.scala b/library/src/scala/Tuple.scala index 784170c524ae..06d258e3e503 100644 --- a/library/src/scala/Tuple.scala +++ b/library/src/scala/Tuple.scala @@ -21,6 +21,11 @@ sealed trait Tuple extends Product { inline def toIArray: IArray[Object] = runtime.Tuples.toIArray(this) + /** Return a copy of `this` tuple with an element appended */ + @experimental + inline def :* [This >: this.type <: Tuple, L] (x: L): Append[This, L] = + runtime.Tuples.append(x, this).asInstanceOf[Append[This, L]] + /** Return a new tuple by prepending the element to `this` tuple. * This operation is O(this.size) */ @@ -78,6 +83,13 @@ sealed trait Tuple extends Product { object Tuple { + /** Type of a tuple with an element appended */ + @experimental + type Append[X <: Tuple, Y] <: Tuple = X match { + case EmptyTuple => Y *: EmptyTuple + case x *: xs => x *: Append[xs, Y] + } + /** Type of the head of a tuple */ type Head[X <: NonEmptyTuple] = X match { case x *: _ => x diff --git a/library/src/scala/runtime/Tuples.scala b/library/src/scala/runtime/Tuples.scala index 1c81782acecb..bfb863bcc0f0 100644 --- a/library/src/scala/runtime/Tuples.scala +++ b/library/src/scala/runtime/Tuples.scala @@ -357,6 +357,82 @@ object Tuples { case _ => specialCaseTail(self) } + // Append for TupleXXL + private def xxlAppend(x: Any, xxl: TupleXXL): TupleXXL = { + val arr = new Array[Object](xxl.productArity + 1) + arr(xxl.productArity) = x.asInstanceOf[Object] + System.arraycopy(xxl.elems, 0, arr, 0, xxl.productArity) + TupleXXL.fromIArray(arr.asInstanceOf[IArray[Object]]) + } + + // Append for Tuple1 to Tuple22 + private def specialCaseAppend(x: Any, self: Tuple): Tuple = { + (self: Any) match { + case EmptyTuple => + Tuple1(x) + case self: Tuple1[_] => + Tuple2(self._1, x) + case self: Tuple2[_, _] => + Tuple3(self._1, self._2, x) + case self: Tuple3[_, _, _] => + Tuple4(self._1, self._2, self._3, x) + case self: Tuple4[_, _, _, _] => + Tuple5(self._1, self._2, self._3, self._4, x) + case self: Tuple5[_, _, _, _, _] => + Tuple6(self._1, self._2, self._3, self._4, self._5, x) + case self: Tuple6[_, _, _, _, _, _] => + Tuple7(self._1, self._2, self._3, self._4, self._5, self._6, x) + case self: Tuple7[_, _, _, _, _, _, _] => + Tuple8(self._1, self._2, self._3, self._4, self._5, self._6, self._7, x) + case self: Tuple8[_, _, _, _, _, _, _, _] => + Tuple9(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, x) + case self: Tuple9[_, _, _, _, _, _, _, _, _] => + Tuple10(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, x) + case self: Tuple10[_, _, _, _, _, _, _, _, _, _] => + Tuple11(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, x) + case self: Tuple11[_, _, _, _, _, _, _, _, _, _, _] => + Tuple12(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, x) + case self: Tuple12[_, _, _, _, _, _, _, _, _, _, _, _] => + Tuple13(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, x) + case self: Tuple13[_, _, _, _, _, _, _, _, _, _, _, _, _] => + Tuple14(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, x) + case self: Tuple14[_, _, _, _, _, _, _, _, _, _, _, _, _, _] => + Tuple15(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, x) + case self: Tuple15[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _] => + Tuple16(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, x) + case self: Tuple16[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] => + Tuple17(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, x) + case self: Tuple17[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] => + Tuple18(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, x) + case self: Tuple18[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] => + Tuple19(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, x) + case self: Tuple19[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] => + Tuple20(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, self._19, x) + case self: Tuple20[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] => + Tuple21(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, self._19, self._20, x) + case self: Tuple21[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] => + Tuple22(self._1, self._2, self._3, self._4, self._5, self._6, self._7, self._8, self._9, self._10, self._11, self._12, self._13, self._14, self._15, self._16, self._17, self._18, self._19, self._20, self._21, x) + case self: Tuple22[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] => + val arr: Array[Object] = Array( + self._1.asInstanceOf[Object], self._2.asInstanceOf[Object], + self._3.asInstanceOf[Object], self._4.asInstanceOf[Object], self._5.asInstanceOf[Object], + self._6.asInstanceOf[Object], self._7.asInstanceOf[Object], self._8.asInstanceOf[Object], + self._9.asInstanceOf[Object], self._10.asInstanceOf[Object], self._11.asInstanceOf[Object], + self._12.asInstanceOf[Object], self._13.asInstanceOf[Object], self._14.asInstanceOf[Object], + self._15.asInstanceOf[Object], self._16.asInstanceOf[Object], self._17.asInstanceOf[Object], + self._18.asInstanceOf[Object], self._19.asInstanceOf[Object], self._20.asInstanceOf[Object], + self._21.asInstanceOf[Object], self._22.asInstanceOf[Object], x.asInstanceOf[Object] + ) + TupleXXL.fromIArray(arr.asInstanceOf[IArray[Object]]).asInstanceOf[Tuple] + } + } + + @experimental + def append(x: Any, self: Tuple): Tuple = (self: Any) match { + case xxl: TupleXXL => xxlAppend(x, xxl).asInstanceOf[Tuple] + case _ => specialCaseAppend(x, self) + } + // Init for TupleXXL private def xxlInit(xxl: TupleXXL): Tuple = { if (xxl.productArity == 23) { diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index 9fe7da22fb2a..e37bce1b3cf9 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -6,6 +6,7 @@ object MiMaFilters { val Library: Seq[ProblemFilter] = Seq( // Experimental APIs that can be added in 3.2.0 ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.init"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.last") + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.last"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.append") ) } diff --git a/tests/run-deep-subtype/Tuple-append.check b/tests/run-deep-subtype/Tuple-append.check new file mode 100644 index 000000000000..96c717f2aef0 --- /dev/null +++ b/tests/run-deep-subtype/Tuple-append.check @@ -0,0 +1,76 @@ +(0) +(0,1) +(0,1,2) +(0,1,2,3) +(0,1,2,3,4) +(0,1,2,3,4,5) +(0,1,2,3,4,5,6) +(0,1,2,3,4,5,6,7) +(0,1,2,3,4,5,6,7,8) +(0,1,2,3,4,5,6,7,8,9) +(0,1,2,3,4,5,6,7,8,9,10) +(0,1,2,3,4,5,6,7,8,9,10,11) +(0,1,2,3,4,5,6,7,8,9,10,11,12) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24) +(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25) +(1) +(1,2) +(1,2,3) +(1,2,3,4) +(1,2,3,4,5) +(1,2,3,4,5,6) +(1,2,3,4,5,6,7) +(1,2,3,4,5,6,7,8) +(1,2,3,4,5,6,7,8,9) +(1,2,3,4,5,6,7,8,9,10) +(1,2,3,4,5,6,7,8,9,10,11) +(1,2,3,4,5,6,7,8,9,10,11,12) +(1,2,3,4,5,6,7,8,9,10,11,12,13) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25) +(1) +(1,2) +(1,2,3) +(1,2,3,4) +(1,2,3,4,5) +(1,2,3,4,5,6) +(1,2,3,4,5,6,7) +(1,2,3,4,5,6,7,8) +(1,2,3,4,5,6,7,8,9) +(1,2,3,4,5,6,7,8,9,10) +(1,2,3,4,5,6,7,8,9,10,11) +(1,2,3,4,5,6,7,8,9,10,11,12) +(1,2,3,4,5,6,7,8,9,10,11,12,13) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24) +(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25) diff --git a/tests/run-deep-subtype/Tuple-append.scala b/tests/run-deep-subtype/Tuple-append.scala new file mode 100644 index 000000000000..d913b4c98e1d --- /dev/null +++ b/tests/run-deep-subtype/Tuple-append.scala @@ -0,0 +1,65 @@ +import scala.reflect.ClassTag + +object Test { + def main(args: Array[String]): Unit = { + def testArray[T: ClassTag](n: Int, elem: Int => T): Unit = { + val t: Tuple = Tuple.fromArray(Array.tabulate(n)(elem)) + println(t :* n) + } + + for (i <- 0 to 25) + testArray(i, j => j) + + println(Tuple() :* 1) + println(Tuple1(1) :* 2) + println((1, 2) :* 3) + println((1, 2, 3) :* 4) + println((1, 2, 3, 4) :* 5) + println((1, 2, 3, 4, 5) :* 6) + println((1, 2, 3, 4, 5, 6) :* 7) + println((1, 2, 3, 4, 5, 6, 7) :* 8) + println((1, 2, 3, 4, 5, 6, 7, 8) :* 9) + println((1, 2, 3, 4, 5, 6, 7, 8, 9) :* 10) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10) :* 11) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11) :* 12) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) :* 13) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13) :* 14) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14) :* 15) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15) :* 16) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16) :* 17) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) :* 18) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18) :* 19) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19) :* 20) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20) :* 21) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21) :* 22) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22) :* 23) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23) :* 24) + println((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24) :* 25) + + println(EmptyTuple :* 1) + println((1 *: Tuple()) :* 2) + println((1 *: 2 *: Tuple()) :* 3) + println((1 *: 2 *: 3 *: Tuple()) :* 4) + println((1 *: 2 *: 3 *: 4 *: Tuple()) :* 5) + println((1 *: 2 *: 3 *: 4 *: 5 *: Tuple()) :* 6) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: Tuple()) :* 7) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: Tuple()) :* 8) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: Tuple()) :* 9) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: Tuple()) :* 10) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: Tuple()) :* 11) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: Tuple()) :* 12) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: Tuple()) :* 13) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: Tuple()) :* 14) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: Tuple()) :* 15) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: Tuple()) :* 16) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: Tuple()) :* 17) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: Tuple()) :* 18) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: Tuple()) :* 19) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: Tuple()) :* 20) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: Tuple()) :* 21) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: Tuple()) :* 22) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: Tuple()) :* 23) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: Tuple()) :* 24) + println((1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: 24 *: Tuple()) :* 25) + } +} From 5b65ef14dc91a3b60d3db7950016692fff4e0c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Mon, 18 Oct 2021 14:11:21 +0200 Subject: [PATCH 0744/1244] Set reference and previous version to 3.1.0 --- project/Build.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 65daf5ee280c..0bb061baae43 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -59,7 +59,7 @@ object DottyJSPlugin extends AutoPlugin { } object Build { - val referenceVersion = "3.1.0-RC1" + val referenceVersion = "3.1.0" val baseVersion = "3.1.1-RC1" @@ -77,7 +77,7 @@ object Build { * set to 3.1.3. If it is going to be 3.1.0, it must be set to the latest * 3.0.x release. */ - val previousDottyVersion = "3.1.0-RC3" + val previousDottyVersion = "3.1.0" object CompatMode { final val BinaryCompatible = 0 From 6d5fa645fc8fb14cf86b5e93c10dd283e68b7133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Mon, 18 Oct 2021 14:13:47 +0200 Subject: [PATCH 0745/1244] Set base version to 3.1.2-RC1 --- project/Build.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 0bb061baae43..ff99753add6e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -59,9 +59,9 @@ object DottyJSPlugin extends AutoPlugin { } object Build { - val referenceVersion = "3.1.0" + val referenceVersion = "3.1.1-RC1" - val baseVersion = "3.1.1-RC1" + val baseVersion = "3.1.2-RC1" // Versions used by the vscode extension to create a new project // This should be the latest published releases. From 65827f6561f11f32e33c437774f60cd910b532fc Mon Sep 17 00:00:00 2001 From: Gagandeep Kalra Date: Fri, 15 Oct 2021 01:17:42 +0800 Subject: [PATCH 0746/1244] fix #13011, error out infinite recursive lazy val MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Tom Grigg Co-authored-by: Nicolas Stucki Co-authored-by: Timothée Andres --- .../dotc/transform/CheckLoopingImplicits.scala | 16 +++++++++++----- .../neg-custom-args/fatal-warnings/i13542.scala | 2 +- tests/neg/i13011.scala | 17 +++++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 tests/neg/i13011.scala diff --git a/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala b/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala index 5f8a8ee054f6..4818153e00e6 100644 --- a/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala +++ b/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala @@ -20,7 +20,13 @@ class CheckLoopingImplicits extends MiniPhase: override def phaseName: String = CheckLoopingImplicits.name - override def transformDefDef(mdef: DefDef)(using Context): DefDef = + override def transformValDef(mdef: ValDef)(using Context): Tree = + transform(mdef) + + override def transformDefDef(mdef: DefDef)(using Context): Tree = + transform(mdef) + + def transform(mdef: ValOrDefDef)(using Context): Tree = val sym = mdef.symbol def checkNotSelfRef(t: RefTree) = @@ -70,12 +76,12 @@ class CheckLoopingImplicits extends MiniPhase: checkNotLooping(finalizer) case SeqLiteral(elems, _) => elems.foreach(checkNotLooping) - case t: ValDef => - if !t.symbol.is(Lazy) then checkNotLooping(t.rhs) + case t: ValDef => + checkNotLooping(t.rhs) case _ => - if sym.isOneOf(GivenOrImplicit) then + if sym.isOneOf(GivenOrImplicit | Lazy) then checkNotLooping(mdef.rhs) mdef - end transformDefDef + end transform end CheckLoopingImplicits \ No newline at end of file diff --git a/tests/neg-custom-args/fatal-warnings/i13542.scala b/tests/neg-custom-args/fatal-warnings/i13542.scala index 1c5fa4958c75..3da18c233583 100644 --- a/tests/neg-custom-args/fatal-warnings/i13542.scala +++ b/tests/neg-custom-args/fatal-warnings/i13542.scala @@ -40,7 +40,7 @@ val x5 = val x6 = implicit def barToFoo4(bar: Bar): Foo = - lazy val y = bar.toFoo // OK + lazy val y = bar.toFoo // error if false then y else ??? val foo: Foo = Bar(1) diff --git a/tests/neg/i13011.scala b/tests/neg/i13011.scala new file mode 100644 index 000000000000..97c626e574e9 --- /dev/null +++ b/tests/neg/i13011.scala @@ -0,0 +1,17 @@ +class i13011 { + lazy implicit val simple1: String = simple1 // error + def f: Unit = { + lazy val simple2: String = simple2 // error + } + + lazy val simple3: String = if true then this.simple3 else "a" // error + + lazy val simple4: String = identity(this.simple4) // error + + lazy val simple5: String = { // error + this.simple5 + "aa" + } + + lazy val simple6: Function0[Any] = () => this.simple6 // Ok +} From 876215b0363c9e057310b715b2448e01460294a2 Mon Sep 17 00:00:00 2001 From: Gagandeep Kalra Date: Fri, 15 Oct 2021 18:23:12 +0800 Subject: [PATCH 0747/1244] moved i13011 to neg-custom-args/fatal-warnings --- tests/{neg => neg-custom-args/fatal-warnings}/i13011.scala | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{neg => neg-custom-args/fatal-warnings}/i13011.scala (100%) diff --git a/tests/neg/i13011.scala b/tests/neg-custom-args/fatal-warnings/i13011.scala similarity index 100% rename from tests/neg/i13011.scala rename to tests/neg-custom-args/fatal-warnings/i13011.scala From cc81660d6fe3c6a4483831ec7acba4796bc85424 Mon Sep 17 00:00:00 2001 From: Gagandeep Kalra Date: Sat, 16 Oct 2021 00:12:04 +0800 Subject: [PATCH 0748/1244] fixed repl test --- compiler/test-resources/repl/10886 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/test-resources/repl/10886 b/compiler/test-resources/repl/10886 index 820187b0b33c..5d06f7995a13 100644 --- a/compiler/test-resources/repl/10886 +++ b/compiler/test-resources/repl/10886 @@ -3,7 +3,7 @@ scala> type Channel = "A" | "B" scala> type SelChannel[C <: Tuple] = C match { case x *: xs => x | SelChannel[xs] case _ => Nothing } -scala> lazy val a: SelChannel[("A", "B", "C")] = a +scala> lazy val a: SelChannel[("A", "B", "C")] = "A" lazy val a: "A" | ("B" | ("C" | Nothing)) scala>:type a From 09c275735a27a390d9f1f692542e44901560608d Mon Sep 17 00:00:00 2001 From: Gagandeep Kalra Date: Sun, 17 Oct 2021 20:56:09 +0800 Subject: [PATCH 0749/1244] added additonal check for boolean case --- tests/neg-custom-args/fatal-warnings/i13011.scala | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/neg-custom-args/fatal-warnings/i13011.scala b/tests/neg-custom-args/fatal-warnings/i13011.scala index 97c626e574e9..c4ea118b4627 100644 --- a/tests/neg-custom-args/fatal-warnings/i13011.scala +++ b/tests/neg-custom-args/fatal-warnings/i13011.scala @@ -6,12 +6,16 @@ class i13011 { lazy val simple3: String = if true then this.simple3 else "a" // error - lazy val simple4: String = identity(this.simple4) // error + def firstDigitIsEven(n: Int): Boolean = if n % 10 == n then n % 2 == 0 else firstDigitIsEven(n / 10) + + lazy val simple4: String = if firstDigitIsEven(22) then this.simple4 else "a" // error + + lazy val simple5: String = identity(this.simple5) // error - lazy val simple5: String = { // error - this.simple5 + lazy val simple6: String = { // error + this.simple6 "aa" } - lazy val simple6: Function0[Any] = () => this.simple6 // Ok + lazy val simple7: Function0[Any] = () => this.simple7 // Ok } From 72ed9c8edcc190ad970bb130d06ab2a066c6d8b3 Mon Sep 17 00:00:00 2001 From: Gagandeep Kalra Date: Mon, 18 Oct 2021 17:14:06 +0800 Subject: [PATCH 0750/1244] fixed positive test case --- tests/neg-custom-args/fatal-warnings/i13011.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/neg-custom-args/fatal-warnings/i13011.scala b/tests/neg-custom-args/fatal-warnings/i13011.scala index c4ea118b4627..ae534394bf96 100644 --- a/tests/neg-custom-args/fatal-warnings/i13011.scala +++ b/tests/neg-custom-args/fatal-warnings/i13011.scala @@ -8,7 +8,7 @@ class i13011 { def firstDigitIsEven(n: Int): Boolean = if n % 10 == n then n % 2 == 0 else firstDigitIsEven(n / 10) - lazy val simple4: String = if firstDigitIsEven(22) then this.simple4 else "a" // error + lazy val simple4: String = if firstDigitIsEven(22) then this.simple4 else "a" // ok lazy val simple5: String = identity(this.simple5) // error From 5a162c7f4e3e6bf9cd6a83c235ac278dfb2aaec6 Mon Sep 17 00:00:00 2001 From: Matthieu Bovel Date: Thu, 21 Oct 2021 13:50:49 +0200 Subject: [PATCH 0751/1244] Allow passing any JMH option to scala3-bench --- bench/profiles/ci.yml | 30 ++++++------ bench/profiles/empty.yml | 6 +-- bench/profiles/exhaustivity.yml | 16 +++---- bench/profiles/implicits.yml | 8 ++-- bench/profiles/misc.yml | 4 +- bench/profiles/projects.yml | 4 +- bench/profiles/sbt.yml | 2 +- bench/profiles/tuples.yml | 10 ++-- bench/profiles/typing.yml | 2 +- bench/scripts/collection-vector.sh | 2 +- bench/scripts/compiler-cold.sh | 2 +- bench/scripts/compiler.sh | 2 +- bench/scripts/library-cold.sh | 2 +- bench/scripts/library.sh | 2 +- bench/src/main/scala/Benchmarks.scala | 66 ++++++++++++++++----------- 15 files changed, 86 insertions(+), 72 deletions(-) diff --git a/bench/profiles/ci.yml b/bench/profiles/ci.yml index 0571d509a286..96a4c1e10716 100644 --- a/bench/profiles/ci.yml +++ b/bench/profiles/ci.yml @@ -1,55 +1,55 @@ scripts: re2s: - - measure 1 1 1 $(find $PROG_HOME/tests/re2s/src -name *.scala) + - measure -wi 1 -i 1 -f 1 -- $(find $PROG_HOME/tests/re2s/src -name *.scala) implicit-cache: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicit_cache.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicit_cache.scala implicit-cache-from-tasty: - source $PROG_HOME/dotty/bench/scripts/implicit-cache-from-tasty implicit-scope-loop: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala i1535: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/i1535.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/i1535.scala i1687: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/i1687.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/i1687.scala empty-class: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-class.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-class.scala empty-object: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-object.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-object.scala empty-file: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-file.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-file.scala patmatexhaust: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/patmatexhaust.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/patmatexhaust.scala exhaustivity-I: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala exhaustivity-S: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala exhaustivity-T: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala exhaustivity-V: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala implicitNums: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicitNums.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicitNums.scala implicitNums-from-tasty: - source $PROG_HOME/dotty/bench/scripts/implicitNums-from-tasty inductive-implicits: - - measure 1 1 1 $PROG_HOME/dotty/tests/bench/inductive-implicits.scala + - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/inductive-implicits.scala scalap: - source $PROG_HOME/dotty/bench/scripts/scalap diff --git a/bench/profiles/empty.yml b/bench/profiles/empty.yml index ef878e07f50d..bdee3609fe8d 100644 --- a/bench/profiles/empty.yml +++ b/bench/profiles/empty.yml @@ -21,13 +21,13 @@ charts: scripts: empty-class: - - measure $PROG_HOME/dotty/tests/bench/empty-class.scala + - measure -- $PROG_HOME/dotty/tests/bench/empty-class.scala empty-object: - - measure $PROG_HOME/dotty/tests/bench/empty-object.scala + - measure -- $PROG_HOME/dotty/tests/bench/empty-object.scala empty-file: - - measure $PROG_HOME/dotty/tests/bench/empty-file.scala + - measure -- $PROG_HOME/dotty/tests/bench/empty-file.scala config: pr_base_url: "https://github.com/lampepfl/dotty/pull/" diff --git a/bench/profiles/exhaustivity.yml b/bench/profiles/exhaustivity.yml index d8295a27060e..0591bb0c4d56 100644 --- a/bench/profiles/exhaustivity.yml +++ b/bench/profiles/exhaustivity.yml @@ -50,28 +50,28 @@ charts: scripts: patmatexhaust: - - measure 20 40 3 $PROG_HOME/dotty/tests/bench/patmatexhaust.scala + - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/patmatexhaust.scala exhaustivity-I: - - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala + - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala exhaustivity-S: - - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala + - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala exhaustivity-T: - - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala + - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala exhaustivity-V: - - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala + - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala exhaustivity-mips: - - measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i7186.scala + - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/patmat/i7186.scala exhaustivity-i12241: - - measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i12241.scala + - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/patmat/i12241.scala exhaustivity-i12358: - - measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i12358.scala + - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/patmat/i12358.scala config: pr_base_url: "https://github.com/lampepfl/dotty/pull/" diff --git a/bench/profiles/implicits.yml b/bench/profiles/implicits.yml index d20a99c26461..97b0840d17c2 100644 --- a/bench/profiles/implicits.yml +++ b/bench/profiles/implicits.yml @@ -30,19 +30,19 @@ charts: scripts: implicit-cache: - - measure $PROG_HOME/dotty/tests/bench/implicit_cache.scala + - measure -- $PROG_HOME/dotty/tests/bench/implicit_cache.scala implicit-cache-from-tasty: - source $PROG_HOME/dotty/bench/scripts/implicit-cache-from-tasty implicit-scope-loop: - - measure $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala + - measure -- $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala inductive-implicits: - - measure $PROG_HOME/dotty/tests/bench/inductive-implicits.scala + - measure -- $PROG_HOME/dotty/tests/bench/inductive-implicits.scala implicitNums: - - measure $PROG_HOME/dotty/tests/bench/implicitNums.scala + - measure -- $PROG_HOME/dotty/tests/bench/implicitNums.scala implicitNums-from-tasty: - source $PROG_HOME/dotty/bench/scripts/implicitNums-from-tasty diff --git a/bench/profiles/misc.yml b/bench/profiles/misc.yml index 80172fc791ed..f0b6a5d11ed8 100644 --- a/bench/profiles/misc.yml +++ b/bench/profiles/misc.yml @@ -15,7 +15,7 @@ charts: scripts: i1535: - - measure $PROG_HOME/dotty/tests/bench/i1535.scala + - measure -- $PROG_HOME/dotty/tests/bench/i1535.scala i1687: - - measure $PROG_HOME/dotty/tests/bench/i1687.scala + - measure -- $PROG_HOME/dotty/tests/bench/i1687.scala diff --git a/bench/profiles/projects.yml b/bench/profiles/projects.yml index 2d96fb732910..10e90eb1c5d3 100644 --- a/bench/profiles/projects.yml +++ b/bench/profiles/projects.yml @@ -26,10 +26,10 @@ charts: scripts: dotty: - - measure -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) + - measure -- -with-compiler $ $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) re2s: - - measure $(find $PROG_HOME/tests/re2s/src -name *.scala) + - measure -- $(find $PROG_HOME/tests/re2s/src -name *.scala) # scalapb: # - source $PROG_HOME/dotty/bench/scripts/scalapb diff --git a/bench/profiles/sbt.yml b/bench/profiles/sbt.yml index 3ab0e43f3db2..0503a35d36a7 100644 --- a/bench/profiles/sbt.yml +++ b/bench/profiles/sbt.yml @@ -9,7 +9,7 @@ charts: scripts: dotty-sbt: - - measure -with-compiler -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) + - measure -- -with-compiler $ -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) config: pr_base_url: "https://github.com/lampepfl/dotty/pull/" diff --git a/bench/profiles/tuples.yml b/bench/profiles/tuples.yml index eaa2f302a885..7977644a5731 100644 --- a/bench/profiles/tuples.yml +++ b/bench/profiles/tuples.yml @@ -44,19 +44,19 @@ charts: scripts: tuple22-creation-apply: - - measure $PROG_HOME/dotty/tests/bench/tuple22-creation-apply.scala + - measure -- $PROG_HOME/dotty/tests/bench/tuple22-creation-apply.scala tuple22-creation-cons: - - measure $PROG_HOME/dotty/tests/bench/tuple22-creation-cons.scala + - measure -- $PROG_HOME/dotty/tests/bench/tuple22-creation-cons.scala tuple22-tails: - - measure $PROG_HOME/dotty/tests/bench/tuple22-tails.scala + - measure -- $PROG_HOME/dotty/tests/bench/tuple22-tails.scala tuple22-apply: - - measure $PROG_HOME/dotty/tests/bench/tuple22-apply.scala + - measure -- $PROG_HOME/dotty/tests/bench/tuple22-apply.scala tuple22-size: - - measure $PROG_HOME/dotty/tests/bench/tuple22-size.scala + - measure -- $PROG_HOME/dotty/tests/bench/tuple22-size.scala tuple-reverse: - measure-run TupleOps.reverse diff --git a/bench/profiles/typing.yml b/bench/profiles/typing.yml index 4df33da49d32..24a8835aeb55 100644 --- a/bench/profiles/typing.yml +++ b/bench/profiles/typing.yml @@ -8,7 +8,7 @@ charts: scripts: find-ref: - - measure $PROG_HOME/dotty/tests/bench/FindRef.scala + - measure -- $PROG_HOME/dotty/tests/bench/FindRef.scala config: pr_base_url: "https://github.com/lampepfl/dotty/pull/" diff --git a/bench/scripts/collection-vector.sh b/bench/scripts/collection-vector.sh index fb23a4a709db..65f6bdeb15a6 100755 --- a/bench/scripts/collection-vector.sh +++ b/bench/scripts/collection-vector.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -sbt "dotty-bench-bootstrapped/jmh:run 40 40 3 bench/tests/Vector.scala" +sbt "dotty-bench-bootstrapped/jmh:run -wi 40 -i 40 -f 3 -- bench/tests/Vector.scala" diff --git a/bench/scripts/compiler-cold.sh b/bench/scripts/compiler-cold.sh index 06c1e3823a50..a7b5e0a5e2d1 100755 --- a/bench/scripts/compiler-cold.sh +++ b/bench/scripts/compiler-cold.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 0 1 10" {} + | sbt +find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 0 -i 1 -f 10 -- " {} + | sbt diff --git a/bench/scripts/compiler.sh b/bench/scripts/compiler.sh index 0d1491d88676..ff8c9f5ca907 100755 --- a/bench/scripts/compiler.sh +++ b/bench/scripts/compiler.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 5 10" {} + | sbt +find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 5 -i 10 -- " {} + | sbt diff --git a/bench/scripts/library-cold.sh b/bench/scripts/library-cold.sh index 349be0cc282f..80b80aa0445c 100755 --- a/bench/scripts/library-cold.sh +++ b/bench/scripts/library-cold.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 0 1 10" {} + | sbt +find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 0 -i 1 -f 10 -- " {} + | sbt diff --git a/bench/scripts/library.sh b/bench/scripts/library.sh index b811349f85ec..40245b06bf28 100755 --- a/bench/scripts/library.sh +++ b/bench/scripts/library.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 40 30" {} + | sbt +find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 40 -i 30 -- " {} + | sbt diff --git a/bench/src/main/scala/Benchmarks.scala b/bench/src/main/scala/Benchmarks.scala index 6e0bae6e72de..81346c596927 100644 --- a/bench/src/main/scala/Benchmarks.scala +++ b/bench/src/main/scala/Benchmarks.scala @@ -7,7 +7,7 @@ import reporting._ import org.openjdk.jmh.results.RunResult import org.openjdk.jmh.runner.Runner -import org.openjdk.jmh.runner.options.OptionsBuilder +import org.openjdk.jmh.runner.options.{OptionsBuilder, CommandLineOptions} import org.openjdk.jmh.annotations._ import org.openjdk.jmh.results.format._ import java.util.concurrent.TimeUnit @@ -22,37 +22,47 @@ import dotty.tools.io.AbstractFile object Bench { val COMPILE_OPTS_FILE = "compile.txt" + def printUsage() = + println("Usage (from SBT): scala3-bench/jmh:run -- ") + println("Display JMH help: scala3-bench/jmh:run -h") + println("Our default JMH options: -wi 30 -i 20 -f 3 -tu ms -bm AverageTime -jvmArgs \"-Xms2G -Xmx2G\"") + def main(args: Array[String]): Unit = { if (args.isEmpty) { - println("Missing ") + println("Missing arguments.") + printUsage() return } - val (intArgs, args1) = args.span(x => try { x.toInt; true } catch { case _: Throwable => false } ) - val warmup = if (intArgs.length > 0) intArgs(0).toInt else 30 - val iterations = if (intArgs.length > 1) intArgs(1).toInt else 20 - val forks = if (intArgs.length > 2) intArgs(2).toInt else 1 + val (jmhArgs, _scalacArgs) = args.span(_ != "--") + val scalacArgs = _scalacArgs.drop(1) + storeCompileOptions(scalacArgs) - import File.{ separator => sep } + val jmhCliOps = new CommandLineOptions(jmhArgs:_*) + val jmhOps = new OptionsBuilder().parent(jmhCliOps) + + // set our own default options + if !jmhCliOps.shouldFailOnError().hasValue() then jmhOps.shouldFailOnError(true) + if !jmhCliOps.getWarmupIterations().hasValue() then jmhOps.warmupIterations(30) + if !jmhCliOps.getMeasurementIterations().hasValue() then jmhOps.measurementIterations(20) + if !jmhCliOps.getForkCount().hasValue() then jmhOps.forks(1) + if jmhCliOps.getBenchModes().isEmpty() then jmhOps.mode(Mode.AverageTime) + if !jmhCliOps.getTimeUnit().hasValue() then jmhOps.timeUnit(TimeUnit.MILLISECONDS) + if !jmhCliOps.getJvmArgs().hasValue() then jmhOps.jvmArgs("-Xms2G", "-Xmx2G") + + val runner = new Runner(jmhOps.build()) + + if jmhCliOps.shouldHelp() then + printUsage() + println("Following is the JMH options documentation.") + println("-------------------------------------------") + return jmhCliOps.showHelp() + if jmhCliOps.shouldList() then return runner.list() + if jmhCliOps.shouldListWithParams() then return runner.listWithParams(jmhCliOps) + if jmhCliOps.shouldListProfilers() then return jmhCliOps.listProfilers() + if jmhCliOps.shouldListResultFormats() then return jmhCliOps.listResultFormats() - val args2 = args1.map { arg => - if ((arg.endsWith(".scala") || arg.endsWith(".java")) && !(new File(arg)).isAbsolute) ".." + sep + arg - else arg - } - storeCompileOptions(args2) - - val opts = new OptionsBuilder() - .shouldFailOnError(true) - .jvmArgs("-Xms2G", "-Xmx2G") - .mode(Mode.AverageTime) - .timeUnit(TimeUnit.MILLISECONDS) - .warmupIterations(warmup) - .measurementIterations(iterations) - .forks(forks) - .build - - val runner = new Runner(opts) // full access to all JMH features, you can also provide a custom output Format here runner.run() // actually run the benchmarks removeCompileOptions @@ -61,13 +71,17 @@ object Bench { def removeCompileOptions: Unit = new File(COMPILE_OPTS_FILE).delete() def storeCompileOptions(args: Array[String]): Unit = { + import File.{ separator => sep } + val standard_libs = System.getProperty("BENCH_CLASS_PATH") val compiler_libs = System.getProperty("BENCH_COMPILER_CLASS_PATH") val libs = if (args.contains("-with-compiler")) compiler_libs else standard_libs - var argsNorm = args.filter(_ != "-with-compiler") + var argsNorm = args.filter(_ != "-with-compiler").map { arg => + if ((arg.endsWith(".scala") || arg.endsWith(".java")) && !(new File(arg)).isAbsolute) ".." + sep + arg + else arg + } - import File.{ pathSeparator => sep } var cpIndex = argsNorm.indexOf("-classpath") if (cpIndex == -1) cpIndex = argsNorm.indexOf("-cp") if (cpIndex != -1) argsNorm(cpIndex + 1) = argsNorm(cpIndex + 1) + sep + libs From 7170f0d3fd1b20c41903758d64bce8d8ec7ef8a1 Mon Sep 17 00:00:00 2001 From: Matthieu Bovel Date: Thu, 21 Oct 2021 16:30:53 +0200 Subject: [PATCH 0752/1244] Update scala3-bench calls in bootstrapCmdTests --- project/scripts/bootstrapCmdTests | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrapCmdTests index 0dfa3460eeaa..9f8956e1d23c 100755 --- a/project/scripts/bootstrapCmdTests +++ b/project/scripts/bootstrapCmdTests @@ -5,10 +5,10 @@ set -e source $(dirname $0)/cmdTestsCommon.inc.sh # check that benchmarks can run -"$SBT" "scala3-bench/jmh:run 1 1 tests/pos/alias.scala" +"$SBT" "scala3-bench/jmh:run -wi 1 -i 1 -- tests/pos/alias.scala" # The above is here as it relies on the bootstrapped library. -"$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala" -"$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 -with-compiler compiler/src/dotty/tools/dotc/core/Types.scala" +"$SBT" "scala3-bench-bootstrapped/jmh:run -wi 1 -i 1 -- tests/pos/alias.scala" +"$SBT" "scala3-bench-bootstrapped/jmh:run -wi 1 -i 1 -- -with-compiler compiler/src/dotty/tools/dotc/core/Types.scala" echo "testing scala.quoted.Expr.run from sbt scala" "$SBT" ";scala3-compiler-bootstrapped/scalac -with-compiler tests/run-staging/quote-run.scala; scala3-compiler-bootstrapped/scala -with-compiler Test" > "$tmp" From 70e4f4dca8534f7de0ecf58efc9929c7b485ef87 Mon Sep 17 00:00:00 2001 From: Stephane MICHELOUD Date: Thu, 21 Oct 2021 20:06:13 +0200 Subject: [PATCH 0753/1244] small additions to batch files (see PR#13577 and PR#13759) --- dist/bin/scalac.bat | 4 +++- dist/bin/scaladoc.bat | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dist/bin/scalac.bat b/dist/bin/scalac.bat index bf34f9275aab..a94bdb5f88b8 100644 --- a/dist/bin/scalac.bat +++ b/dist/bin/scalac.bat @@ -39,8 +39,10 @@ if "%_PROG_NAME%"=="%_SCRIPTING_MAIN%" ( if defined JAVA_OPTS ( set _JAVA_OPTS=%JAVA_OPTS% ) else ( set _JAVA_OPTS=%_DEFAULT_JAVA_OPTS% ) +for %%i in ("%_PROG_HOME%\..") do set "_SCALA_HOME=%%~fi" + call "%_JAVACMD%" %_JAVA_OPTS% %_JAVA_DEBUG% %_JAVA_ARGS% %_JVM_CP_ARGS% ^ --Dscala.usejavacp=true ^ +-Dscala.home="%_SCALA_HOME%" -Dscala.usejavacp=true ^ %_PROG_NAME% %_SCALA_ARGS% %_RESIDUAL_ARGS% %_SCRIPTING_STRING% if not %ERRORLEVEL%==0 ( set _EXITCODE=1 diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat index c7eb4cb6d472..2a80916c1db7 100644 --- a/dist/bin/scaladoc.bat +++ b/dist/bin/scaladoc.bat @@ -149,7 +149,7 @@ goto :eof @rem output parameter: _CLASS_PATH :updateClasspath set "__PATTERN=%~1" -for /f %%f in ('dir /a-d /b "%_LIB_DIR%\*%__PATTERN%*"') do ( +for /f "delims=" %%f in ('dir /a-d /b "%_LIB_DIR%\*%__PATTERN%*"') do ( set "_CLASS_PATH=!_CLASS_PATH!%_LIB_DIR%\%%f%_PSEP%" ) goto :eof From 923213404db11acd5982cbd955bf140320985f3f Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 21 Oct 2021 10:33:06 +0200 Subject: [PATCH 0754/1244] Improve message when -Xmax-inlines limit reached Fixes #13044 --- .../dotty/tools/dotc/transform/Erasure.scala | 10 +++- .../dotty/tools/dotc/CompilationTests.scala | 1 + tests/neg/i13044.check | 44 ++++++++++++++++ tests/neg/i13044.scala | 51 +++++++++++++++++++ tests/pos-custom-args/i13044.scala | 51 +++++++++++++++++++ 5 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 tests/neg/i13044.check create mode 100644 tests/neg/i13044.scala create mode 100644 tests/pos-custom-args/i13044.scala diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index 2875e2e2d865..ae2eac2c20fd 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -593,8 +593,14 @@ object Erasure { */ private def checkNotErased(tree: Tree)(using Context): tree.type = { if (!ctx.mode.is(Mode.Type)) { - if (isErased(tree)) - report.error(em"${tree.symbol} is declared as erased, but is in fact used", tree.srcPos) + if isErased(tree) then + val msg = + if tree.symbol.is(Flags.Inline) then + em"""${tree.symbol} is declared as `inline`, but was not inlined + | + |Try increasing `-Xmax-inlines` above ${ctx.settings.XmaxInlines.value}""".stripMargin + else em"${tree.symbol} is declared as `erased`, but is in fact used" + report.error(msg, tree.srcPos) tree.symbol.getAnnotation(defn.CompileTimeOnlyAnnot) match { case Some(annot) => def defaultMsg = diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index c94ebe563f72..a9e679eb6e95 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -63,6 +63,7 @@ class CompilationTests { compileFile("tests/pos-special/extend-java-enum.scala", defaultOptions.and("-source", "3.0-migration")), compileFile("tests/pos-custom-args/help.scala", defaultOptions.and("-help", "-V", "-W", "-X", "-Y")), compileFile("tests/pos-custom-args/i10383.scala", defaultOptions.and("-source", "future", "-deprecation", "-Xfatal-warnings")), + compileFile("tests/pos-custom-args/i13044.scala", defaultOptions.and("-Xmax-inlines:33")), ).checkCompile() } diff --git a/tests/neg/i13044.check b/tests/neg/i13044.check new file mode 100644 index 000000000000..87b8a1fe9ae2 --- /dev/null +++ b/tests/neg/i13044.check @@ -0,0 +1,44 @@ +-- Error: tests/neg/i13044.scala:50:40 --------------------------------------------------------------------------------- +50 | implicit def typeSchema: Schema[A] = Schema.gen // error // error + | ^^^^^^^^^^ + | given instance gen is declared as `inline`, but was not inlined + | + | Try increasing `-Xmax-inlines` above 32 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:18 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 +-- Error: tests/neg/i13044.scala:50:40 --------------------------------------------------------------------------------- +50 | implicit def typeSchema: Schema[A] = Schema.gen // error // error + | ^^^^^^^^^^ + | method recurse is declared as `inline`, but was not inlined + | + | Try increasing `-Xmax-inlines` above 32 + | This location contains code that was inlined from i13044.scala:18 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:18 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 diff --git a/tests/neg/i13044.scala b/tests/neg/i13044.scala new file mode 100644 index 000000000000..081b642c604c --- /dev/null +++ b/tests/neg/i13044.scala @@ -0,0 +1,51 @@ +import scala.deriving.Mirror +import scala.compiletime._ + +trait Schema[T] { + def build: T +} + +object Schema extends SchemaDerivation { + implicit lazy val int: Schema[Int] = ??? + implicit def option[A](implicit ev: Schema[A]): Schema[Option[A]] = ??? +} + +trait SchemaDerivation { + inline def recurse[A <: Tuple]: List[Schema[Any]] = + inline erasedValue[A] match { + case _: (t *: ts) => + val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + builder :: recurse[ts] + case _: EmptyTuple => Nil + } + + inline def derived[A]: Schema[A] = + inline summonInline[Mirror.Of[A]] match { + case m: Mirror.SumOf[A] => + lazy val subTypes = recurse[m.MirroredElemTypes] + new Schema[A] { + def build: A = ??? + } + + case m: Mirror.ProductOf[A] => + lazy val fields = recurse[m.MirroredElemTypes] + new Schema[A] { + def build: A = ??? + } + } + + inline given gen[A]: Schema[A] = derived +} + +case class H(i: Int) +case class G(h: H) +case class F(g: G) +case class E(f: Option[F]) +case class D(e: E) +case class C(d: D) +case class B(c: C) +case class A(a: A, b: B) + +object TestApp { + implicit def typeSchema: Schema[A] = Schema.gen // error // error +} diff --git a/tests/pos-custom-args/i13044.scala b/tests/pos-custom-args/i13044.scala new file mode 100644 index 000000000000..33a20b5800c8 --- /dev/null +++ b/tests/pos-custom-args/i13044.scala @@ -0,0 +1,51 @@ +import scala.deriving.Mirror +import scala.compiletime._ + +trait Schema[T] { + def build: T +} + +object Schema extends SchemaDerivation { + implicit lazy val int: Schema[Int] = ??? + implicit def option[A](implicit ev: Schema[A]): Schema[Option[A]] = ??? +} + +trait SchemaDerivation { + inline def recurse[A <: Tuple]: List[Schema[Any]] = + inline erasedValue[A] match { + case _: (t *: ts) => + val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + builder :: recurse[ts] + case _: EmptyTuple => Nil + } + + inline def derived[A]: Schema[A] = + inline summonInline[Mirror.Of[A]] match { + case m: Mirror.SumOf[A] => + lazy val subTypes = recurse[m.MirroredElemTypes] + new Schema[A] { + def build: A = ??? + } + + case m: Mirror.ProductOf[A] => + lazy val fields = recurse[m.MirroredElemTypes] + new Schema[A] { + def build: A = ??? + } + } + + inline given gen[A]: Schema[A] = derived +} + +case class H(i: Int) +case class G(h: H) +case class F(g: G) +case class E(f: Option[F]) +case class D(e: E) +case class C(d: D) +case class B(c: C) +case class A(a: A, b: B) + +object TestApp { + implicit def typeSchema: Schema[A] = Schema.gen +} From dc94c7c752969878ff0cf862c1376350dd461295 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 27 Jul 2021 14:35:28 +0200 Subject: [PATCH 0755/1244] Add reflect TypeRepr.substituteTypes --- .../quoted/runtime/impl/QuotesImpl.scala | 2 ++ .../dotty/tools/repl/TabcompleteTests.scala | 2 +- library/src/scala/quoted/Quotes.scala | 6 +++++ project/MiMaFilters.scala | 5 ++-- tests/run-macros/i12392.check | 1 + tests/run-macros/i12392/Macros_1.scala | 24 +++++++++++++++++++ tests/run-macros/i12392/Test_2.scala | 1 + 7 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 tests/run-macros/i12392.check create mode 100644 tests/run-macros/i12392/Macros_1.scala create mode 100644 tests/run-macros/i12392/Test_2.scala diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala index ab651408a0c4..8a8e34901a3b 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala @@ -1747,6 +1747,8 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler dotc.core.Types.decorateTypeApplications(self).appliedTo(targ) def appliedTo(targs: List[TypeRepr]): TypeRepr = dotc.core.Types.decorateTypeApplications(self).appliedTo(targs) + def substituteTypes(from: List[Symbol], to: List[TypeRepr]): TypeRepr = + self.subst(from, to) end extension end TypeReprMethods diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala index 540147bcd211..932ab7058899 100644 --- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala +++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala @@ -134,7 +134,7 @@ class TabcompleteTests extends ReplTest { } @Test def i12600 = fromInitialState { implicit s => - assertEquals(List("select", "show", "simplified"), + assertEquals(List("select", "show", "simplified", "substituteTypes"), tabComplete("import quoted.* ; def fooImpl(using Quotes): Expr[Int] = { import quotes.reflect.* ; TypeRepr.of[Int].s")) } diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala index a1199fc42169..397f9d3b6aae 100644 --- a/library/src/scala/quoted/Quotes.scala +++ b/library/src/scala/quoted/Quotes.scala @@ -2565,6 +2565,12 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => /** The current type applied to given type arguments: `this[targ0, ..., targN]` */ def appliedTo(targs: List[TypeRepr]): TypeRepr + /** Substitute all types that refer in their symbol attribute to + * one of the symbols in `from` by the corresponding types in `to`. + */ + @experimental + def substituteTypes(from: List[Symbol], to: List[TypeRepr]): TypeRepr + end extension } diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index e37bce1b3cf9..4ef5e4d69c57 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -1,12 +1,13 @@ import com.typesafe.tools.mima.core._ -import com.typesafe.tools.mima.core.ProblemFilters._ object MiMaFilters { val Library: Seq[ProblemFilter] = Seq( // Experimental APIs that can be added in 3.2.0 ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.init"), ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.last"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.append") + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.append"), + ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"), ) } diff --git a/tests/run-macros/i12392.check b/tests/run-macros/i12392.check new file mode 100644 index 000000000000..54c7f5d06c3f --- /dev/null +++ b/tests/run-macros/i12392.check @@ -0,0 +1 @@ +scala.Option[scala.Predef.String] to scala.Option[scala.Int] diff --git a/tests/run-macros/i12392/Macros_1.scala b/tests/run-macros/i12392/Macros_1.scala new file mode 100644 index 000000000000..f604cf815716 --- /dev/null +++ b/tests/run-macros/i12392/Macros_1.scala @@ -0,0 +1,24 @@ +import scala.quoted.* + +inline def testSubst: Unit = ${ testSubstImpl } + +def testSubstImpl(using Quotes): Expr[Unit] = { + import quotes.reflect.* + + val intTpe = TypeRepr.of[Int] + val strOptTpe = TypeRepr.of[Option[String]] + + val tpeArgs: List[TypeRepr] = strOptTpe match { + case AppliedType(_, args) => args + case _ => List.empty[TypeRepr] + } + + val intOptTpe = strOptTpe.substituteTypes( + tpeArgs.map(_.typeSymbol), List(intTpe)) + + val repr = s"${strOptTpe.show} to ${intOptTpe.show}" + + '{ + println(${Expr(repr)}) + } +} diff --git a/tests/run-macros/i12392/Test_2.scala b/tests/run-macros/i12392/Test_2.scala new file mode 100644 index 000000000000..6fb9577c8ef9 --- /dev/null +++ b/tests/run-macros/i12392/Test_2.scala @@ -0,0 +1 @@ +@main def Test = testSubst From b040199e20432c18bf8fe03de287fbe85094b295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Fri, 22 Oct 2021 16:17:23 +0200 Subject: [PATCH 0756/1244] Fix missing known subtypes --- .../src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala | 5 ++++- .../transformers/InheritanceInformationTransformer.scala | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala index 09d71021a6f5..de3cb429922b 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala @@ -292,7 +292,10 @@ trait ClassLikeSupport: def getParentsAsTreeSymbolTuples: List[(Tree, Symbol)] = for parentTree <- c.parents if isValidPos(parentTree.pos) // We assume here that order is correct - parentSymbol = if parentTree.symbol.isClassConstructor then parentTree.symbol.owner else parentTree.symbol + parentSymbol = parentTree match + case t: TypeTree => t.tpe.typeSymbol + case tree if tree.symbol.isClassConstructor => tree.symbol.owner + case tree => tree.symbol if parentSymbol != defn.ObjectClass && parentSymbol != defn.AnyClass yield (parentTree, parentSymbol) diff --git a/scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala b/scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala index 63774d27c1be..02e224f10cf0 100644 --- a/scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/transformers/InheritanceInformationTransformer.scala @@ -3,7 +3,7 @@ package transformers class InheritanceInformationTransformer(using DocContext) extends (Module => Module): override def apply(original: Module): Module = - val subtypes = getSupertypes(original.rootPackage).groupBy(_._1).transform((k, v) => v.map(_._2)) + val subtypes = getSupertypes(original.rootPackage).groupMap(_(0))(_(1)) original.updateMembers { m => val edges = getEdges(m.asLink.copy(kind = bareClasslikeKind(m.kind)), subtypes) val st: Seq[LinkToType] = edges.map(_._1).distinct From fb3089bbd5a8ead61065c32e372be2869fd3f6ca Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Wed, 20 Oct 2021 18:43:20 +0200 Subject: [PATCH 0757/1244] Remove Type#hasNonWildcard{LowerBound, UpperBound} These are no longer needed since we stopped storing wildcards in constraints (see dropWildcards in ConstraintHandling#addOneBound). --- compiler/src/dotty/tools/dotc/core/Types.scala | 14 -------------- .../src/dotty/tools/dotc/typer/Inferencing.scala | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 1d36efcb2a01..6650771963f9 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4615,20 +4615,6 @@ object Types { /** For uninstantiated type variables: Is the upper bound different from Any? */ def hasUpperBound(using Context): Boolean = !currentEntry.hiBound.isRef(defn.AnyClass) - /** For uninstantiated type variables: Is the lower bound different from Nothing and - * does it not contain wildcard types? - */ - def hasNonWildcardLowerBound(using Context): Boolean = - val lo = currentEntry.loBound - !lo.isExactlyNothing && !lo.containsWildcardTypes - - /** For uninstantiated type variables: Is the upper bound different from Any and - * does it not contain wildcard types? - */ - def hasNonWildcardUpperBound(using Context): Boolean = - val hi = currentEntry.hiBound - !hi.isRef(defn.AnyClass) && !hi.containsWildcardTypes - /** Unwrap to instance (if instantiated) or origin (if not), until result * is no longer a TypeVar */ diff --git a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala index 7654b98995ff..d0565857db91 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala @@ -179,9 +179,9 @@ object Inferencing { && { val direction = instDirection(tvar.origin) if minimizeSelected then - if direction <= 0 && tvar.hasNonWildcardLowerBound then + if direction <= 0 && tvar.hasLowerBound then instantiate(tvar, fromBelow = true) - else if direction >= 0 && tvar.hasNonWildcardUpperBound then + else if direction >= 0 && tvar.hasUpperBound then instantiate(tvar, fromBelow = false) // else hold off instantiating unbounded unconstrained variable else if direction != 0 then From 18df21c77d839c6c1b91146cb6c46377c1e46976 Mon Sep 17 00:00:00 2001 From: danicheg Date: Sun, 24 Oct 2021 15:51:40 +0300 Subject: [PATCH 0758/1244] Fix links to the migration guide --- library/src/scala/runtime/stdLibPatches/language.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/src/scala/runtime/stdLibPatches/language.scala b/library/src/scala/runtime/stdLibPatches/language.scala index d7084e8850d8..4a70bede8e8a 100644 --- a/library/src/scala/runtime/stdLibPatches/language.scala +++ b/library/src/scala/runtime/stdLibPatches/language.scala @@ -136,14 +136,14 @@ object language: /** Set source version to 3.0-migration. * - * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]] + * @see [[https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html]] */ @compileTimeOnly("`3.0-migration` can only be used at compile time in import statements") object `3.0-migration` /** Set source version to 3.0. * - * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]] + * @see [[https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html]] */ @compileTimeOnly("`3.0` can only be used at compile time in import statements") object `3.0` @@ -151,13 +151,13 @@ object language: /* This can be added when we go to 3.1 /** Set source version to 3.1-migration. * - * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]] + * @see [[https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html]] */ object `3.1-migration` /** Set source version to 3.1 * - * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]] + * @see [[https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html]] */ object `3.1` */ From 7cef26c63bf1dbddcd0b75b6de617c47da6759b9 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 25 Oct 2021 12:11:24 +0200 Subject: [PATCH 0759/1244] Fix error message when deriving an obstract type Fixes #13808 --- compiler/src/dotty/tools/dotc/typer/Deriving.scala | 5 ++++- tests/neg/i13808.check | 8 ++++++++ tests/neg/i13808.scala | 14 ++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 tests/neg/i13808.check create mode 100644 tests/neg/i13808.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Deriving.scala b/compiler/src/dotty/tools/dotc/typer/Deriving.scala index a8de83664001..39a775d61f8c 100644 --- a/compiler/src/dotty/tools/dotc/typer/Deriving.scala +++ b/compiler/src/dotty/tools/dotc/typer/Deriving.scala @@ -83,7 +83,10 @@ trait Deriving { */ private def processDerivedInstance(derived: untpd.Tree): Unit = { val originalTypeClassType = typedAheadType(derived, AnyTypeConstructorProto).tpe - val typeClassType = checkClassType(underlyingClassRef(originalTypeClassType), derived.srcPos, traitReq = false, stablePrefixReq = true) + val underlyingClassType = underlyingClassRef(originalTypeClassType) + val typeClassType = checkClassType( + underlyingClassType.orElse(originalTypeClassType), + derived.srcPos, traitReq = false, stablePrefixReq = true) val typeClass = typeClassType.classSymbol val typeClassParams = typeClass.typeParams val typeClassArity = typeClassParams.length diff --git a/tests/neg/i13808.check b/tests/neg/i13808.check new file mode 100644 index 000000000000..e9b55a5ddec2 --- /dev/null +++ b/tests/neg/i13808.check @@ -0,0 +1,8 @@ +-- Error: tests/neg/i13808.scala:13:37 --------------------------------------------------------------------------------- +13 |case class Boom[A](value: A) derives OpaqueType, Foo // error // error + | ^^^^^^^^^^ + | OpaqueTypes.OpaqueType is not a class type +-- Error: tests/neg/i13808.scala:13:49 --------------------------------------------------------------------------------- +13 |case class Boom[A](value: A) derives OpaqueType, Foo // error // error + | ^^^ + | FooModule.Foo is not a class type diff --git a/tests/neg/i13808.scala b/tests/neg/i13808.scala new file mode 100644 index 000000000000..6dd568c69423 --- /dev/null +++ b/tests/neg/i13808.scala @@ -0,0 +1,14 @@ +object OpaqueTypes: + opaque type OpaqueType[A] = List[A] + object OpaqueType: + def derived[A]: OpaqueType[A] = Nil + +object FooModule: + type Foo[A] + object Foo: + def derived[A]: Foo[A] = Nil.asInstanceOf[Foo[A]] + +import FooModule.Foo +import OpaqueTypes.OpaqueType +case class Boom[A](value: A) derives OpaqueType, Foo // error // error + From 5e7233fc3eee6efb8aa567e684d0507457f8cefa Mon Sep 17 00:00:00 2001 From: adampauls Date: Fri, 15 Oct 2021 16:49:30 -0700 Subject: [PATCH 0760/1244] Remove stateful enterSyms. More unused. --- .../src/dotty/tools/dotc/ast/Desugar.scala | 23 ------------------ .../dotty/tools/dotc/typer/TyperPhase.scala | 24 +++---------------- 2 files changed, 3 insertions(+), 44 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index a71fc3d40e92..b652a49c0381 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -1410,29 +1410,6 @@ object desugar { FunctionWithMods(params, body, Modifiers(mods)) } - /** Add annotation to tree: - * tree @fullName - * - * The annotation is usually represented as a TypeTree referring to the class - * with the given name `fullName`. However, if the annotation matches a file name - * that is still to be entered, the annotation is represented as a cascade of `Selects` - * following `fullName`. This is necessary so that we avoid reading an annotation from - * the classpath that is also compiled from source. - */ - def makeAnnotated(fullName: String, tree: Tree)(using Context): Annotated = { - val parts = fullName.split('.') - val ttree = typerPhase match { - case phase: TyperPhase if phase.stillToBeEntered(parts.last) => - val prefix = - parts.init.foldLeft(Ident(nme.ROOTPKG): Tree)((qual, name) => - Select(qual, name.toTermName)) - Select(prefix, parts.last.toTypeName) - case _ => - TypeTree(requiredClass(fullName).typeRef) - } - Annotated(tree, New(ttree, Nil)) - } - private def derivedValDef(original: Tree, named: NameTree, tpt: Tree, rhs: Tree, mods: Modifiers)(using Context) = { val vdef = ValDef(named.name.asTermName, tpt, rhs) .withMods(mods) diff --git a/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala b/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala index bb1bfbea28e5..a8a2ff95687a 100644 --- a/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala +++ b/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala @@ -31,15 +31,6 @@ class TyperPhase(addRootImports: Boolean = true) extends Phase { override def allowsImplicitSearch: Boolean = true - /** The contexts for compilation units that are parsed but not yet entered */ - private var remaining: List[Context] = Nil - - /** Does a source file ending with `.scala` belong to a compilation unit - * that is parsed but not yet entered? - */ - def stillToBeEntered(name: String): Boolean = - remaining.exists(_.compilationUnit.toString.endsWith(name + ".scala")) - // Run regardless of parsing errors override def isRunnable(implicit ctx: Context): Boolean = true @@ -68,13 +59,6 @@ class TyperPhase(addRootImports: Boolean = true) extends Phase { JavaChecks.check(unit.tpdTree) } - - private def firstTopLevelDef(trees: List[tpd.Tree])(using Context): Symbol = trees match - case PackageDef(_, defs) :: _ => firstTopLevelDef(defs) - case Import(_, _) :: defs => firstTopLevelDef(defs) - case (tree @ TypeDef(_, _)) :: _ => tree.symbol - case _ => NoSymbol - protected def discardAfterTyper(unit: CompilationUnit)(using Context): Boolean = unit.isJava || unit.suspended @@ -89,11 +73,9 @@ class TyperPhase(addRootImports: Boolean = true) extends Phase { else newCtx - remaining = unitContexts - while remaining.nonEmpty do - enterSyms(using remaining.head) - remaining = remaining.tail - val firstXmlPos = ctx.base.parserPhase match { + unitContexts.foreach(enterSyms(using _)) + + ctx.base.parserPhase match { case p: ParserPhase => if p.firstXmlPos.exists && !defn.ScalaXmlPackageClass.exists then report.error( From 5020797212e12d1f03fc13ff134c888b317b0070 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Mon, 25 Oct 2021 18:49:40 +0200 Subject: [PATCH 0761/1244] Add annotations to semanticdb Previously, it was not possible to find if a given method was for example annotated with @main, which will be useful for run/debug code lenses. Now, they should be correctly saved. The only issue seems to be `@specialized` which is currently producing empty type, anone knows what is going on? --- .../dotty/tools/dotc/semanticdb/PPrint.scala | 3 ++ .../dotty/tools/dotc/semanticdb/Scala3.scala | 5 +++ tests/semanticdb/metac.expect | 38 +++++++++---------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala b/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala index 2f1e2b760f1c..4361db3e50d6 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala @@ -35,6 +35,9 @@ class SymbolInformationPrinter (symtab: PrinterSymtab): case Reference, Definition def pprint(info: SymbolInformation): String = val sb = new StringBuilder() + val annotStr = info.annotations.map(pprint).mkString(" ") + if annotStr.nonEmpty then + sb.append(annotStr + " ") sb.append(accessString(info.access)) if info.isAbstract then sb.append("abstract ") if info.isFinal then sb.append("final ") diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala b/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala index c8d418f236c7..a99e7c191601 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala @@ -95,6 +95,10 @@ object Scala3: val kind = s.symbolKind(symkinds) val sname = sym.symbolName val signature = s.info.toSemanticSig(s) + val symbolAnnotations = s.annotations.collect{ + case annot if annot.symbol != defn.BodyAnnot && annot.symbol != defn.ChildAnnot => + Annotation(annot.symbol.typeRef.toSemanticType(annot.symbol)) + } SymbolInformation( symbol = sname, language = Language.SCALA, @@ -104,6 +108,7 @@ object Scala3: signature = signature, access = s.symbolAccess(kind), overriddenSymbols = s.overriddenSymbols, + annotations = symbolAnnotations ) case s: WildcardTypeSymbol => SymbolInformation( diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect index 44ddcf3cde8e..2c384c7d5f35 100644 --- a/tests/semanticdb/metac.expect +++ b/tests/semanticdb/metac.expect @@ -228,26 +228,26 @@ Occurrences => 48 entries Symbols: annot/Alias. => final object Alias extends Object { self: Alias.type => +2 decls } annot/Alias.A# => type A = ClassAnnotation @param -annot/Annotations# => class Annotations [typeparam T ] extends Object { self: AnyRef & Annotations[T] => +6 decls } -annot/Annotations#S# => type S -annot/Annotations#[T] => typeparam T -annot/Annotations#``(). => primary ctor [typeparam T ](param x: T): Annotations[T] -annot/Annotations#``().(x) => param x: T -annot/Annotations#field. => val method field Int -annot/Annotations#method(). => method method => Int -annot/Annotations#x. => private[this] val method x T +annot/Annotations# => @ClassAnnotation class Annotations [@TypeParameterAnnotation typeparam T ] extends Object { self: AnyRef & Annotations[T] => +6 decls } +annot/Annotations#S# => @TypeAnnotation type S +annot/Annotations#[T] => @TypeParameterAnnotation typeparam T +annot/Annotations#``(). => primary ctor [@TypeParameterAnnotation typeparam T ](@ParameterAnnotation param x: T): Annotations[T] +annot/Annotations#``().(x) => @ParameterAnnotation param x: T +annot/Annotations#field. => @FieldAnnotation val method field Int +annot/Annotations#method(). => @MethodAnnotation method method => Int +annot/Annotations#x. => @ParameterAnnotation private[this] val method x T annot/B# => class B extends Object { self: B => +3 decls } -annot/B#``(). => primary ctor (param x: Int): B +annot/B#``(). => @ConstructorAnnotation primary ctor (param x: Int): B annot/B#``().(x) => param x: Int -annot/B#``(+1). => ctor (): B +annot/B#``(+1). => @ConstructorAnnotation ctor (): B annot/B#x. => private[this] val method x Int -annot/M. => final object M extends Object { self: M.type => +1 decls } -annot/M.m(). => macro m [typeparam TT ]: Int +annot/M. => @ObjectAnnotation final object M extends Object { self: M.type => +1 decls } +annot/M.m(). => @MacroAnnotation macro m [typeparam TT ]: Int annot/M.m().[TT] => typeparam TT -annot/T# => trait T extends Object { self: T => +1 decls } +annot/T# => @TraitAnnotation trait T extends Object { self: T => +1 decls } annot/T#``(). => primary ctor (): T local0 => selfparam self: AnyRef -local1 => val local local: Int +local1 => @LocalAnnotation val local local: Int Occurrences: [0:8..0:13): annot <- annot/ @@ -4082,9 +4082,9 @@ flags/p/package.C#w(). => abstract method w => Int flags/p/package.C#x. => private[this] val method x T flags/p/package.C#y. => private[this] val method y U flags/p/package.C#z. => private[this] val method z V -flags/p/package.S# => class S [typeparam T ] extends Object { self: S[T] => +2 decls } -flags/p/package.S#[T] => typeparam T -flags/p/package.S#``(). => primary ctor [typeparam T ](): S[T] +flags/p/package.S# => class S [@specialized typeparam T ] extends Object { self: S[T] => +2 decls } +flags/p/package.S#[T] => @specialized typeparam T +flags/p/package.S#``(). => primary ctor [@specialized typeparam T ](): S[T] flags/p/package.T1# => type T1 = Int flags/p/package.T2# => type T2 [typeparam T ] = S[T] flags/p/package.T2#[T] => typeparam T @@ -4635,7 +4635,7 @@ Symbols: _empty_/MyProgram# => final class MyProgram extends Object { self: MyProgram => +2 decls } _empty_/readInts# => final class readInts extends Object { self: readInts => +2 decls } _empty_/toplevel$package. => final package object _empty_ extends Object { self: _empty_.type => +9 decls } -_empty_/toplevel$package.MyProgram(). => method MyProgram (param times: Int): Unit +_empty_/toplevel$package.MyProgram(). => @main method MyProgram (param times: Int): Unit _empty_/toplevel$package.MyProgram().(times) => param times: Int _empty_/toplevel$package.a. => val inline method a "" _empty_/toplevel$package.combine(). => method combine (param x: Int)(param y: Int): Int @@ -4648,7 +4648,7 @@ _empty_/toplevel$package.combine(+1).(z) => param z: Int _empty_/toplevel$package.combine(+2). => method combine => Int _empty_/toplevel$package.foo(). => method foo => String _empty_/toplevel$package.fooRef(). => method fooRef => String -_empty_/toplevel$package.readInts(). => method readInts (param ints: Int*): Unit +_empty_/toplevel$package.readInts(). => @main method readInts (param ints: Int*): Unit _empty_/toplevel$package.readInts().(ints) => param ints: Int* Occurrences: From b7c1f05b80f589db61f69dfe7837e61c8894011c Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Wed, 27 Oct 2021 11:58:50 +0200 Subject: [PATCH 0762/1244] Make sure annotation's type is fully represented in semanticdb --- .../dotty/tools/dotc/semanticdb/Scala3.scala | 2 +- .../expect/Annotations.expect.scala | 3 ++ tests/semanticdb/expect/Annotations.scala | 3 ++ tests/semanticdb/metac.expect | 37 +++++++++++-------- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala b/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala index a99e7c191601..686dc20e481b 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala @@ -97,7 +97,7 @@ object Scala3: val signature = s.info.toSemanticSig(s) val symbolAnnotations = s.annotations.collect{ case annot if annot.symbol != defn.BodyAnnot && annot.symbol != defn.ChildAnnot => - Annotation(annot.symbol.typeRef.toSemanticType(annot.symbol)) + Annotation(annot.tree.tpe.toSemanticType(annot.symbol)) } SymbolInformation( symbol = sname, diff --git a/tests/semanticdb/expect/Annotations.expect.scala b/tests/semanticdb/expect/Annotations.expect.scala index 14976ad8aa2f..2422839c8307 100644 --- a/tests/semanticdb/expect/Annotations.expect.scala +++ b/tests/semanticdb/expect/Annotations.expect.scala @@ -22,6 +22,9 @@ class Annotations/*<-annot::Annotations#*/[@TypeParameterAnnotation/*->com::java class B/*<-annot::B#*/ @ConstructorAnnotation/*->com::javacp::annot::ConstructorAnnotation#*/()(x/*<-annot::B#x.*/: Int/*->scala::Int#*/) { @ConstructorAnnotation/*->com::javacp::annot::ConstructorAnnotation#*/ def this/*<-annot::B#``(+1).*/() = this(42) + + @throws/*->scala::throws#*/[Exception/*->scala::package.Exception#*/] + def throwing/*<-annot::B#throwing().*/ = throw new Exception/*->scala::package.Exception#*/("") } @ObjectAnnotation/*->com::javacp::annot::ObjectAnnotation#*/ diff --git a/tests/semanticdb/expect/Annotations.scala b/tests/semanticdb/expect/Annotations.scala index 176ced6487e8..0556a2299b80 100644 --- a/tests/semanticdb/expect/Annotations.scala +++ b/tests/semanticdb/expect/Annotations.scala @@ -22,6 +22,9 @@ class Annotations[@TypeParameterAnnotation T](@ParameterAnnotation x: T) { self: class B @ConstructorAnnotation()(x: Int) { @ConstructorAnnotation def this() = this(42) + + @throws[Exception] + def throwing = throw new Exception("") } @ObjectAnnotation diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect index 2c384c7d5f35..07b3174b3d93 100644 --- a/tests/semanticdb/metac.expect +++ b/tests/semanticdb/metac.expect @@ -222,8 +222,8 @@ Schema => SemanticDB v4 Uri => Annotations.scala Text => empty Language => Scala -Symbols => 22 entries -Occurrences => 48 entries +Symbols => 23 entries +Occurrences => 52 entries Symbols: annot/Alias. => final object Alias extends Object { self: Alias.type => +2 decls } @@ -236,10 +236,11 @@ annot/Annotations#``().(x) => @ParameterAnnotation param x: T annot/Annotations#field. => @FieldAnnotation val method field Int annot/Annotations#method(). => @MethodAnnotation method method => Int annot/Annotations#x. => @ParameterAnnotation private[this] val method x T -annot/B# => class B extends Object { self: B => +3 decls } +annot/B# => class B extends Object { self: B => +4 decls } annot/B#``(). => @ConstructorAnnotation primary ctor (param x: Int): B annot/B#``().(x) => param x: Int annot/B#``(+1). => @ConstructorAnnotation ctor (): B +annot/B#throwing(). => @throws[Exception] method throwing => Nothing annot/B#x. => private[this] val method x Int annot/M. => @ObjectAnnotation final object M extends Object { self: M.type => +1 decls } annot/M.m(). => @MacroAnnotation macro m [typeparam TT ]: Int @@ -285,19 +286,23 @@ Occurrences: [21:36..21:39): Int -> scala/Int# [22:3..22:24): ConstructorAnnotation -> com/javacp/annot/ConstructorAnnotation# [23:6..23:10): <- annot/B#``(+1). -[26:1..26:17): ObjectAnnotation -> com/javacp/annot/ObjectAnnotation# -[27:7..27:8): M <- annot/M. -[28:3..28:18): MacroAnnotation -> com/javacp/annot/MacroAnnotation# -[29:6..29:7): m <- annot/M.m(). -[29:8..29:10): TT <- annot/M.m().[TT] -[29:13..29:16): Int -> scala/Int# -[29:25..29:28): ??? -> scala/Predef.`???`(). -[32:1..32:16): TraitAnnotation -> com/javacp/annot/TraitAnnotation# -[33:6..33:7): T <- annot/T# -[35:7..35:12): Alias <- annot/Alias. -[36:7..36:8): A <- annot/Alias.A# -[36:11..36:26): ClassAnnotation -> com/javacp/annot/ClassAnnotation# -[36:28..36:33): param -> scala/annotation/meta/param# +[25:3..25:9): throws -> scala/throws# +[25:10..25:19): Exception -> scala/package.Exception# +[26:6..26:14): throwing <- annot/B#throwing(). +[26:27..26:36): Exception -> scala/package.Exception# +[29:1..29:17): ObjectAnnotation -> com/javacp/annot/ObjectAnnotation# +[30:7..30:8): M <- annot/M. +[31:3..31:18): MacroAnnotation -> com/javacp/annot/MacroAnnotation# +[32:6..32:7): m <- annot/M.m(). +[32:8..32:10): TT <- annot/M.m().[TT] +[32:13..32:16): Int -> scala/Int# +[32:25..32:28): ??? -> scala/Predef.`???`(). +[35:1..35:16): TraitAnnotation -> com/javacp/annot/TraitAnnotation# +[36:6..36:7): T <- annot/T# +[38:7..38:12): Alias <- annot/Alias. +[39:7..39:8): A <- annot/Alias.A# +[39:11..39:26): ClassAnnotation -> com/javacp/annot/ClassAnnotation# +[39:28..39:33): param -> scala/annotation/meta/param# expect/Anonymous.scala ---------------------- From c54959a28f48d1ca9a2da8d20330a9391ec27ca8 Mon Sep 17 00:00:00 2001 From: Stephane MICHELOUD Date: Sun, 24 Oct 2021 22:24:15 +0200 Subject: [PATCH 0763/1244] small addendum to PR#13790 --- dist/bin/scaladoc.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat index 2a80916c1db7..17823d488e56 100644 --- a/dist/bin/scaladoc.bat +++ b/dist/bin/scaladoc.bat @@ -98,7 +98,7 @@ goto :eof @rem output parameter: _CLASS_PATH :classpathArgs -for /f %%f in ("%_PROG_HOME%\.") do set "_LIB_DIR=%%~dpflib" +for /f "delims=" %%f in ("%_PROG_HOME%\.") do set "_LIB_DIR=%%~dpflib" set _CLASS_PATH= @rem keep list in sync with bash script `bin\scaladoc` ! call :updateClasspath "scaladoc" From 5ccc54b1f6e8e75ccbd2ad301d84a1ae42d5d320 Mon Sep 17 00:00:00 2001 From: Kien Dang Date: Wed, 27 Oct 2021 00:31:36 +0800 Subject: [PATCH 0764/1244] No longer print VBAR in the middle of the message Co-authored-by: Tom Grigg --- .../src/dotty/tools/dotc/printing/Texts.scala | 12 +++++++----- .../dotty/tools/dotc/CompilationTests.scala | 1 + tests/neg-custom-args/i13026.check | 18 ++++++++++++++++++ tests/neg-custom-args/i13026.scala | 3 +++ 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 tests/neg-custom-args/i13026.check create mode 100644 tests/neg-custom-args/i13026.scala diff --git a/compiler/src/dotty/tools/dotc/printing/Texts.scala b/compiler/src/dotty/tools/dotc/printing/Texts.scala index 7df464ae74b8..9a3aac39ed18 100644 --- a/compiler/src/dotty/tools/dotc/printing/Texts.scala +++ b/compiler/src/dotty/tools/dotc/printing/Texts.scala @@ -106,11 +106,13 @@ object Texts { case Str(s, lines) => if (numberWidth != 0) { val ln = lines.show - val pad = (numberWidth - ln.length - 1) - assert(pad >= 0) - sb.append(" " * pad) - sb.append(ln) - sb.append("|") + if (ln.nonEmpty) { + val pad = (numberWidth - ln.length - 1) + assert(pad >= 0) + sb.append(" " * pad) + sb.append(ln) + sb.append("|") + } } sb.append(s) case _ => diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index a9e679eb6e95..a9f376d3cda6 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -182,6 +182,7 @@ class CompilationTests { compileFile("tests/neg-custom-args/i7314.scala", defaultOptions.and("-Xfatal-warnings", "-source", "future")), compileFile("tests/neg-custom-args/feature-shadowing.scala", defaultOptions.and("-Xfatal-warnings", "-feature")), compileDir("tests/neg-custom-args/hidden-type-errors", defaultOptions.and("-explain")), + compileFile("tests/neg-custom-args/i13026.scala", defaultOptions.and("-print-lines")), ).checkExpectedErrors() } diff --git a/tests/neg-custom-args/i13026.check b/tests/neg-custom-args/i13026.check new file mode 100644 index 000000000000..ec729f1968b1 --- /dev/null +++ b/tests/neg-custom-args/i13026.check @@ -0,0 +1,18 @@ +-- [E007] Type Mismatch Error: tests/neg-custom-args/i13026.scala:1:13 ------------------------------------------------- +1 |val x: Int = "not an int" // error + | ^^^^^^^^^^^^ + | Found: ("not an int" : String) + | Required: Int + +longer explanation available when compiling with `-explain` +-- [E007] Type Mismatch Error: tests/neg-custom-args/i13026.scala:2:13 ------------------------------------------------- +2 |val y: Int = "not an int" // error + | ^^^^^^^^^^^^ + | Found: ("not an int" : String) + | Required: Int + +longer explanation available when compiling with `-explain` +-- [E008] Not Found Error: tests/neg-custom-args/i13026.scala:3:20 ----------------------------------------------------- +3 |def foo(x: Any) = x.foo // error + | ^^^^^ + | value foo is not a member of Any diff --git a/tests/neg-custom-args/i13026.scala b/tests/neg-custom-args/i13026.scala new file mode 100644 index 000000000000..9ecf909f7122 --- /dev/null +++ b/tests/neg-custom-args/i13026.scala @@ -0,0 +1,3 @@ +val x: Int = "not an int" // error +val y: Int = "not an int" // error +def foo(x: Any) = x.foo // error From 35975432852a7b67ca3dc6d34feaaf3797549ee1 Mon Sep 17 00:00:00 2001 From: SDSR Date: Tue, 26 Oct 2021 19:07:49 +0200 Subject: [PATCH 0765/1244] solves dotc assertion error on (non-sensical?) parameter type. #13769 --- compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 3 +++ tests/neg/i13769.check | 10 ++++++++++ tests/neg/i13769.scala | 2 ++ 3 files changed, 15 insertions(+) create mode 100644 tests/neg/i13769.check create mode 100644 tests/neg/i13769.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 44e7145d2ee1..aff7218e662b 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -442,6 +442,9 @@ object Parsers { def convertToParam(tree: Tree, mods: Modifiers, expected: String = "formal parameter"): ValDef = tree match { case id @ Ident(name) => makeParameter(name.asTermName, TypeTree(), mods, isBackquoted = isBackquoted(id)).withSpan(tree.span) + case Typed(_, tpt: TypeBoundsTree) => + syntaxError(s"not a legal $expected", tree.span) + makeParameter(nme.ERROR, tree, mods) case Typed(id @ Ident(name), tpt) => makeParameter(name.asTermName, tpt, mods, isBackquoted = isBackquoted(id)).withSpan(tree.span) case Typed(Splice(Ident(name)), tpt) => diff --git a/tests/neg/i13769.check b/tests/neg/i13769.check new file mode 100644 index 000000000000..7785fbf4d198 --- /dev/null +++ b/tests/neg/i13769.check @@ -0,0 +1,10 @@ +-- Error: tests/neg/i13769.scala:2:18 ---------------------------------------------------------------------------------- +2 |val te = tup.map((x: _ <: Int) => List(x)) // error // error + | ^^^^^^^^^^^ + | not a legal formal parameter +-- [E006] Not Found Error: tests/neg/i13769.scala:2:39 ----------------------------------------------------------------- +2 |val te = tup.map((x: _ <: Int) => List(x)) // error // error + | ^ + | Not found: x + +longer explanation available when compiling with `-explain` \ No newline at end of file diff --git a/tests/neg/i13769.scala b/tests/neg/i13769.scala new file mode 100644 index 000000000000..67575e821334 --- /dev/null +++ b/tests/neg/i13769.scala @@ -0,0 +1,2 @@ +val tup = (1, "s") +val te = tup.map((x: _ <: Int) => List(x)) // error // error From 88e13ec1d37e5eabdc960bdb304c800988411b76 Mon Sep 17 00:00:00 2001 From: Denis Zolkin Date: Tue, 26 Oct 2021 18:32:55 +0200 Subject: [PATCH 0766/1244] Handles Nothing when synthesizing CanEqual fixes #13739 fixes #13512 --- .../dotty/tools/dotc/typer/Synthesizer.scala | 5 +- tests/pos/i13512.scala | 7 +++ tests/pos/i13739.scala | 46 +++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 tests/pos/i13512.scala create mode 100644 tests/pos/i13739.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala index 75e7c55ada28..2dd088d70671 100644 --- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala @@ -102,7 +102,8 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): def canComparePredefinedClasses(cls1: ClassSymbol, cls2: ClassSymbol): Boolean = def cmpWithBoxed(cls1: ClassSymbol, cls2: ClassSymbol) = - cls2 == defn.boxedType(cls1.typeRef).symbol + cls2 == defn.NothingClass + || cls2 == defn.boxedType(cls1.typeRef).symbol || cls1.isNumericValueClass && cls2.derivesFrom(defn.BoxedNumberClass) if cls1.isPrimitiveValueClass then @@ -129,7 +130,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): else if cls2 == defn.NullClass then cls1.derivesFrom(defn.ObjectClass) else - false + cls1 == defn.NothingClass || cls2 == defn.NothingClass end canComparePredefinedClasses /** Some simulated `CanEqual` instances for predefined types. It's more efficient diff --git a/tests/pos/i13512.scala b/tests/pos/i13512.scala new file mode 100644 index 000000000000..b400809d47b9 --- /dev/null +++ b/tests/pos/i13512.scala @@ -0,0 +1,7 @@ +import scala.language.strictEquality + +class NotEquatable + +def f = List(new NotEquatable) match + case Nil => ??? + case _ => diff --git a/tests/pos/i13739.scala b/tests/pos/i13739.scala new file mode 100644 index 000000000000..418e665f44e8 --- /dev/null +++ b/tests/pos/i13739.scala @@ -0,0 +1,46 @@ +import scala.language.strictEquality + +class Foo(i: Int) extends AnyVal + +val _ = summon[CanEqual[Nothing, Nothing]] + +val _ = summon[CanEqual[Int, Nothing]] +val _ = summon[CanEqual[Nothing, Int]] +val _ = summon[CanEqual[3, Nothing]] +val _ = summon[CanEqual[Nothing, 3]] + +val _ = summon[CanEqual[Byte, Nothing]] +val _ = summon[CanEqual[Nothing, Byte]] +val _ = summon[CanEqual[Short, Nothing]] +val _ = summon[CanEqual[Nothing, Short]] +val _ = summon[CanEqual[Float, Nothing]] +val _ = summon[CanEqual[Nothing, Float]] + +val _ = summon[CanEqual[Double, Nothing]] +val _ = summon[CanEqual[Nothing, Double]] +val _ = summon[CanEqual[3.0, Nothing]] +val _ = summon[CanEqual[Nothing, 3.0]] + +val _ = summon[CanEqual[String, Nothing]] +val _ = summon[CanEqual[Nothing, String]] +val _ = summon[CanEqual["foo", Nothing]] +val _ = summon[CanEqual[Nothing, "foo"]] + +val _ = summon[CanEqual[Char, Nothing]] +val _ = summon[CanEqual[Nothing, Char]] +val _ = summon[CanEqual['f', Nothing]] +val _ = summon[CanEqual[Nothing, 'f']] + +val _ = summon[CanEqual[Boolean, Nothing]] +val _ = summon[CanEqual[Nothing, Boolean]] +val _ = summon[CanEqual[true, Nothing]] +val _ = summon[CanEqual[Nothing, true]] + +val _ = summon[CanEqual[Foo, Nothing]] +val _ = summon[CanEqual[Nothing, Foo]] + +val _ = summon[CanEqual[Option[Int], None.type]] +val _ = summon[CanEqual[Option[Int], Option[Nothing]]] + +val _ = summon[CanEqual[Any & Nothing, Foo]] +val _ = summon[CanEqual[Nothing & Any, Foo]] From 6626c9c6ad2f3ce0392726184faf335452fb5040 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 26 Oct 2021 15:40:51 +0200 Subject: [PATCH 0767/1244] Add explanations to discussion of private[this] in docs Fixes #13770 Or more precisely: it explains the issue with reflection which has been observed in several projects. The issue with WeakReferences is so tricky/underspecified that I did not find a reasonable explanation. I fear people would be confused rather than enlightened. --- .../dropped-features/this-qualifier.md | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/docs/reference/dropped-features/this-qualifier.md b/docs/docs/reference/dropped-features/this-qualifier.md index 69906351ca67..baec0ae454f6 100644 --- a/docs/docs/reference/dropped-features/this-qualifier.md +++ b/docs/docs/reference/dropped-features/this-qualifier.md @@ -12,6 +12,26 @@ Previously, these modifiers were needed for - avoiding the generation of getters and setters - excluding code under a `private[this]` from variance checks. (Scala 2 also excludes `protected[this]` but this was found to be unsound and was therefore removed). + - avoiding the generation of fields, if a `private[this] val` is not accessed + by a class method. The compiler now infers for `private` members the fact that they are only accessed via `this`. Such members are treated as if they had been declared `private[this]`. `protected[this]` is dropped without a replacement. +This change can in some cases change the semantics of a Scala program, since a +`private` val is no longer guaranteed to generate a field. The field +is omitted if + + - the `val` is only accessed via `this`, and + - the `val` is not accessed from a method in the current class. + +This can cause problems if a program tries to access the missing private field via reflection. The recommended fix is to declare the field instead to be qualified private with the enclosing class as qualifier. Example: +```scala + class C(x: Int): + private[C] val field = x + 1 + // [C] needed if `field` is to be accessed through reflection + val retained = field * field +``` + + + + From 5fcb34b12569666ff7e3f88676be1828cbdf8841 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Wed, 27 Oct 2021 10:29:30 +0200 Subject: [PATCH 0768/1244] Add type class power macro regression test --- tests/pos-macros/power-macro-2/Macro_1.scala | 22 +++++++++++++++++ tests/pos-macros/power-macro-2/Test_2.scala | 2 ++ tests/pos-macros/power-macro-3/Macro_1.scala | 25 ++++++++++++++++++++ tests/pos-macros/power-macro-3/Test_2.scala | 2 ++ 4 files changed, 51 insertions(+) create mode 100644 tests/pos-macros/power-macro-2/Macro_1.scala create mode 100644 tests/pos-macros/power-macro-2/Test_2.scala create mode 100644 tests/pos-macros/power-macro-3/Macro_1.scala create mode 100644 tests/pos-macros/power-macro-3/Test_2.scala diff --git a/tests/pos-macros/power-macro-2/Macro_1.scala b/tests/pos-macros/power-macro-2/Macro_1.scala new file mode 100644 index 000000000000..57f7764f0969 --- /dev/null +++ b/tests/pos-macros/power-macro-2/Macro_1.scala @@ -0,0 +1,22 @@ + +import scala.quoted.* + +import math.Numeric.Implicits.infixNumericOps + +inline def power[Num](x: Num, inline n: Int)(using num: Numeric[Num]) = ${powerCode('x, 'n)(using 'num)} + +private def powerCode[Num: Type](x: Expr[Num], n: Expr[Int])(using Expr[Numeric[Num]])(using Quotes): Expr[Num] = + powerCode(x, n.valueOrAbort) + +private def powerCode[Num: Type](x: Expr[Num], n: Int)(using num: Expr[Numeric[Num]])(using Quotes): Expr[Num] = + if (n == 0) '{ $num.one } + else if (n % 2 == 0) '{ + given Numeric[Num] = $num + val y = $x * $x + ${ powerCode('y, n / 2) } + } + else '{ + given Numeric[Num] = $num + $x * ${powerCode(x, n - 1)} + } + diff --git a/tests/pos-macros/power-macro-2/Test_2.scala b/tests/pos-macros/power-macro-2/Test_2.scala new file mode 100644 index 000000000000..59644c3d51fb --- /dev/null +++ b/tests/pos-macros/power-macro-2/Test_2.scala @@ -0,0 +1,2 @@ +def test(x: Int) = power(x, 5) +def test(x: Double) = power(x, 5) diff --git a/tests/pos-macros/power-macro-3/Macro_1.scala b/tests/pos-macros/power-macro-3/Macro_1.scala new file mode 100644 index 000000000000..d8273c65faf8 --- /dev/null +++ b/tests/pos-macros/power-macro-3/Macro_1.scala @@ -0,0 +1,25 @@ + +import scala.quoted.* + +import math.Numeric.Implicits.infixNumericOps + +inline def power[Num](x: Num, inline n: Int)(using num: Numeric[Num]) = ${powerCode('x, 'n)(using 'num)} + +private def powerCode[Num: Type](x: Expr[Num], n: Expr[Int])(using Expr[Numeric[Num]])(using Quotes): Expr[Num] = + powerCode(x, n.valueOrAbort) + +private def powerCode[Num: Type](x: Expr[Num], n: Int)(using num: Expr[Numeric[Num]])(using Quotes): Expr[Num] = + if (n == 0) '{ $num.one } + else if (n % 2 == 0) '{ + withGiven($num) { + val y = $x * $x + ${ powerCode('y, n / 2) } + } + } + else '{ + withGiven($num) { + $x * ${powerCode(x, n - 1)} + } + } + +inline def withGiven[U, T](inline x: T)(inline body: T ?=> U): U = body(using x) diff --git a/tests/pos-macros/power-macro-3/Test_2.scala b/tests/pos-macros/power-macro-3/Test_2.scala new file mode 100644 index 000000000000..59644c3d51fb --- /dev/null +++ b/tests/pos-macros/power-macro-3/Test_2.scala @@ -0,0 +1,2 @@ +def test(x: Int) = power(x, 5) +def test(x: Double) = power(x, 5) From c489efe887c1b180dd76b6bac0d681d970d6b65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 26 Oct 2021 10:37:40 +0200 Subject: [PATCH 0769/1244] Scaladoc: Fix locations of members with slashes --- .../externalLocations/externalStubs.scala | 5 +++++ .../tests/externalLocations/scaladoc2.scala | 6 +++++- .../tests/externalLocations/scaladoc3.scala | 6 +++++- .../src/tests/slashMembers.scala | 8 ++++++++ .../tools/scaladoc/renderers/Locations.scala | 1 + .../dotty/tools/scaladoc/tasty/SymOps.scala | 2 +- .../src/dotty/tools/scaladoc/util/escape.scala | 9 ++++++++- ...ternalLocationProviderIntegrationTest.scala | 18 ++++++++++++++---- 8 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 scaladoc-testcases/src/tests/externalLocations/externalStubs.scala create mode 100644 scaladoc-testcases/src/tests/slashMembers.scala diff --git a/scaladoc-testcases/src/tests/externalLocations/externalStubs.scala b/scaladoc-testcases/src/tests/externalLocations/externalStubs.scala new file mode 100644 index 000000000000..01eb2fbc3a3f --- /dev/null +++ b/scaladoc-testcases/src/tests/externalLocations/externalStubs.scala @@ -0,0 +1,5 @@ +package tests.externalStubs + +trait \/ + +trait /\ \ No newline at end of file diff --git a/scaladoc-testcases/src/tests/externalLocations/scaladoc2.scala b/scaladoc-testcases/src/tests/externalLocations/scaladoc2.scala index b7d024ff5eb4..3319b1ab4e90 100644 --- a/scaladoc-testcases/src/tests/externalLocations/scaladoc2.scala +++ b/scaladoc-testcases/src/tests/externalLocations/scaladoc2.scala @@ -1,6 +1,8 @@ -package tests.externalScaladoc2 +package tests +package externalScaladoc2 import scala.util.matching.* +import externalStubs._ class Test { def a: String = ??? @@ -10,5 +12,7 @@ class Test { def c: Regex.Match = ??? } +class Test2 extends \/ with /\ + abstract class MySeq[T] extends scala.collection.immutable.Seq[T] diff --git a/scaladoc-testcases/src/tests/externalLocations/scaladoc3.scala b/scaladoc-testcases/src/tests/externalLocations/scaladoc3.scala index 590c19ffaa6c..0eb8c7318d75 100644 --- a/scaladoc-testcases/src/tests/externalLocations/scaladoc3.scala +++ b/scaladoc-testcases/src/tests/externalLocations/scaladoc3.scala @@ -1,6 +1,8 @@ -package tests.externalScaladoc3 +package tests +package externalScaladoc3 import scala.util.matching.* +import externalStubs._ class Test { def a: String = ??? @@ -10,3 +12,5 @@ class Test { def c: Regex.Match = ??? } +class Test2 extends \/ with /\ + diff --git a/scaladoc-testcases/src/tests/slashMembers.scala b/scaladoc-testcases/src/tests/slashMembers.scala new file mode 100644 index 000000000000..f13e36f82aae --- /dev/null +++ b/scaladoc-testcases/src/tests/slashMembers.scala @@ -0,0 +1,8 @@ +package tests +package slashMembers + +class A + +trait \/ + +trait /\ \ No newline at end of file diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala index 81baf34b778e..bcdaa2bb5a5a 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala @@ -13,6 +13,7 @@ import java.nio.file.Path import java.nio.file.Files import java.io.File import scala.util.matching._ +import dotty.tools.scaladoc.util.Escape._ val UnresolvedLocationLink = "#" diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala index fbccedf9a7eb..5a245a3301f4 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala @@ -261,7 +261,7 @@ class SymOpsWithLinkCache: else (sym.className, sym.anchor) - val location = sym.packageNameSplitted ++ className + val location = (sym.packageNameSplitted ++ className).map(escapeFilename(_)) val externalLink = { import reflect._ diff --git a/scaladoc/src/dotty/tools/scaladoc/util/escape.scala b/scaladoc/src/dotty/tools/scaladoc/util/escape.scala index 66035e76ca98..686d384337c1 100644 --- a/scaladoc/src/dotty/tools/scaladoc/util/escape.scala +++ b/scaladoc/src/dotty/tools/scaladoc/util/escape.scala @@ -1,4 +1,11 @@ package dotty.tools.scaladoc.util object Escape: - def escapeUrl(url: String) = url.replace("#","%23") \ No newline at end of file + def escapeUrl(url: String) = url + .replace("#","%23") + + def escapeFilename(filename: String) = + val escaped = filename + .replace("/", "$div") + .replace("\\", "$bslash") + if escaped != filename then escaped + "$" else escaped diff --git a/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala b/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala index 2ca6f28ffd27..4f4f8c972b4e 100644 --- a/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala @@ -25,23 +25,33 @@ class JavadocExternalLocationProviderIntegrationTest extends ExternalLocationPro class Scaladoc2ExternalLocationProviderIntegrationTest extends ExternalLocationProviderIntegrationTest( "externalScaladoc2", - List(".*scala.*::scaladoc2::https://www.scala-lang.org/api/current/"), + List( + ".*scala/.*::scaladoc2::https://www.scala-lang.org/api/current/", + ".*externalStubs.*::scaladoc2::https://external.stubs/api/" + ), List( "https://www.scala-lang.org/api/current/scala/util/matching/Regex$$Match.html", "https://www.scala-lang.org/api/current/scala/Predef$.html#String", "https://www.scala-lang.org/api/current/scala/collection/immutable/Map.html", "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):StringBuilder", - "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#mkString(start:String,sep:String,end:String):String" + "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#mkString(start:String,sep:String,end:String):String", + "https://external.stubs/api/tests/externalStubs/$div$bslash$.html", + "https://external.stubs/api/tests/externalStubs/$bslash$div$.html" ) ) class Scaladoc3ExternalLocationProviderIntegrationTest extends ExternalLocationProviderIntegrationTest( "externalScaladoc3", - List(".*scala.*::scaladoc3::https://dotty.epfl.ch/api/"), + List( + ".*scala/.*::scaladoc3::https://dotty.epfl.ch/api/", + ".*externalStubs.*::scaladoc3::https://external.stubs/api/" + ), List( "https://dotty.epfl.ch/api/scala/collection/immutable/Map.html", "https://dotty.epfl.ch/api/scala/Predef$.html#String-0", - "https://dotty.epfl.ch/api/scala/util/matching/Regex$$Match.html" + "https://dotty.epfl.ch/api/scala/util/matching/Regex$$Match.html", + "https://external.stubs/api/tests/externalStubs/$div$bslash$.html", + "https://external.stubs/api/tests/externalStubs/$bslash$div$.html" ) ) From d229f5d225b7324d13a9f50b5272144361d3642c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 26 Oct 2021 16:43:00 +0200 Subject: [PATCH 0770/1244] Scaladoc: Fix given signatures --- .../src/tests/givenSignatures.scala | 10 ++- .../src/tests/inheritedMembers1.scala | 6 +- scaladoc/src/dotty/tools/scaladoc/api.scala | 2 +- .../scaladoc/tasty/ClassLikeSupport.scala | 64 ++++--------------- .../tools/scaladoc/tasty/NameNormalizer.scala | 16 ++--- .../dotty/tools/scaladoc/tasty/SymOps.scala | 2 - .../tools/scaladoc/tasty/TypesSupport.scala | 2 +- .../translators/ScalaSignatureProvider.scala | 18 +++++- .../scaladoc/signatures/SignatureTest.scala | 26 ++++---- 9 files changed, 65 insertions(+), 81 deletions(-) diff --git a/scaladoc-testcases/src/tests/givenSignatures.scala b/scaladoc-testcases/src/tests/givenSignatures.scala index a1143e908da9..ff447ffc4553 100644 --- a/scaladoc-testcases/src/tests/givenSignatures.scala +++ b/scaladoc-testcases/src/tests/givenSignatures.scala @@ -4,9 +4,9 @@ package givenSignatures object Obj -given Seq[String] = Nil +given Seq[String] = Nil //expected: given given_Seq_String: Seq[String] -given GivenType = GivenType() +given GivenType = GivenType() //expected: given given_GivenType: GivenType class GivenType @@ -14,3 +14,9 @@ trait Ord[T] given listOrd[T](using ord: Ord[T]): Ord[List[T]] = ??? + +trait Foo[A] + +given listOrd: Foo[String] with { val i: Int = 1 } //expected: given listOrd: listOrd.type + +trait Placeholder //expected: object listOrd extends Foo[String] diff --git a/scaladoc-testcases/src/tests/inheritedMembers1.scala b/scaladoc-testcases/src/tests/inheritedMembers1.scala index 6a86c523bd19..d8fa44607e5e 100644 --- a/scaladoc-testcases/src/tests/inheritedMembers1.scala +++ b/scaladoc-testcases/src/tests/inheritedMembers1.scala @@ -10,7 +10,11 @@ class A = ??? object X trait Z - given B with {} + given B with { val x = 1 }//expected: given given_B: given_B.type + trait Placeholder//expected: object given_B extends B + + object Y extends Z + type I = Int /*<-*/extension (a: A) /*->*/def extension: String = ??? diff --git a/scaladoc/src/dotty/tools/scaladoc/api.scala b/scaladoc/src/dotty/tools/scaladoc/api.scala index fbe0f455c794..f7285a9da6ec 100644 --- a/scaladoc/src/dotty/tools/scaladoc/api.scala +++ b/scaladoc/src/dotty/tools/scaladoc/api.scala @@ -67,7 +67,7 @@ enum Kind(val name: String): case Exported(m: Kind.Def) extends Kind("export") case Type(concreate: Boolean, opaque: Boolean, typeParams: Seq[TypeParameter]) extends Kind("type") // should we handle opaque as modifier? - case Given(kind: Def | Class, as: Option[Signature], conversion: Option[ImplicitConversion]) + case Given(kind: Def | Class | Val.type, as: Option[Signature], conversion: Option[ImplicitConversion]) extends Kind("given") with ImplicitConversionProvider case Implicit(kind: Kind.Def | Kind.Val.type, conversion: Option[ImplicitConversion]) extends Kind(kind.name) with ImplicitConversionProvider diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala index de3cb429922b..d64aa8d67874 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala @@ -97,15 +97,16 @@ trait ClassLikeSupport: val baseMember = mkMember(classDef.symbol, kindForClasslike(classDef), selfSignature)( modifiers = modifiers, graph = graph, - deprecated = classDef.symbol.isDeprecated() + deprecated = classDef.symbol.isDeprecated(), + ).copy( + directParents = classDef.getParentsAsLinkToTypes, + parents = supertypes, ) if summon[DocContext].args.generateInkuire then doInkuireStuff(classDef) if signatureOnly then baseMember else baseMember.copy( members = classDef.extractPatchedMembers.sortBy(m => (m.name, m.kind.name)), - directParents = classDef.getParentsAsLinkToTypes, - parents = supertypes, selfType = selfType, companion = classDef.getCompanion ) @@ -144,15 +145,6 @@ trait ClassLikeSupport: ) parseMethod(c, dd.symbol,specificKind = Kind.Extension(target, _)) } - // TODO check given methods? - case dd: DefDef if !dd.symbol.isHiddenByVisibility && dd.symbol.isGiven && !dd.symbol.isArtifact => - Some(dd.symbol.owner.typeMember(dd.name)) - .filterNot(_.exists) - .map { _ => - parseMethod(c, dd.symbol, specificKind = - Kind.Given(_, getGivenInstance(dd), None) - ) - } case dd: DefDef if !dd.symbol.isHiddenByVisibility && dd.symbol.isExported && !dd.symbol.isArtifact => val exportedTarget = dd.rhs.collect { @@ -171,58 +163,25 @@ trait ClassLikeSupport: Some(parseMethod(c, dd.symbol, specificKind = Kind.Exported(_)) .withOrigin(Origin.ExportedFrom(s"$instanceName.$functionName", dri))) - case dd: DefDef if !dd.symbol.isHiddenByVisibility && !dd.symbol.isGiven && !dd.symbol.isSyntheticFunc && !dd.symbol.isExtensionMethod && !dd.symbol.isArtifact => + case dd: DefDef if !dd.symbol.isHiddenByVisibility && !dd.symbol.isSyntheticFunc && !dd.symbol.isExtensionMethod && !dd.symbol.isArtifact => Some(parseMethod(c, dd.symbol)) case td: TypeDef if !td.symbol.flags.is(Flags.Synthetic) && (!td.symbol.flags.is(Flags.Case) || !td.symbol.flags.is(Flags.Enum)) => Some(parseTypeDef(td)) - case vd: ValDef if !isSyntheticField(vd.symbol) - && (!vd.symbol.flags.is(Flags.Case) || !vd.symbol.flags.is(Flags.Enum)) - && vd.symbol.isGiven => - val classDef = Some(vd.tpt.tpe).flatMap(_.classSymbol.map(_.tree.asInstanceOf[ClassDef])) - Some(classDef.filter(_.symbol.flags.is(Flags.Module)).fold[Member](parseValDef(c, vd))(parseGivenClasslike(_))) - case vd: ValDef if !isSyntheticField(vd.symbol) && (!vd.symbol.flags.is(Flags.Case) || !vd.symbol.flags.is(Flags.Enum)) => Some(parseValDef(c, vd)) - case c: ClassDef if c.symbol.owner.methodMember(c.name).exists(_.flags.is(Flags.Given)) => - Some(parseGivenClasslike(c)) - - case c: ClassDef if c.symbol.shouldDocumentClasslike && !c.symbol.isGiven => + case c: ClassDef if c.symbol.shouldDocumentClasslike => Some(parseClasslike(c)) case _ => None } - private def parseGivenClasslike(c: ClassDef): Member = { - val parsedClasslike = parseClasslike(c) - - val parentTpe = c.parents(0) match { - case t: TypeTree => Some(t.tpe) - case t: Term => Some(t.tpe) - case _ => None - } - - val givenParents = parsedClasslike.directParents.headOption - val cls: Kind.Class = parsedClasslike.kind match - case Kind.Object => Kind.Class(Nil, Nil) - case Kind.Trait(tps, args) => Kind.Class(tps, args) - case cls: Kind.Class => cls - case other => - report.warning("Unrecoginzed kind for given: $other", c.pos) - Kind.Class(Nil, Nil) - - parsedClasslike.withKind( - Kind.Given(cls, givenParents.map(_.signature), parentTpe.flatMap(extractImplicitConversion)) - ) - } - private def parseInheritedMember(c: ClassDef)(s: Tree): Option[Member] = def inheritance = Some(InheritedFrom(s.symbol.owner.normalizedName, s.symbol.dri)) processTreeOpt(s)(s match - case c: ClassDef if c.symbol.shouldDocumentClasslike && !c.symbol.isGiven => Some(parseClasslike(c, signatureOnly = true)) - case c: ClassDef if c.symbol.owner.methodMember(c.name).exists(_.flags.is(Flags.Given)) => Some(parseGivenClasslike(c)) + case c: ClassDef if c.symbol.shouldDocumentClasslike => Some(parseClasslike(c, signatureOnly = true)) case other => { val parsed = parseMember(c)(other) parsed.map(p => @@ -395,6 +354,7 @@ trait ClassLikeSupport: )) case _ => Kind.Implicit(basicKind, None) + else if methodSymbol.flags.is(Flags.Given) then Kind.Given(basicKind, Some(method.returnTpt.tpe.asSignature), extractImplicitConversion(method.returnTpt.tpe)) else specificKind(basicKind) val origin = if !methodSymbol.isOverridden then Origin.RegularlyDefined else @@ -466,10 +426,10 @@ trait ClassLikeSupport: def parseValDef(c: ClassDef, valDef: ValDef): Member = def defaultKind = if valDef.symbol.flags.is(Flags.Mutable) then Kind.Var else Kind.Val val memberInfo = unwrapMemberInfo(c, valDef.symbol) - val kind = if valDef.symbol.flags.is(Flags.Implicit) then - Kind.Implicit(Kind.Val, extractImplicitConversion(valDef.tpt.tpe)) - else if valDef.symbol.flags.is(Flags.Enum) then Kind.EnumCase(Kind.Val) - else defaultKind + val kind = if valDef.symbol.flags.is(Flags.Implicit) then Kind.Implicit(Kind.Val, extractImplicitConversion(valDef.tpt.tpe)) + else if valDef.symbol.flags.is(Flags.Given) then Kind.Given(Kind.Val, Some(memberInfo.res.asSignature), extractImplicitConversion(valDef.tpt.tpe)) + else if valDef.symbol.flags.is(Flags.Enum) then Kind.EnumCase(Kind.Val) + else defaultKind mkMember(valDef.symbol, kind, memberInfo.res.asSignature)(deprecated = valDef.symbol.isDeprecated()) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala index 6ba4e3f3ff36..687ad6ecbf44 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala @@ -9,14 +9,14 @@ import SymOps._ object NameNormalizer { - extension (using Quotes)(s: reflect.Symbol) def normalizedName: String = { - import reflect.* - val withoutGivenPrefix = if s.isGiven then s.name.stripPrefix("given_") else s.name - val withoutObjectSuffix = if s.flags.is(Flags.Module) then withoutGivenPrefix.stripSuffix("$") else withoutGivenPrefix - val constructorNormalizedName = if s.isClassConstructor then "this" else withoutObjectSuffix - val escaped = escapedName(constructorNormalizedName) - escaped - } + extension (using Quotes)(s: reflect.Symbol) + def normalizedName: String = { + import reflect.* + val withoutObjectSuffix = if s.flags.is(Flags.Module) then s.name.stripSuffix("$") else s.name + val constructorNormalizedName = if s.isClassConstructor then "this" else withoutObjectSuffix + val escaped = escapedName(constructorNormalizedName) + escaped + } private val ignoredKeywords: Set[String] = Set("this") diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala index 5a245a3301f4..6e80c164d1d9 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala @@ -115,7 +115,6 @@ object SymOps: !sym.isHiddenByVisibility && !sym.flags.is(Flags.Synthetic) && (!sym.flags.is(Flags.Case) || !sym.flags.is(Flags.Enum)) - && !(sym.companionModule.flags.is(Flags.Given)) def getCompanionSymbol: Option[reflect.Symbol] = Some(sym.companionClass).filter(_.exists) @@ -249,7 +248,6 @@ class SymOpsWithLinkCache: def dri(using dctx: DocContext): DRI = import reflect.* if sym == Symbol.noSymbol then topLevelDri - else if sym.isValDef && sym.moduleClass.exists then sym.moduleClass.dri else val method = if (sym.isDefDef) Some(sym) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala index d4907138c233..147b5c40d21b 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala @@ -61,7 +61,7 @@ trait TypesSupport: extension (on: SignaturePart) def l: List[SignaturePart] = List(on) private def tpe(using Quotes)(symbol: reflect.Symbol): SSignature = - val suffix = if symbol.isValDef then plain(".type").l else Nil + val suffix = if symbol.isValDef || symbol.flags.is(reflect.Flags.Module) then plain(".type").l else Nil dotty.tools.scaladoc.Type(symbol.normalizedName, Some(symbol.dri)) :: suffix private def commas(lists: List[SSignature]) = lists match diff --git a/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala index 8bd0a571b7d7..d8f80f332b6d 100644 --- a/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala +++ b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala @@ -22,6 +22,8 @@ object ScalaSignatureProvider: givenClassSignature(documentable, cls, builder) case Kind.Given(d: Kind.Def, _, _) => givenMethodSignature(documentable, d, builder) + case Kind.Given(Kind.Val, _, _) => + givenValSignature(documentable, builder) case cls: Kind.Class => classSignature(documentable, cls, builder) case enm: Kind.Enum => @@ -129,10 +131,24 @@ object ScalaSignatureProvider: case Kind.Given(_, Some(instance), _) => builder.keyword("given ") .name(method.name, method.dri) + .generics(body.typeParams) + .functionParameters(body.argsLists) .plain(": ") .signature(instance) case _ => - builder.keyword("given ").name(method.name, method.dri) + builder.keyword("given ") + .name(method.name, method.dri) + .generics(body.typeParams) + .functionParameters(body.argsLists) + + private def givenValSignature(field: Member, builder: SignatureBuilder): SignatureBuilder = field.kind match + case Kind.Given(_, Some(instance), _) => + builder.keyword("given ") + .name(field.name, field.dri) + .plain(": ") + .signature(instance) + case _ => + builder.keyword("given ").name(field.name, field.dri) private def methodSignature(method: Member, cls: Kind.Def, builder: SignatureBuilder): SignatureBuilder = val bdr = builder diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/SignatureTest.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/SignatureTest.scala index ebd53db8c77e..4d8a9f46f21e 100644 --- a/scaladoc/test/dotty/tools/scaladoc/signatures/SignatureTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/signatures/SignatureTest.scala @@ -91,18 +91,18 @@ abstract class SignatureTest( private def signaturesFromSources(source: Source, kinds: Seq[String]): Seq[SignatureRes] = source.getLines.map(_.trim) - .filterNot(_.isEmpty) - .filterNot(_.startWithAnyOfThese("=",":","{","}", "//")) - .toSeq - .flatMap { - case unexpectedRegex(signature) => findName(signature, kinds).map(Unexpected(_)) - case expectedRegex(signature) => findName(signature, kinds).map(Expected(_, signature)) - case signature => - findName(signature, kinds).map( - Expected(_, commentRegex.replaceAllIn(signature, "") - .compactWhitespaces.reverse.dropWhile(List('{', ':').contains(_)).reverse) - ) - } + .filterNot(_.isEmpty) + .filterNot(_.startWithAnyOfThese("=",":","{","}", "//")) + .toSeq + .flatMap { + case unexpectedRegex(signature) => findName(signature, kinds).map(Unexpected(_)) + case expectedRegex(signature) => findName(signature, kinds).map(Expected(_, signature)) + case signature => + findName(signature, kinds).map( + Expected(_, commentRegex.replaceAllIn(signature, "") + .compactWhitespaces.reverse.dropWhile(List('{', ':').contains(_)).reverse) + ) + } private def signaturesFromDocumentation()(using DocContext): Seq[String] = val output = summon[DocContext].args.output.toPath @@ -129,6 +129,6 @@ abstract class SignatureTest( object SignatureTest { val classlikeKinds = Seq("class", "object", "trait", "enum") // TODO add docs for packages - val members = Seq("type", "def", "val", "var") + val members = Seq("type", "def", "val", "var", "given") val all = classlikeKinds ++ members } From b9e8a99ba692a8e1950394e452b5fc34356affe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 26 Oct 2021 18:09:15 +0200 Subject: [PATCH 0771/1244] Scaladoc: Update list of unsupported settings --- scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala index 4697783de20c..e6e32ec475d5 100644 --- a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala +++ b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala @@ -18,12 +18,8 @@ import dotty.tools.dotc.core.Contexts._ class ScaladocSettings extends SettingGroup with AllScalaSettings: val unsupportedSettings = Seq( - // Options that we like to support - extdirs, javabootclasspath, encoding, // Needed for plugin architecture - plugin,disable,require, pluginsDir, pluginOptions, - // we need support for sourcepath and sourceroot - sourcepath, sourceroot + plugin, disable, require, pluginsDir, pluginOptions, ) From 78db40aa7c2d337df4438c126a40c80879a605b1 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Wed, 27 Oct 2021 16:46:19 +0200 Subject: [PATCH 0772/1244] Navigate the AST within AnnotatedType and ImportType Related to https://github.com/lampepfl/dotty/issues/13624 --- .../dotty/tools/dotc/ast/NavigateAST.scala | 23 ++++++++++++++++++- .../tools/languageserver/CompletionTest.scala | 19 ++++++++++++++- .../tools/languageserver/HoverTest.scala | 8 +++++-- 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala index ffc7d04faa52..61561d5eaa24 100644 --- a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala +++ b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala @@ -5,6 +5,10 @@ import core.Contexts._ import core.Decorators._ import util.Spans._ import Trees.{MemberDef, DefTree, WithLazyField} +import dotty.tools.dotc.core.Annotations.ConcreteAnnotation +import dotty.tools.dotc.core.Types.AnnotatedType +import dotty.tools.dotc.core.Types.ImportType +import dotty.tools.dotc.core.Types.Type /** Utility functions to go from typed to untyped ASTs */ // TODO: Handle trees with mixed source files @@ -86,6 +90,18 @@ object NavigateAST { } bestFit } + /* + * Annotations trees are located in the Type + */ + def unpackAnnotations(t: Type, path: List[Positioned]): List[Positioned] = + t match { + case ann: AnnotatedType => + unpackAnnotations(ann.parent, childPath(ann.annot.tree.productIterator, path)) + case imp: ImportType => + childPath(imp.expr.productIterator, path) + case other => + path + } def singlePath(p: Positioned, path: List[Positioned]): List[Positioned] = if (p.span.exists && !(skipZeroExtent && p.span.isZeroExtent) && p.span.contains(span)) { // FIXME: We shouldn't be manually forcing trees here, we should replace @@ -98,7 +114,12 @@ object NavigateAST { } childPath(p.productIterator, p :: path) } - else path + else { + p match { + case t: untpd.TypeTree => unpackAnnotations(t.typeOpt, path) + case _ => path + } + } singlePath(from, Nil) } } diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala index 7e71c0a4c2b1..26b5d51993b9 100644 --- a/language-server/test/dotty/tools/languageserver/CompletionTest.scala +++ b/language-server/test/dotty/tools/languageserver/CompletionTest.scala @@ -895,4 +895,21 @@ class CompletionTest { @Test def i12465_hkt_alias: Unit = code"""???.asInstanceOf[Seq].${m1}""".withSource .completion(m1, Set()) -} + + @Test def i13624_annotType: Unit = + code"""|class MyAnnotation extends annotation.StaticAnnotation + |val x = 1: @MyAnnot${m1} + |type X = Int @MyAnnot${m2}""".withSource + .completion( + m1, + Set( + ("MyAnnotation", Class, "MyAnnotation"), + ("MyAnnotation", Module, "MyAnnotation") + ) + ).completion( + m2, + Set( + ("MyAnnotation", Class, "MyAnnotation"), + ("MyAnnotation", Module, "MyAnnotation") + ) + )} diff --git a/language-server/test/dotty/tools/languageserver/HoverTest.scala b/language-server/test/dotty/tools/languageserver/HoverTest.scala index 54d3271f2565..4309b0aeeea0 100644 --- a/language-server/test/dotty/tools/languageserver/HoverTest.scala +++ b/language-server/test/dotty/tools/languageserver/HoverTest.scala @@ -177,7 +177,7 @@ class HoverTest { @Test def i4678: Unit = { code"""class Foo { - | val x: Int = (${m1}1:${m2} ${m3}@annot1 @annot2 @annot3 @annot4 @annot5${m4}) + | val x: Int = (${m1}1:${m2} ${m3}@annot1${m4} ${m5}@annot2${m6} ${m7}@annot3${m8} ${m9}@annot4${m10} ${m11}@annot5${m12}) |} |class annot1 extends scala.annotation.Annotation |class annot2 extends scala.annotation.Annotation @@ -186,7 +186,11 @@ class HoverTest { |class annot5 extends scala.annotation.Annotation |""".withSource .hover(m1 to m2, hoverContent("(1 : Int)")) - .hover(m3 to m4, hoverContent("(1 : Int) @annot1 @annot2 @annot3 @annot4 @annot5")) + .hover(m3 to m4, hoverContent("annot1")) + .hover(m5 to m6, hoverContent("annot2")) + .hover(m7 to m8, hoverContent("annot3")) + .hover(m9 to m10, hoverContent("annot4")) + .hover(m11 to m12, hoverContent("annot5")) } @Test def unicodeChar: Unit = { From 81e876a6056e4d829550f975cd6d0880c81381b8 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Thu, 28 Oct 2021 18:54:07 +0200 Subject: [PATCH 0773/1244] Add additional test for annotation completions --- .../tools/languageserver/CompletionTest.scala | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala index 26b5d51993b9..1dd9516de7d1 100644 --- a/language-server/test/dotty/tools/languageserver/CompletionTest.scala +++ b/language-server/test/dotty/tools/languageserver/CompletionTest.scala @@ -897,9 +897,18 @@ class CompletionTest { .completion(m1, Set()) @Test def i13624_annotType: Unit = - code"""|class MyAnnotation extends annotation.StaticAnnotation + code"""|object Foo{ + | class MyAnnotation extends annotation.StaticAnnotation + |} + |class MyAnnotation extends annotation.StaticAnnotation + |class Annotation2(a: String) extends annotation.StaticAnnotation |val x = 1: @MyAnnot${m1} - |type X = Int @MyAnnot${m2}""".withSource + |type X = Int @MyAnnot${m2} + |val y = 1: @Foo.MyAnnot${m3} + |val z = 1: @Foo.MyAnnotation @MyAnno${m4} + |type Y = Int @MyAnnotation @Foo.MyAnnota${m5} + |val w = 1: @Annotation2("abc": @Foo.MyAnnot${m6}) + |""".withSource .completion( m1, Set( @@ -912,4 +921,29 @@ class CompletionTest { ("MyAnnotation", Class, "MyAnnotation"), ("MyAnnotation", Module, "MyAnnotation") ) - )} + ).completion( + m3, + Set( + ("MyAnnotation", Class, "Foo.MyAnnotation"), + ("MyAnnotation", Module, "Foo.MyAnnotation") + ) + ).completion( + m4, + Set( + ("MyAnnotation", Class, "MyAnnotation"), + ("MyAnnotation", Module, "MyAnnotation") + ) + ).completion( + m5, + Set( + ("MyAnnotation", Class, "Foo.MyAnnotation"), + ("MyAnnotation", Module, "Foo.MyAnnotation") + ) + ).completion( + m6, + Set( + ("MyAnnotation", Class, "Foo.MyAnnotation"), + ("MyAnnotation", Module, "Foo.MyAnnotation") + ) + ) +} From fdad2b8036ff74b1920fcf4e8cd74226659684d1 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Wed, 27 Oct 2021 02:08:48 -0400 Subject: [PATCH 0774/1244] Fix comparing AnyVal | Null with Null --- .../src/dotty/tools/dotc/core/Types.scala | 19 ++++++++++++------- .../src/dotty/tools/dotc/typer/Typer.scala | 2 +- tests/explicit-nulls/pos/AnyValOrNull.scala | 16 ++++++++++++++++ 3 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 tests/explicit-nulls/pos/AnyValOrNull.scala diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 6650771963f9..ae7ec91e7108 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -853,18 +853,23 @@ object Types { def goAnd(l: Type, r: Type) = go(l).meet(go(r), pre, safeIntersection = ctx.base.pendingMemberSearches.contains(name)) - def goOr(tp: OrType) = tp match { - case OrNull(tp1) if Nullables.unsafeNullsEnabled => - // Selecting `name` from a type `T | Null` is like selecting `name` from `T`, if - // unsafeNulls is enabled. This can throw at runtime, but we trade soundness for usability. - tp1.findMember(name, pre.stripNull, required, excluded) - case _ => + def goOr(tp: OrType) = + inline def searchAfterJoin = // we need to keep the invariant that `pre <: tp`. Branch `union-types-narrow-prefix` // achieved that by narrowing `pre` to each alternative, but it led to merge errors in // lots of places. The present strategy is instead of widen `tp` using `join` to be a // supertype of `pre`. go(tp.join) - } + + if Nullables.unsafeNullsEnabled then tp match + case OrNull(tp1) if tp1 <:< defn.ObjectType => + // Selecting `name` from a type `T | Null` is like selecting `name` from `T`, if + // unsafeNulls is enabled and T is a subtype of AnyRef. + // This can throw at runtime, but we trade soundness for usability. + tp1.findMember(name, pre.stripNull, required, excluded) + case _ => + searchAfterJoin + else searchAfterJoin val recCount = ctx.base.findMemberCount if (recCount >= Config.LogPendingFindMemberThreshold) diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 433075f73fd9..ff8641f4b9c3 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -626,7 +626,7 @@ class Typer extends Namer val qual = typedExpr(tree.qualifier, shallowSelectionProto(tree.name, pt, this)) val qual1 = if Nullables.unsafeNullsEnabled then qual.tpe match { - case OrNull(tpe1) => + case OrNull(tpe1) if tpe1 <:< defn.ObjectType => qual.cast(AndType(qual.tpe, tpe1)) case tp => if tp.isNullType diff --git a/tests/explicit-nulls/pos/AnyValOrNull.scala b/tests/explicit-nulls/pos/AnyValOrNull.scala new file mode 100644 index 000000000000..ea3d419d8d77 --- /dev/null +++ b/tests/explicit-nulls/pos/AnyValOrNull.scala @@ -0,0 +1,16 @@ +def test1 = + val v: AnyVal | Null = null + if v == null then + println("null") + +def test2 = + val v: Int | Null = 1 + if v != null then + println(v) + +case class MyVal(val i: Boolean) extends AnyVal + +def test3 = + val v: MyVal | Null = MyVal(false) + if v != null then + println(v) From e36f4b000be04ff55f09564e17043e46e4693d01 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Wed, 27 Oct 2021 02:24:19 -0400 Subject: [PATCH 0775/1244] Add test for select --- .../src/dotty/tools/dotc/typer/TypeAssigner.scala | 2 +- tests/explicit-nulls/neg/AnyValOrNullSelect.scala | 13 +++++++++++++ tests/explicit-nulls/pos/AnyValOrNull.scala | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 tests/explicit-nulls/neg/AnyValOrNullSelect.scala diff --git a/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala b/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala index f7e33bd4a5f7..3dcec413540f 100644 --- a/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala +++ b/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala @@ -162,7 +162,7 @@ trait TypeAssigner { val qualType = qual.tpe.widenIfUnstable def kind = if tree.isType then "type" else "value" val foundWithoutNull = qualType match - case OrNull(qualType1) => + case OrNull(qualType1) if qualType1 <:< defn.ObjectType => val name = tree.name val pre = maybeSkolemizePrefix(qualType1, name) reallyExists(qualType1.findMember(name, pre)) diff --git a/tests/explicit-nulls/neg/AnyValOrNullSelect.scala b/tests/explicit-nulls/neg/AnyValOrNullSelect.scala new file mode 100644 index 000000000000..44e8b4e7edfb --- /dev/null +++ b/tests/explicit-nulls/neg/AnyValOrNullSelect.scala @@ -0,0 +1,13 @@ +case class MyVal(i: Int) extends AnyVal: + def printVal: Unit = + println(i) + +class Test: + val v: MyVal | Null = MyVal(1) + + def f1 = + v.printVal // error: value printVal is not a member of MyVal | Null + + def f1 = + import scala.language.unsafeNulls + v.printVal // error: value printVal is not a member of MyVal | Null diff --git a/tests/explicit-nulls/pos/AnyValOrNull.scala b/tests/explicit-nulls/pos/AnyValOrNull.scala index ea3d419d8d77..7fbe691901c3 100644 --- a/tests/explicit-nulls/pos/AnyValOrNull.scala +++ b/tests/explicit-nulls/pos/AnyValOrNull.scala @@ -8,7 +8,7 @@ def test2 = if v != null then println(v) -case class MyVal(val i: Boolean) extends AnyVal +case class MyVal(i: Boolean) extends AnyVal def test3 = val v: MyVal | Null = MyVal(false) From 91cee001fc08d0ae31bb3dc1ff31e318c5142a8e Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Wed, 27 Oct 2021 13:55:35 -0400 Subject: [PATCH 0776/1244] Update test --- tests/explicit-nulls/pos/AnyValOrNull.scala | 46 +++++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/tests/explicit-nulls/pos/AnyValOrNull.scala b/tests/explicit-nulls/pos/AnyValOrNull.scala index 7fbe691901c3..098d3eba973d 100644 --- a/tests/explicit-nulls/pos/AnyValOrNull.scala +++ b/tests/explicit-nulls/pos/AnyValOrNull.scala @@ -1,16 +1,36 @@ -def test1 = - val v: AnyVal | Null = null - if v == null then - println("null") +case class MyVal(i: Boolean) extends AnyVal -def test2 = - val v: Int | Null = 1 - if v != null then - println(v) +class Test1: -case class MyVal(i: Boolean) extends AnyVal + def test1 = + val v: AnyVal | Null = null + if v == null then + println("null") + + def test2 = + val v: Int | Null = 1 + if v != null then + println(v) + + def test3 = + val v: MyVal | Null = MyVal(false) + if v != null then + println(v) + +class Test2: + import scala.language.unsafeNulls + + def test1 = + val v: AnyVal | Null = null + if v == null then + println("null") + + def test2 = + val v: Int | Null = 1 + if v != null then + println(v) -def test3 = - val v: MyVal | Null = MyVal(false) - if v != null then - println(v) + def test3 = + val v: MyVal | Null = MyVal(false) + if v != null then + println(v) From 151c4d671f7cd458a2981b50827e535e3f34de13 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 22 Oct 2021 17:20:48 +0200 Subject: [PATCH 0777/1244] Add `scala.language.{3.1, 3.1-migration}` Fixes #13773 --- .../scala/runtime/stdLibPatches/language.scala | 18 +++++++++++++++++- project/MiMaFilters.scala | 8 ++++++++ tests/pos/source-import-3-0-migration.scala | 1 + tests/pos/source-import-3-0.scala | 1 + tests/pos/source-import-3-1-migration.scala | 1 + tests/pos/source-import-3-1.scala | 1 + 6 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 tests/pos/source-import-3-0-migration.scala create mode 100644 tests/pos/source-import-3-0.scala create mode 100644 tests/pos/source-import-3-1-migration.scala create mode 100644 tests/pos/source-import-3-1.scala diff --git a/library/src/scala/runtime/stdLibPatches/language.scala b/library/src/scala/runtime/stdLibPatches/language.scala index 4a70bede8e8a..7c8c116a106e 100644 --- a/library/src/scala/runtime/stdLibPatches/language.scala +++ b/library/src/scala/runtime/stdLibPatches/language.scala @@ -148,17 +148,33 @@ object language: @compileTimeOnly("`3.0` can only be used at compile time in import statements") object `3.0` -/* This can be added when we go to 3.1 /** Set source version to 3.1-migration. * * @see [[https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html]] */ + @compileTimeOnly("`3.1-migration` can only be used at compile time in import statements") object `3.1-migration` /** Set source version to 3.1 * * @see [[https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html]] */ + @compileTimeOnly("`3.1` can only be used at compile time in import statements") object `3.1` + +/* This can be added when we go to 3.2 + /** Set source version to 3.2-migration. + * + * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]] + */ + @compileTimeOnly("`3.2-migration` can only be used at compile time in import statements") + object `3.2-migration` + + /** Set source version to 3.2 + * + * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]] + */ + @compileTimeOnly("`3.2` can only be used at compile time in import statements") + object `3.2` */ end language diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index 4ef5e4d69c57..ae3673016db1 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -9,5 +9,13 @@ object MiMaFilters { ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.append"), ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"), ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"), + + // Should have been added in 3.1.0 + // These are only allowed on imports and therefore should not be present in binaries emitted before + // this addition of these members and therefore should not cause any conflicts. + ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1-migration"), + ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$minusmigration$"), ) } diff --git a/tests/pos/source-import-3-0-migration.scala b/tests/pos/source-import-3-0-migration.scala new file mode 100644 index 000000000000..b0f220fd4e40 --- /dev/null +++ b/tests/pos/source-import-3-0-migration.scala @@ -0,0 +1 @@ +import language.`3.0-migration` diff --git a/tests/pos/source-import-3-0.scala b/tests/pos/source-import-3-0.scala new file mode 100644 index 000000000000..d6d7f9201b08 --- /dev/null +++ b/tests/pos/source-import-3-0.scala @@ -0,0 +1 @@ +import language.`3.0` diff --git a/tests/pos/source-import-3-1-migration.scala b/tests/pos/source-import-3-1-migration.scala new file mode 100644 index 000000000000..6e6f9f905b99 --- /dev/null +++ b/tests/pos/source-import-3-1-migration.scala @@ -0,0 +1 @@ +import language.`3.1-migration` diff --git a/tests/pos/source-import-3-1.scala b/tests/pos/source-import-3-1.scala new file mode 100644 index 000000000000..38216d612864 --- /dev/null +++ b/tests/pos/source-import-3-1.scala @@ -0,0 +1 @@ +import language.`3.1` From a41d3841ced737090c2638ba1f6b30e4121c97ab Mon Sep 17 00:00:00 2001 From: danicheg Date: Fri, 29 Oct 2021 12:33:04 +0300 Subject: [PATCH 0778/1244] Use https protocol in the link in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd47a3ca013f..30789723d25a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Dotty [![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster) [![Join the chat at https://gitter.im/scala/scala](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -* [Homepage](http://dotty.epfl.ch) +* [Homepage](https://dotty.epfl.ch) * [Documentation](https://dotty.epfl.ch/docs) Try it out From 3b1066054dd0bc5d87724c38d2428400cf371767 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 27 Oct 2021 19:48:05 -0700 Subject: [PATCH 0779/1244] Fix typos in `Tuple` docs --- library/src/scala/Tuple.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/src/scala/Tuple.scala b/library/src/scala/Tuple.scala index 06d258e3e503..c509551ef12e 100644 --- a/library/src/scala/Tuple.scala +++ b/library/src/scala/Tuple.scala @@ -8,16 +8,16 @@ import compiletime.ops.int._ sealed trait Tuple extends Product { import Tuple._ - /** Create a copy this tuple as an Array */ + /** Create a copy of this tuple as an Array */ inline def toArray: Array[Object] = runtime.Tuples.toArray(this) - /** Create a copy this tuple as a List */ + /** Create a copy of this tuple as a List */ inline def toList: List[Union[this.type]] = this.productIterator.toList .asInstanceOf[List[Union[this.type]]] - /** Create a copy this tuple as an IArray */ + /** Create a copy of this tuple as an IArray */ inline def toIArray: IArray[Object] = runtime.Tuples.toIArray(this) From a5cc262925819f51ef3f3fa9fe223b3a8e499aa0 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Fri, 29 Oct 2021 10:51:02 +0200 Subject: [PATCH 0780/1244] Fix error summary printed twice Fix https://github.com/sbt/sbt/issues/6687 `printSummary` is already called in `Driver.finish`: https://github.com/lampepfl/dotty/blob/29f03741b9668c5052ec2b9502d061b7ecd614df/compiler/src/dotty/tools/dotc/Driver.scala#L53 --- sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java b/sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java index 6c622063a141..12291120b157 100644 --- a/sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java +++ b/sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java @@ -91,10 +91,10 @@ public int compare(VirtualFile x0, VirtualFile x1) { callback.problem(problem.category(), problem.position(), problem.message(), problem.severity(), true); } + } else { + delegate.printSummary(); } - delegate.printSummary(); - if (delegate.hasErrors()) { log.debug(() -> "Compilation failed"); throw new InterfaceCompileFailed(args, delegate.problems(), "Compilation failed"); From a65057f4574f05ffadf9594e0443a47d6dc81b74 Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Tue, 26 Oct 2021 19:34:14 +0200 Subject: [PATCH 0781/1244] Fix missing code-completion on standalone annotations Co-authored-by: Stefan Pavikevik Co-authored-by: Tomasz Godzik Co-authored-by: Anatolii Kmetiuk --- compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 6 +++++- compiler/test/dotty/tools/repl/TabcompleteTests.scala | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index aff7218e662b..63b6e9f8ac51 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -3472,7 +3472,11 @@ object Parsers { givenDef(start, mods, atSpan(in.skipToken()) { Mod.Given() }) case _ => syntaxErrorOrIncomplete(ExpectedStartOfTopLevelDefinition()) - EmptyTree + mods.annotations match { + case head :: Nil => head + case Nil => EmptyTree + case all => Block(all, errorTermTree) + } } /** ClassDef ::= id ClassConstr TemplateOpt diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala index 932ab7058899..df5a159277b7 100644 --- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala +++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala @@ -138,4 +138,8 @@ class TabcompleteTests extends ReplTest { tabComplete("import quoted.* ; def fooImpl(using Quotes): Expr[Int] = { import quotes.reflect.* ; TypeRepr.of[Int].s")) } + @Test def i13624 = fromInitialState { implicit s => + assertEquals(List("implicitNotFound"), tabComplete("@annotation.implicitNot")) + assertEquals(List("main"), tabComplete("@annotation.implicitNotFound @mai")) + } } From a3fdd0a01617fac332648717067a84a9c68f9c2a Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Mon, 1 Nov 2021 07:31:09 +0100 Subject: [PATCH 0782/1244] Move tests to CompletionTests file --- .../dotty/tools/repl/TabcompleteTests.scala | 5 ----- .../tools/languageserver/CompletionTest.scala | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala index df5a159277b7..dd5d5391a788 100644 --- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala +++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala @@ -137,9 +137,4 @@ class TabcompleteTests extends ReplTest { assertEquals(List("select", "show", "simplified", "substituteTypes"), tabComplete("import quoted.* ; def fooImpl(using Quotes): Expr[Int] = { import quotes.reflect.* ; TypeRepr.of[Int].s")) } - - @Test def i13624 = fromInitialState { implicit s => - assertEquals(List("implicitNotFound"), tabComplete("@annotation.implicitNot")) - assertEquals(List("main"), tabComplete("@annotation.implicitNotFound @mai")) - } } diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala index 1dd9516de7d1..6ef219187475 100644 --- a/language-server/test/dotty/tools/languageserver/CompletionTest.scala +++ b/language-server/test/dotty/tools/languageserver/CompletionTest.scala @@ -946,4 +946,21 @@ class CompletionTest { ("MyAnnotation", Module, "Foo.MyAnnotation") ) ) + + @Test def i13624_annotation : Unit = + code"""@annotation.implicitNot${m1} + |@annotation.implicitNotFound @mai${m2}""" + .withSource + .completion(m1, + Set( + ("implicitNotFound", Class, "scala.annotation.implicitNotFound"), + ("implicitNotFound", Module, "scala.annotation.implicitNotFound") + ) + ) + .completion(m2, + Set( + ("main", Class, "scala.main"), + ("main", Module, "main") + ) + ) } From 467ce40e227975d53e5c7c82522db82714d9ae96 Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Mon, 1 Nov 2021 07:33:37 +0100 Subject: [PATCH 0783/1244] Add unnecessary deleted empty line --- compiler/test/dotty/tools/repl/TabcompleteTests.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala index dd5d5391a788..932ab7058899 100644 --- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala +++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala @@ -137,4 +137,5 @@ class TabcompleteTests extends ReplTest { assertEquals(List("select", "show", "simplified", "substituteTypes"), tabComplete("import quoted.* ; def fooImpl(using Quotes): Expr[Int] = { import quotes.reflect.* ; TypeRepr.of[Int].s")) } + } From 43b4d1064689787a551a93e0f8d80a40daad8d74 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 26 Oct 2021 15:48:32 +0200 Subject: [PATCH 0784/1244] Add `-Xmacro-check` for Block constructors Checks that all definitions in the block have the same owner Closes #13809 --- .../quoted/runtime/impl/QuotesImpl.scala | 26 +- tests/neg-macros/i13809/Macros_1.scala | 265 ++++++++++++++++++ tests/neg-macros/i13809/Test_2.scala | 19 ++ tests/pos-macros/i10151/Macro_1.scala | 4 +- 4 files changed, 311 insertions(+), 3 deletions(-) create mode 100644 tests/neg-macros/i13809/Macros_1.scala create mode 100644 tests/neg-macros/i13809/Test_2.scala diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala index 8a8e34901a3b..1510640cfce6 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala @@ -753,9 +753,9 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler object Block extends BlockModule: def apply(stats: List[Statement], expr: Term): Block = - withDefaultPos(tpd.Block(stats, expr)) + xCheckMacroBlockOwners(withDefaultPos(tpd.Block(stats, expr))) def copy(original: Tree)(stats: List[Statement], expr: Term): Block = - tpd.cpy.Block(original)(stats, expr) + xCheckMacroBlockOwners(tpd.cpy.Block(original)(stats, expr)) def unapply(x: Block): (List[Statement], Term) = (x.statements, x.expr) end Block @@ -2913,6 +2913,28 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler case _ => traverseChildren(t) }.traverse(tree) + /** Checks that all definitions in this block have the same owner. + * Nested definitions are ignored and assumed to be correct by construction. + */ + private def xCheckMacroBlockOwners(tree: Tree): tree.type = + if xCheckMacro then + val defs = new tpd.TreeAccumulator[List[Tree]] { + def apply(defs: List[Tree], tree: Tree)(using Context): List[Tree] = + tree match + case tree: tpd.DefTree => tree :: defs + case _ => foldOver(defs, tree) + }.apply(Nil, tree) + val defOwners = defs.groupBy(_.symbol.owner) + assert(defOwners.size <= 1, + s"""Block contains definition with different owners. + |Found definitions ${defOwners.size} distinct owners: ${defOwners.keys.mkString(", ")} + | + |Block: ${Printer.TreeCode.show(tree)} + | + |${defOwners.map((owner, trees) => s"Definitions owned by $owner: \n${trees.map(Printer.TreeCode.show).mkString("\n")}").mkString("\n\n")} + |""".stripMargin) + tree + private def xCheckMacroValidExprs(terms: List[Term]): terms.type = if xCheckMacro then terms.foreach(xCheckMacroValidExpr) terms diff --git a/tests/neg-macros/i13809/Macros_1.scala b/tests/neg-macros/i13809/Macros_1.scala new file mode 100644 index 000000000000..774a8bf195ba --- /dev/null +++ b/tests/neg-macros/i13809/Macros_1.scala @@ -0,0 +1,265 @@ +package x + +import scala.annotation._ +import scala.quoted._ + +trait CB[+T] + +object CBM: + def pure[T](t:T):CB[T] = ??? + def map[A,B](fa:CB[A])(f: A=>B):CB[B] = ??? + def flatMap[A,B](fa:CB[A])(f: A=>CB[B]):CB[B] = ??? + def spawn[A](op: =>CB[A]): CB[A] = ??? + + +@compileTimeOnly("await should be inside async block") +def await[T](f: CB[T]): T = ??? + + +trait CpsExpr[T:Type](prev: Seq[Expr[?]]): + + def fLast(using Quotes): Expr[CB[T]] + def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] + def append[A:Type](chunk: CpsExpr[A])(using Quotes): CpsExpr[A] + def syncOrigin(using Quotes): Option[Expr[T]] + def map[A:Type](f: Expr[T => A])(using Quotes): CpsExpr[A] = + MappedCpsExpr[T,A](Seq(),this,f) + def flatMap[A:Type](f: Expr[T => CB[A]])(using Quotes): CpsExpr[A] = + FlatMappedCpsExpr[T,A](Seq(),this,f) + + def transformed(using Quotes): Expr[CB[T]] = + import quotes.reflect._ + Block(prev.toList.map(_.asTerm), fLast.asTerm).asExprOf[CB[T]] + + +case class GenericSyncCpsExpr[T:Type](prev: Seq[Expr[?]],last: Expr[T]) extends CpsExpr[T](prev): + + override def fLast(using Quotes): Expr[CB[T]] = + '{ CBM.pure(${last}:T) } + + override def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] = + copy(prev = exprs ++: prev) + + override def syncOrigin(using Quotes): Option[Expr[T]] = + import quotes.reflect._ + Some(Block(prev.toList.map(_.asTerm), last.asTerm).asExprOf[T]) + + override def append[A:Type](e: CpsExpr[A])(using Quotes) = + e.prependExprs(Seq(last)).prependExprs(prev) + + override def map[A:Type](f: Expr[T => A])(using Quotes): CpsExpr[A] = + copy(last = '{ $f($last) }) + + override def flatMap[A:Type](f: Expr[T => CB[A]])(using Quotes): CpsExpr[A] = + GenericAsyncCpsExpr[A](prev, '{ CBM.flatMap(CBM.pure($last))($f) } ) + + +abstract class AsyncCpsExpr[T:Type]( + prev: Seq[Expr[?]] + ) extends CpsExpr[T](prev): + + override def append[A:Type](e: CpsExpr[A])(using Quotes): CpsExpr[A] = + flatMap( '{ (x:T) => ${e.transformed} }) + + override def syncOrigin(using Quotes): Option[Expr[T]] = None + + + +case class GenericAsyncCpsExpr[T:Type]( + prev: Seq[Expr[?]], + fLastExpr: Expr[CB[T]] + ) extends AsyncCpsExpr[T](prev): + + override def fLast(using Quotes): Expr[CB[T]] = fLastExpr + + override def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] = + copy(prev = exprs ++: prev) + + override def map[A:Type](f: Expr[T => A])(using Quotes): CpsExpr[A] = + MappedCpsExpr(Seq(),this,f) + + override def flatMap[A:Type](f: Expr[T => CB[A]])(using Quotes): CpsExpr[A] = + FlatMappedCpsExpr(Seq(),this,f) + + + +case class MappedCpsExpr[S:Type, T:Type]( + prev: Seq[Expr[?]], + point: CpsExpr[S], + mapping: Expr[S=>T] + ) extends AsyncCpsExpr[T](prev): + + override def fLast(using Quotes): Expr[CB[T]] = + '{ CBM.map(${point.transformed})($mapping) } + + override def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] = + copy(prev = exprs ++: prev) + + + +case class FlatMappedCpsExpr[S:Type, T:Type]( + prev: Seq[Expr[?]], + point: CpsExpr[S], + mapping: Expr[S => CB[T]] + ) extends AsyncCpsExpr[T](prev): + + override def fLast(using Quotes): Expr[CB[T]] = + '{ CBM.flatMap(${point.transformed})($mapping) } + + override def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] = + copy(prev = exprs ++: prev) + + +class ValRhsFlatMappedCpsExpr[T:Type, V:Type](using thisQuotes: Quotes) + ( + prev: Seq[Expr[?]], + oldValDef: quotes.reflect.ValDef, + cpsRhs: CpsExpr[V], + next: CpsExpr[T] + ) + extends AsyncCpsExpr[T](prev) { + + override def fLast(using Quotes):Expr[CB[T]] = + import quotes.reflect._ + next.syncOrigin match + case Some(nextOrigin) => + // owner of this block is incorrect + '{ + CBM.map(${cpsRhs.transformed})((vx:V) => + ${buildAppendBlockExpr('vx, nextOrigin)}) + } + case None => + '{ + CBM.flatMap(${cpsRhs.transformed})((v:V)=> + ${buildAppendBlockExpr('v, next.transformed)}) + } + + + override def prependExprs(exprs: Seq[Expr[?]]): CpsExpr[T] = + ValRhsFlatMappedCpsExpr(using thisQuotes)(exprs ++: prev,oldValDef,cpsRhs,next) + + override def append[A:quoted.Type](e: CpsExpr[A])(using Quotes) = + ValRhsFlatMappedCpsExpr(using thisQuotes)(prev,oldValDef,cpsRhs,next.append(e)) + + + private def buildAppendBlock(using Quotes)(rhs:quotes.reflect.Term, + exprTerm:quotes.reflect.Term): quotes.reflect.Term = + import quotes.reflect._ + import scala.quoted.Expr + + val castedOldValDef = oldValDef.asInstanceOf[quotes.reflect.ValDef] + val valDef = ValDef(castedOldValDef.symbol, Some(rhs.changeOwner(castedOldValDef.symbol))) + exprTerm match + case Block(stats,last) => + Block(valDef::stats, last) + case other => + Block(valDef::Nil,other) + + private def buildAppendBlockExpr[A:Type](using Quotes)(rhs: Expr[V], expr:Expr[A]):Expr[A] = + import quotes.reflect._ + buildAppendBlock(rhs.asTerm,expr.asTerm).asExprOf[A] + +} + + +object CpsExpr: + + def sync[T:Type](f: Expr[T]): CpsExpr[T] = + GenericSyncCpsExpr[T](Seq(), f) + + def async[T:Type](f: Expr[CB[T]]): CpsExpr[T] = + GenericAsyncCpsExpr[T](Seq(), f) + + +object Async: + + transparent inline def transform[T](inline expr: T) = ${ + Async.transformImpl[T]('expr) + } + + def transformImpl[T:Type](f: Expr[T])(using Quotes): Expr[CB[T]] = + import quotes.reflect._ + // println(s"before transformed: ${f.show}") + val cpsExpr = rootTransform[T](f) + val r = '{ CBM.spawn(${cpsExpr.transformed}) } + // println(s"transformed value: ${r.show}") + r + + def rootTransform[T:Type](f: Expr[T])(using Quotes): CpsExpr[T] = { + import quotes.reflect._ + f match + case '{ while ($cond) { $repeat } } => + val cpsRepeat = rootTransform(repeat.asExprOf[Unit]) + CpsExpr.async('{ + def _whilefun():CB[Unit] = + if ($cond) { + ${cpsRepeat.flatMap('{(x:Unit) => _whilefun()}).transformed} + } else { + CBM.pure(()) + } + _whilefun() + }.asExprOf[CB[T]]) + case _ => + val fTree = f.asTerm + fTree match { + case fun@Apply(fun1@TypeApply(obj2,targs2), args1) => + if (obj2.symbol.name == "await") { + val awaitArg = args1.head + CpsExpr.async(awaitArg.asExprOf[CB[T]]) + } else { + ??? + } + case Assign(left,right) => + left match + case id@Ident(x) => + right.tpe.widen.asType match + case '[r] => + val cpsRight = rootTransform(right.asExprOf[r]) + CpsExpr.async( + cpsRight.map[T]( + '{ (x:r) => ${Assign(left,'x.asTerm).asExprOf[T] } + }).transformed ) + case _ => ??? + case Block(prevs,last) => + val rPrevs = prevs.map{ p => + p match + case v@ValDef(vName,vtt,optRhs) => + optRhs.get.tpe.widen.asType match + case '[l] => + val cpsRight = rootTransform(optRhs.get.asExprOf[l]) + ValRhsFlatMappedCpsExpr(using quotes)(Seq(), v, cpsRight, CpsExpr.sync('{})) + case t: Term => + // TODO: rootTransform + t.asExpr match + case '{ $p: tp } => + rootTransform(p) + case other => + printf(other.show) + throw RuntimeException(s"can't handle term in block: $other") + case other => + printf(other.show) + throw RuntimeException(s"unknown tree type in block: $other") + } + val rLast = rootTransform(last.asExprOf[T]) + val blockResult = rPrevs.foldRight(rLast)((e,s) => e.append(s)) + val retval = CpsExpr.async(blockResult.transformed) + retval + //BlockTransform(cpsCtx).run(prevs,last) + case id@Ident(name) => + CpsExpr.sync(id.asExprOf[T]) + case tid@Typed(Ident(name), tp) => + CpsExpr.sync(tid.asExprOf[T]) + case matchTerm@Match(scrutinee, caseDefs) => + val nCases = caseDefs.map{ old => + CaseDef.copy(old)(old.pattern, old.guard, rootTransform(old.rhs.asExprOf[T]).transformed.asTerm) + } + CpsExpr.async(Match(scrutinee, nCases).asExprOf[CB[T]]) + case inlinedTerm@ Inlined(call,List(),body) => + rootTransform(body.asExprOf[T]) + case constTerm@Literal(_)=> + CpsExpr.sync(constTerm.asExprOf[T]) + case _ => + throw RuntimeException(s"language construction is not supported: ${fTree}") + } + } + diff --git a/tests/neg-macros/i13809/Test_2.scala b/tests/neg-macros/i13809/Test_2.scala new file mode 100644 index 000000000000..3360de7ab018 --- /dev/null +++ b/tests/neg-macros/i13809/Test_2.scala @@ -0,0 +1,19 @@ +package x + +object VP1: + + ///* + def allocateServiceOperator(optInUsername: Option[String]): CB[Unit] = Async.transform { // error + val username = optInUsername match + case None => + while(false) { + val nextResult = await(op1()) + val countResult = await(op1()) + } + case Some(inUsername) => + val x = await(op1()) + inUsername + } + //*/ + + def op1(): CB[String] = ??? diff --git a/tests/pos-macros/i10151/Macro_1.scala b/tests/pos-macros/i10151/Macro_1.scala index c7a2b9a301c2..3b81ed00b2f8 100644 --- a/tests/pos-macros/i10151/Macro_1.scala +++ b/tests/pos-macros/i10151/Macro_1.scala @@ -55,7 +55,9 @@ object X: ) ) ) - case Block(stats, last) => Block(stats, transform(last)) + case Block(stats, last) => + val recoverdOwner = stats.headOption.map(_.symbol.owner).getOrElse(Symbol.spliceOwner) // hacky workaround to missing owner tracking in transform + Block(stats, transform(last).changeOwner(recoverdOwner)) case Inlined(x,List(),body) => transform(body) case l@Literal(x) => l.asExpr match From 2100c6933287cafde1248fdfbadbb57923c0903d Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 1 Nov 2021 14:17:09 +0100 Subject: [PATCH 0785/1244] Detect opaque aliases in inline val types `inline val`s cannot contain opaque aliases as these cannot be inlined through their type due to their opaqueness. We can support `inline def` with opaque types. Fixes #13851 Fixes #13852 --- .../src/dotty/tools/dotc/core/Types.scala | 29 ++++++++++++------- .../tools/dotc/transform/InlineVals.scala | 6 ++-- tests/neg/i13851.scala | 11 +++++++ tests/neg/i13851b.scala | 10 +++++++ tests/neg/i13852.scala | 6 ++++ 5 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 tests/neg/i13851.scala create mode 100644 tests/neg/i13851b.scala create mode 100644 tests/neg/i13852.scala diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index ae7ec91e7108..b384cbdcb084 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -1363,25 +1363,26 @@ object Types { case Atoms.Unknown => Atoms.Unknown case _ => Atoms.Unknown - private def dealias1(keep: AnnotatedType => Context ?=> Boolean)(using Context): Type = this match { + private def dealias1(keep: AnnotatedType => Context ?=> Boolean, keepOpaques: Boolean)(using Context): Type = this match { case tp: TypeRef => if (tp.symbol.isClass) tp else tp.info match { - case TypeAlias(alias) => alias.dealias1(keep) + case TypeAlias(alias) if !(keepOpaques && tp.symbol.is(Opaque)) => + alias.dealias1(keep, keepOpaques) case _ => tp } case app @ AppliedType(tycon, _) => - val tycon1 = tycon.dealias1(keep) - if (tycon1 ne tycon) app.superType.dealias1(keep) + val tycon1 = tycon.dealias1(keep, keepOpaques) + if (tycon1 ne tycon) app.superType.dealias1(keep, keepOpaques) else this case tp: TypeVar => val tp1 = tp.instanceOpt - if (tp1.exists) tp1.dealias1(keep) else tp + if (tp1.exists) tp1.dealias1(keep, keepOpaques) else tp case tp: AnnotatedType => - val tp1 = tp.parent.dealias1(keep) + val tp1 = tp.parent.dealias1(keep, keepOpaques) if keep(tp) then tp.derivedAnnotatedType(tp1, tp.annot) else tp1 case tp: LazyRef => - tp.ref.dealias1(keep) + tp.ref.dealias1(keep, keepOpaques) case _ => this } @@ -1389,16 +1390,22 @@ object Types { * TypeVars until type is no longer alias type, annotated type, LazyRef, * or instantiated type variable. */ - final def dealias(using Context): Type = dealias1(keepNever) + final def dealias(using Context): Type = dealias1(keepNever, keepOpaques = false) /** Follow aliases and dereferences LazyRefs and instantiated TypeVars until type * is no longer alias type, LazyRef, or instantiated type variable. * Goes through annotated types and rewraps annotations on the result. */ - final def dealiasKeepAnnots(using Context): Type = dealias1(keepAlways) + final def dealiasKeepAnnots(using Context): Type = dealias1(keepAlways, keepOpaques = false) /** Like `dealiasKeepAnnots`, but keeps only refining annotations */ - final def dealiasKeepRefiningAnnots(using Context): Type = dealias1(keepIfRefining) + final def dealiasKeepRefiningAnnots(using Context): Type = dealias1(keepIfRefining, keepOpaques = false) + + /** Follow non-opaque aliases and dereferences LazyRefs, annotated types and instantiated + * TypeVars until type is no longer alias type, annotated type, LazyRef, + * or instantiated type variable. + */ + final def dealiasKeepOpaques(using Context): Type = dealias1(keepNever, keepOpaques = true) /** Approximate this type with a type that does not contain skolem types. */ final def deskolemized(using Context): Type = @@ -1426,7 +1433,7 @@ object Types { def tryNormalize(using Context): Type = NoType private def widenDealias1(keep: AnnotatedType => Context ?=> Boolean)(using Context): Type = { - val res = this.widen.dealias1(keep) + val res = this.widen.dealias1(keep, keepOpaques = false) if (res eq this) res else res.widenDealias1(keep) } diff --git a/compiler/src/dotty/tools/dotc/transform/InlineVals.scala b/compiler/src/dotty/tools/dotc/transform/InlineVals.scala index 0e3f4139c27b..f3de86aab58a 100644 --- a/compiler/src/dotty/tools/dotc/transform/InlineVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/InlineVals.scala @@ -33,13 +33,15 @@ class InlineVals extends MiniPhase: then val rhs = tree.rhs val tpt = tree.tpt - tpt.tpe.widenTermRefExpr.dealias.normalized match + tpt.tpe.widenTermRefExpr.dealiasKeepOpaques.normalized match case tp: ConstantType => if !isPureExpr(rhs) then val details = if enclosingInlineds.isEmpty then "" else em"but was: $rhs" report.error(s"inline value must be pure$details", rhs.srcPos) case tp => - if tp.derivesFrom(defn.UnitClass) then + if tp.typeSymbol.is(Opaque) then + report.error(em"`inline val` of type opaque types is not supported.\n\nTo inline consider using `inline def`", rhs) + else if tp.derivesFrom(defn.UnitClass) then report.error(em"`inline val` of type `Unit` is not supported.\n\nTo inline a `Unit` consider using `inline def`", rhs) else if tp.derivesFrom(defn.StringClass) || defn.ScalaValueClasses().exists(tp.derivesFrom(_)) then val pos = if tpt.span.isZeroExtent then rhs.srcPos else tpt.srcPos diff --git a/tests/neg/i13851.scala b/tests/neg/i13851.scala new file mode 100644 index 000000000000..fb7066a60b3f --- /dev/null +++ b/tests/neg/i13851.scala @@ -0,0 +1,11 @@ +opaque type One = 1 +inline val One: One = 1 // error + +opaque type Max = Int.MaxValue.type +inline val Max: Max = Int.MaxValue // error + +inline val MaxValue: Int.MaxValue.type = Int.MaxValue + +opaque type Two = 2 +type Bis = Two +inline val Two: Bis = 2 // error \ No newline at end of file diff --git a/tests/neg/i13851b.scala b/tests/neg/i13851b.scala new file mode 100644 index 000000000000..624735de0a49 --- /dev/null +++ b/tests/neg/i13851b.scala @@ -0,0 +1,10 @@ +object Num { + opaque type One = 1 + inline val One: One = 1 // error + + opaque type Two = 2 + inline def Two: Two = 2 +} + +def test1 = Num.One +def test2 = Num.Two diff --git a/tests/neg/i13852.scala b/tests/neg/i13852.scala new file mode 100644 index 000000000000..a0c5e726e1a8 --- /dev/null +++ b/tests/neg/i13852.scala @@ -0,0 +1,6 @@ +inline val `1`: 1 = 1 +def get1: 1 = `1` + +opaque type One = 1 +inline val One: One = 1 // error +def getOne: One = One From 40e99fef4a9671d750cc07acdfe37e604d611061 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 2 Nov 2021 10:31:37 +0100 Subject: [PATCH 0786/1244] Update compiler/src/dotty/tools/dotc/transform/InlineVals.scala Co-authored-by: Guillaume Martres --- compiler/src/dotty/tools/dotc/transform/InlineVals.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/transform/InlineVals.scala b/compiler/src/dotty/tools/dotc/transform/InlineVals.scala index f3de86aab58a..30ef0ed40375 100644 --- a/compiler/src/dotty/tools/dotc/transform/InlineVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/InlineVals.scala @@ -40,7 +40,7 @@ class InlineVals extends MiniPhase: report.error(s"inline value must be pure$details", rhs.srcPos) case tp => if tp.typeSymbol.is(Opaque) then - report.error(em"`inline val` of type opaque types is not supported.\n\nTo inline consider using `inline def`", rhs) + report.error(em"The type of an `inline val` cannot be an opaque type.\n\nTo inline, consider using `inline def` instead", rhs) else if tp.derivesFrom(defn.UnitClass) then report.error(em"`inline val` of type `Unit` is not supported.\n\nTo inline a `Unit` consider using `inline def`", rhs) else if tp.derivesFrom(defn.StringClass) || defn.ScalaValueClasses().exists(tp.derivesFrom(_)) then From c340ed54776a460f1cf0150fc925095842ec288f Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 22 Oct 2021 17:07:34 +0200 Subject: [PATCH 0787/1244] Allow dual Scala 2/3 in non-experimental scopes --- .../dotc/transform/PruneErasedDefs.scala | 3 ++- .../no-experimental/i8945.scala | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 tests/pos-custom-args/no-experimental/i8945.scala diff --git a/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala b/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala index 12c6477262f8..7d8f0025eb15 100644 --- a/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala +++ b/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala @@ -55,7 +55,8 @@ class PruneErasedDefs extends MiniPhase with SymTransformer { thisTransform => tree def checkErasedInExperimental(sym: Symbol)(using Context): Unit = - if sym.is(Erased) && sym != defn.Compiletime_erasedValue && !sym.isInExperimentalScope then + // Make an exception for Scala 2 experimental macros to allow dual Scala 2/3 macros under non experimental mode + if sym.is(Erased, butNot = Macro) && sym != defn.Compiletime_erasedValue && !sym.isInExperimentalScope then Feature.checkExperimentalFeature("erased", sym.sourcePos) } diff --git a/tests/pos-custom-args/no-experimental/i8945.scala b/tests/pos-custom-args/no-experimental/i8945.scala new file mode 100644 index 000000000000..5dded16f0160 --- /dev/null +++ b/tests/pos-custom-args/no-experimental/i8945.scala @@ -0,0 +1,27 @@ +// src-2/MacroImpl.scala +trait Context { + object universe { + type Literal + } +} + +class MacroImpl(val c: Context) { + import c.universe.* + def mono: Literal = ??? +} + +// src-3/Macros.scala +import scala.language.experimental.macros + +object Macros { + + object Bundles { + def mono: Unit = macro MacroImpl.mono + inline def mono: Unit = ${ Macros3.monoImpl } + } + + object Macros3 { + def monoImpl(using quoted.Quotes) = '{()} + } + +} \ No newline at end of file From c2bb00bbb3ed1cab1603d7cef603854faad457e9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 25 Oct 2021 19:44:21 -0700 Subject: [PATCH 0788/1244] Lint trivially self-recursive extension methods Broadens Martin's fix for #13542 Fixes #9880 Also, exempt Boolean's && and || methods, which aren't set up as having by-name parameters. Co-authored-by: Dale Wijnand --- .../transform/CheckLoopingImplicits.scala | 9 ++++-- .../fatal-warnings/i9880.scala | 30 +++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 tests/neg-custom-args/fatal-warnings/i9880.scala diff --git a/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala b/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala index 4818153e00e6..21b994a6d1b8 100644 --- a/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala +++ b/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala @@ -46,7 +46,10 @@ class CheckLoopingImplicits extends MiniPhase: case Apply(fn, args) => checkNotLooping(fn) fn.tpe.widen match - case mt: MethodType => + case mt: MethodType + // Boolean && and || aren't defined with by-name parameters + // and therefore their type isn't an ExprType, so we exempt them by symbol name + if t.symbol != defn.Boolean_&& && t.symbol != defn.Boolean_|| => args.lazyZip(mt.paramInfos).foreach { (arg, pinfo) => if !pinfo.isInstanceOf[ExprType] then checkNotLooping(arg) } @@ -80,8 +83,8 @@ class CheckLoopingImplicits extends MiniPhase: checkNotLooping(t.rhs) case _ => - if sym.isOneOf(GivenOrImplicit | Lazy) then + if sym.isOneOf(GivenOrImplicit | Lazy | ExtensionMethod) then checkNotLooping(mdef.rhs) mdef end transform -end CheckLoopingImplicits \ No newline at end of file +end CheckLoopingImplicits diff --git a/tests/neg-custom-args/fatal-warnings/i9880.scala b/tests/neg-custom-args/fatal-warnings/i9880.scala new file mode 100644 index 000000000000..d9d857110543 --- /dev/null +++ b/tests/neg-custom-args/fatal-warnings/i9880.scala @@ -0,0 +1,30 @@ +opaque type Bytes = Array[Byte] +object Bytes: + extension (self: Bytes) + def size: Int = (self: Array[Byte]).size // error + +// + +object Module1: + opaque type State[S, +A] = S => (S, A) + object State: + extension [S, A](self: State[S, A]) + def map[B](f: A => B): State[S, B] = + s => { val (s2, a) = self(s); (s2, f(a)) } +object Module2: + import Module1.State + trait RNG + opaque type Gen[+A] = State[RNG, A] + object Gen: + extension [A](self: Gen[A]) + def map[B](f: A => B): Gen[B] = + self.map(f) // error + +// + +class Sym(val owner: Sym) + +extension (sym: Sym) + def isSomething: Boolean = false + def isFoo: Boolean = sym.isSomething && sym.owner.isFoo // was: Infinite loop in function body + def isBar: Boolean = sym.isSomething || sym.owner.isBar // was: Infinite loop in function body From d37098877d1f3202693aa7483ed333c14681a804 Mon Sep 17 00:00:00 2001 From: Stephane MICHELOUD Date: Thu, 21 Oct 2021 20:35:49 +0200 Subject: [PATCH 0789/1244] handle IOException for deleteIfExists --- .../dotc/classpath/MultiReleaseJarTest.scala | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala b/compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala index b79a34e1f2ab..79aeb87aed1d 100644 --- a/compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala +++ b/compiler/test/dotty/tools/dotc/classpath/MultiReleaseJarTest.scala @@ -2,18 +2,19 @@ package dotty.tools.dotc.classpath import dotty.tools.dotc.core.Contexts.Context -import java.io.ByteArrayOutputStream +import java.io.{ByteArrayOutputStream, IOException} import java.nio.file.{FileSystems, Files, Path} import java.util.jar.Attributes import java.util.jar.Attributes.Name -import org.junit.Test import org.junit.Assert._ +import org.junit.Test -import scala.util.Properties import scala.collection.JavaConverters._ +import scala.util.Properties class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest { + @Test def mrJar(): Unit = { if (!Properties.isJavaAtLeast("9")) { println("skipping mrJar() on old JDK"); return } @@ -61,7 +62,10 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest { if Properties.isJavaAtLeast("10") then assertEquals(Set("foo1", "foo2", "bar1", "bar2"), apiMethods(jar3, "10")) } finally - List(jar1, jar2, jar3).foreach(Files.deleteIfExists) + List(jar1, jar2, jar3).forall(path => + try Files.deleteIfExists(path) + catch case _: IOException => false + ) } @Test @@ -82,7 +86,6 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest { assertTrue(classExists("java.lang.invoke.LambdaMetafactory", "9")) } - private def createManifest = { val manifest = new java.util.jar.Manifest() manifest.getMainAttributes.put(Name.MANIFEST_VERSION, "1.0") @@ -92,6 +95,7 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest { val manifestBytes = os.toByteArray manifestBytes } + private def createZip(zipLocation: Path, content: List[(String, Array[Byte])]): Unit = { val env = new java.util.HashMap[String, String]() Files.deleteIfExists(zipLocation) @@ -113,4 +117,5 @@ class MultiReleaseJarTest extends dotty.tools.backend.jvm.DottyBytecodeTest { zipfs.close() } } + } From 3ee5fc1fb521d3339a4a7224c28a17fa7ffb9f62 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Wed, 13 Oct 2021 13:05:33 +0200 Subject: [PATCH 0790/1244] Remove unnecessary call to constrainResult This was originally added in #1395 to make the following compile: (1, x => 2): (Int, Int => Int) But reverting this change doesn't break anything anymore: the other call to `constrainResult` in `Application#init` is enough to propagate the constraint needed to type lambda. The strange thing is that this call already existed before #1395, I don't know why it wasn't enough back then. --- compiler/src/dotty/tools/dotc/typer/Applications.scala | 9 --------- 1 file changed, 9 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala index ab7187f6f4d4..ae4bc2f395d0 100644 --- a/compiler/src/dotty/tools/dotc/typer/Applications.scala +++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala @@ -891,15 +891,6 @@ trait Applications extends Compatibility { then originalProto.tupledDual else originalProto - // If some of the application's arguments are function literals without explicitly declared - // parameter types, relate the normalized result type of the application with the - // expected type through `constrainResult`. This can add more constraints which - // help sharpen the inferred parameter types for the argument function literal(s). - // This tweak is needed to make i1378 compile. - if (tree.args.exists(untpd.isFunctionWithUnknownParamType(_))) - if (!constrainResult(tree.symbol, fun1.tpe.widen, proto.derivedFunProto(resultType = pt))) - typr.println(i"result failure for $tree with type ${fun1.tpe.widen}, expected = $pt") - /** Type application where arguments come from prototype, and no implicits are inserted */ def simpleApply(fun1: Tree, proto: FunProto)(using Context): Tree = methPart(fun1).tpe match { From 85eafec05e7a499333b5004624c7b3cbefeebaed Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Fri, 15 Oct 2021 12:01:25 +0200 Subject: [PATCH 0791/1244] Fix improper usage of `constrained` breaking type inference In multiple places, we had code equivalent to the following pattern: val (tl2, targs) = constrained(tl) tl2.resultType <:< ... which lead to subtype checks directly involving the TypeParamRefs of the constrained type lambda. This commit uses the following pattern instead: val (tl2, targs) = constrained(tl) tl2.instantiate(targs.map(_.tpe)) <:< ... which substitutes the TypeParamRefs by the corresponding TypeVars in the constraint. This is necessary because when comparing TypeParamRefs in isSubType: - we only recurse on the bounds of the TypeParamRef using `isSubTypeWhenFrozen` which prevents further constraints from being added (see the added stm.scala test case for an example where this matters). - if the corresponding TypeVar is instantiated and the TyperState has been gc()'ed, there is no way to find the instantiation corresponding to the current TypeParamRef anymore. There is one place where I left the old logic intact: `TrackingTypeComparer#matchCase` because the match type caching logic (in `MatchType#reduced`) conflicted with the use of TypeVars since it retracts the current TyperState. This change breaks a test which involves an unlikely combination of implicit conversion, overloading and apply insertion. Given that there is always a tension between type inference and implicit conversion, and that we're discouraging uses of implicit conversions, I think that's an acceptable trade-off. --- compiler/src/dotty/tools/dotc/typer/Applications.scala | 6 +++--- compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala | 9 +++++++-- .../test/dotty/tools/dotc/core/ConstraintsTest.scala | 9 +++++---- tests/pos/stm.scala | 10 ++++++++++ tests/pos/t0851.scala | 3 +-- tests/pos/t2913.scala | 3 +-- 6 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 tests/pos/stm.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala index ae4bc2f395d0..1c346ac7af20 100644 --- a/compiler/src/dotty/tools/dotc/typer/Applications.scala +++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala @@ -411,7 +411,7 @@ trait Applications extends Compatibility { */ @threadUnsafe lazy val methType: Type = liftedFunType.widen match { case funType: MethodType => funType - case funType: PolyType => constrained(funType).resultType + case funType: PolyType => instantiateWithTypeVars(funType) case tp => tp //was: funType } @@ -1562,7 +1562,7 @@ trait Applications extends Compatibility { case tp2: MethodType => true // (3a) case tp2: PolyType if tp2.resultType.isInstanceOf[MethodType] => true // (3a) case tp2: PolyType => // (3b) - explore(isAsSpecificValueType(tp1, constrained(tp2).resultType)) + explore(isAsSpecificValueType(tp1, instantiateWithTypeVars(tp2))) case _ => // 3b) isAsSpecificValueType(tp1, tp2) } @@ -1729,7 +1729,7 @@ trait Applications extends Compatibility { resultType.revealIgnored match { case resultType: ValueType => altType.widen match { - case tp: PolyType => resultConforms(altSym, constrained(tp).resultType, resultType) + case tp: PolyType => resultConforms(altSym, instantiateWithTypeVars(tp), resultType) case tp: MethodType => constrainResult(altSym, tp.resultType, resultType) case _ => true } diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala index 167128be08e4..fcedd8a0cd56 100644 --- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -659,6 +659,11 @@ object ProtoTypes { def constrained(tl: TypeLambda)(using Context): TypeLambda = constrained(tl, EmptyTree)._1 + /** Instantiate `tl` with fresh type variables added to the constraint. */ + def instantiateWithTypeVars(tl: TypeLambda)(using Context): Type = + val targs = constrained(tl, ast.tpd.EmptyTree, alwaysAddTypeVars = true)._2 + tl.instantiate(targs.tpes) + /** A new type variable with given bounds for its origin. * @param represents If exists, the TermParamRef that the TypeVar represents * in the substitution generated by `resultTypeApprox` @@ -707,7 +712,7 @@ object ProtoTypes { else mt.resultType /** The normalized form of a type - * - unwraps polymorphic types, tracking their parameters in the current constraint + * - instantiate polymorphic types with fresh type variables in the current constraint * - skips implicit parameters of methods and functions; * if result type depends on implicit parameter, replace with wildcard. * - converts non-dependent method types to the corresponding function types @@ -726,7 +731,7 @@ object ProtoTypes { Stats.record("normalize") tp.widenSingleton match { case poly: PolyType => - normalize(constrained(poly).resultType, pt) + normalize(instantiateWithTypeVars(poly), pt) case mt: MethodType => if (mt.isImplicitMethod) normalize(resultTypeApprox(mt, wildcardOnly = true), pt) else if (mt.isResultDependent) tp diff --git a/compiler/test/dotty/tools/dotc/core/ConstraintsTest.scala b/compiler/test/dotty/tools/dotc/core/ConstraintsTest.scala index 37ccf5667a7d..5ab162b9f05c 100644 --- a/compiler/test/dotty/tools/dotc/core/ConstraintsTest.scala +++ b/compiler/test/dotty/tools/dotc/core/ConstraintsTest.scala @@ -7,6 +7,7 @@ import dotty.tools.dotc.core.Contexts.{*, given} import dotty.tools.dotc.core.Decorators.{*, given} import dotty.tools.dotc.core.Symbols.* import dotty.tools.dotc.core.Types.* +import dotty.tools.dotc.ast.tpd.* import dotty.tools.dotc.typer.ProtoTypes.constrained import org.junit.Test @@ -18,8 +19,8 @@ class ConstraintsTest: @Test def mergeParamsTransitivity: Unit = inCompilerContext(TestConfiguration.basicClasspath, scalaSources = "trait A { def foo[S, T, R]: Any }") { - val tp = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda]) - val List(s, t, r) = tp.paramRefs + val tvars = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda], EmptyTree, alwaysAddTypeVars = true)._2 + val List(s, t, r) = tvars.tpes val innerCtx = ctx.fresh.setExploreTyperState() inContext(innerCtx) { @@ -37,8 +38,8 @@ class ConstraintsTest: @Test def mergeBoundsTransitivity: Unit = inCompilerContext(TestConfiguration.basicClasspath, scalaSources = "trait A { def foo[S, T]: Any }") { - val tp = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda]) - val List(s, t) = tp.paramRefs + val tvars = constrained(requiredClass("A").typeRef.select("foo".toTermName).info.asInstanceOf[TypeLambda], EmptyTree, alwaysAddTypeVars = true)._2 + val List(s, t) = tvars.tpes val innerCtx = ctx.fresh.setExploreTyperState() inContext(innerCtx) { diff --git a/tests/pos/stm.scala b/tests/pos/stm.scala new file mode 100644 index 000000000000..48ff946f9b5c --- /dev/null +++ b/tests/pos/stm.scala @@ -0,0 +1,10 @@ +class Inv[X] +class Ref[X] +object Ref { + def apply(i: Inv[Int], x: Int): Ref[Int] = ??? + def apply[Y](i: Inv[Y], x: Y): Ref[Y] = ??? +} + +class A { + val ref: Ref[List[AnyRef]] = Ref(new Inv[List[AnyRef]], List.empty) +} diff --git a/tests/pos/t0851.scala b/tests/pos/t0851.scala index fdc504af75c5..c7393723b148 100644 --- a/tests/pos/t0851.scala +++ b/tests/pos/t0851.scala @@ -1,9 +1,8 @@ package test object test1 { - case class Foo[T,T2](f : (T,T2) => String) extends (((T,T2)) => String){ + case class Foo[T,T2](f : (T,T2) => String) { def apply(t : T) = (s:T2) => f(t,s) - def apply(p : (T,T2)) = f(p._1,p._2) } implicit def g[T](f : (T,String) => String): Foo[T, String] = Foo(f) def main(args : Array[String]) : Unit = { diff --git a/tests/pos/t2913.scala b/tests/pos/t2913.scala index f91ed7b51318..9d7b898cbe9d 100644 --- a/tests/pos/t2913.scala +++ b/tests/pos/t2913.scala @@ -33,9 +33,8 @@ object TestNoAutoTupling { // t0851 is essentially the same: object test1 { - case class Foo[T,T2](f : (T,T2) => String) extends (((T,T2)) => String){ + case class Foo[T,T2](f : (T,T2) => String) { def apply(t : T) = (s:T2) => f(t,s) - def apply(p : (T,T2)) = f(p._1,p._2) } implicit def g[T](f : (T,String) => String): test1.Foo[T,String] = Foo(f) def main(args : Array[String]) : Unit = { From 478622df724f71ec768c36b2c8d725053d0e0bf7 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 21 Oct 2021 11:20:57 -0700 Subject: [PATCH 0792/1244] Warn on lossy conversion of literals & constants Co-authored-by: Dale Wijnand --- .../tools/dotc/reporting/ErrorMessageID.scala | 3 +- .../dotty/tools/dotc/reporting/messages.scala | 7 +++++ .../src/dotty/tools/dotc/typer/Typer.scala | 12 +++++++- .../fatal-warnings/i11333.check | 30 +++++++++++++++++++ .../fatal-warnings/i11333.scala | 12 ++++++++ 5 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 tests/neg-custom-args/fatal-warnings/i11333.check create mode 100644 tests/neg-custom-args/fatal-warnings/i11333.scala diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala index d1b95d31dd62..342e640ca819 100644 --- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala +++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala @@ -174,7 +174,8 @@ enum ErrorMessageID extends java.lang.Enum[ErrorMessageID]: OverrideTypeMismatchErrorID, OverrideErrorID, MatchableWarningID, - CannotExtendFunctionID + CannotExtendFunctionID, + LossyWideningConstantConversionID def errorNumber = ordinal - 2 diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala index 063ba96410c8..43f7f6f5ddb3 100644 --- a/compiler/src/dotty/tools/dotc/reporting/messages.scala +++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala @@ -807,6 +807,13 @@ import transform.SymUtils._ |""" } + class LossyWideningConstantConversion(sourceType: Type, targetType: Type)(using Context) + extends Message(LossyWideningConstantConversionID): + def kind = "Lossy Conversion" + def msg = em"""|Widening conversion from $sourceType to $targetType loses precision. + |Write `.to$targetType` instead.""".stripMargin + def explain = "" + class PatternMatchExhaustivity(uncoveredFn: => String, hasMore: Boolean)(using Context) extends Message(PatternMatchExhaustivityID) { def kind = "Pattern Match Exhaustivity" diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index ff8641f4b9c3..1d87e03a638a 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -719,7 +719,11 @@ class Typer extends Namer else if (target.isRef(defn.FloatClass)) tree.kind match { case Whole(16) => // cant parse hex literal as float - case _ => return lit(floatFromDigits(digits)) + case _ => + val float = floatFromDigits(digits) + if digits.toIntOption.exists(_ != float.toInt) then + report.warning(LossyWideningConstantConversion(defn.IntType, target), tree.srcPos) + return lit(float) } else if (target.isRef(defn.DoubleClass)) tree.kind match { @@ -3733,6 +3737,12 @@ class Typer extends Namer case ConstantType(x) => val converted = x.convertTo(pt) if converted != null && (converted ne x) then + val cls = pt.classSymbol + if x.tag == IntTag && cls == defn.FloatClass && x.intValue.toFloat.toInt != x.intValue + || x.tag == LongTag && cls == defn.FloatClass && x.longValue.toFloat.toLong != x.longValue + || x.tag == LongTag && cls == defn.DoubleClass && x.longValue.toDouble.toLong != x.longValue + then + report.warning(LossyWideningConstantConversion(x.tpe, pt), tree.srcPos) return adaptConstant(tree, ConstantType(converted)) case _ => diff --git a/tests/neg-custom-args/fatal-warnings/i11333.check b/tests/neg-custom-args/fatal-warnings/i11333.check new file mode 100644 index 000000000000..beef37c6460a --- /dev/null +++ b/tests/neg-custom-args/fatal-warnings/i11333.check @@ -0,0 +1,30 @@ +-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:2:19 ------------------------------- +2 | val f1: Float = 123456789 // error + | ^^^^^^^^^ + | Widening conversion from Int to Float loses precision. + | Write `.toFloat` instead. +-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:3:19 ------------------------------- +3 | val d1: Double = 1234567890123456789L // error + | ^^^^^^^^^^^^^^^^^^^^ + | Widening conversion from Long to Double loses precision. + | Write `.toDouble` instead. +-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:4:19 ------------------------------- +4 | val f2: Float = 123456789L // error + | ^^^^^^^^^^ + | Widening conversion from Long to Float loses precision. + | Write `.toFloat` instead. +-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:10:21 ------------------------------ +10 | val f1_b: Float = i1 // error + | ^^ + | Widening conversion from Int to Float loses precision. + | Write `.toFloat` instead. +-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:11:21 ------------------------------ +11 | val d1_b: Double = l1 // error + | ^^ + | Widening conversion from Long to Double loses precision. + | Write `.toDouble` instead. +-- [E167] Lossy Conversion Error: tests/neg-custom-args/fatal-warnings/i11333.scala:12:21 ------------------------------ +12 | val f2_b: Float = l2 // error + | ^^ + | Widening conversion from Long to Float loses precision. + | Write `.toFloat` instead. diff --git a/tests/neg-custom-args/fatal-warnings/i11333.scala b/tests/neg-custom-args/fatal-warnings/i11333.scala new file mode 100644 index 000000000000..3ba39efeb29e --- /dev/null +++ b/tests/neg-custom-args/fatal-warnings/i11333.scala @@ -0,0 +1,12 @@ +class C: + val f1: Float = 123456789 // error + val d1: Double = 1234567890123456789L // error + val f2: Float = 123456789L // error + + inline val i1 = 123456789 + inline val l1 = 1234567890123456789L + inline val l2 = 123456789L + + val f1_b: Float = i1 // error + val d1_b: Double = l1 // error + val f2_b: Float = l2 // error From a3e768d6e99e30eae7148d6f597a34881e1517e2 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 4 Nov 2021 10:58:36 +0100 Subject: [PATCH 0793/1244] Indicate name of classfile where leaky mapping of existential type happens Fixes #13873 --- .../tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 2 +- compiler/src/dotty/tools/dotc/reporting/messages.scala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index a04a17bb3689..18f3e0b19d87 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -739,7 +739,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas val anyTypes = boundSyms map (_ => defn.AnyType) val boundBounds = boundSyms map (_.info.bounds.hi) val tp2 = tp1.subst(boundSyms, boundBounds).subst(boundSyms, anyTypes) - report.warning(FailureToEliminateExistential(tp, tp1, tp2, boundSyms)) + report.warning(FailureToEliminateExistential(tp, tp1, tp2, boundSyms, classRoot.symbol)) tp2 } else tp1 diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala index 43f7f6f5ddb3..62bf295fed8c 100644 --- a/compiler/src/dotty/tools/dotc/reporting/messages.scala +++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala @@ -1772,13 +1772,13 @@ import transform.SymUtils._ def explain = "" } - class FailureToEliminateExistential(tp: Type, tp1: Type, tp2: Type, boundSyms: List[Symbol])(using Context) + class FailureToEliminateExistential(tp: Type, tp1: Type, tp2: Type, boundSyms: List[Symbol], classRoot: Symbol)(using Context) extends Message(FailureToEliminateExistentialID) { def kind: String = "Compatibility" def msg = val originalType = ctx.printer.dclsText(boundSyms, "; ").show - em"""An existential type that came from a Scala-2 classfile cannot be - |mapped accurately to to a Scala-3 equivalent. + em"""An existential type that came from a Scala-2 classfile for $classRoot + |cannot be mapped accurately to a Scala-3 equivalent. |original type : $tp forSome ${originalType} |reduces to : $tp1 |type used instead: $tp2 From 2088c9c17325cc535fb2cfdf9e40f9c640fa1682 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Fri, 5 Nov 2021 02:09:38 -0400 Subject: [PATCH 0794/1244] Change Untyped from Null to Nothing --- compiler/src/dotty/tools/dotc/ast/Trees.scala | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala index 5bdd18705051..7aa4491c31de 100644 --- a/compiler/src/dotty/tools/dotc/ast/Trees.scala +++ b/compiler/src/dotty/tools/dotc/ast/Trees.scala @@ -19,13 +19,7 @@ import Decorators._ object Trees { - // Note: it would be more logical to make Untyped = Nothing. - // However, this interacts in a bad way with Scala's current type inference. - // In fact, we cannot write something like Select(pre, name), where pre is - // of type Tree[Nothing]; type inference will treat the Nothing as an uninstantiated - // value and will not infer Nothing as the type parameter for Select. - // We should come back to this issue once type inference is changed. - type Untyped = Null + type Untyped = Nothing /** The total number of created tree nodes, maintained if Stats.enabled */ @sharable var ntrees: Int = 0 @@ -44,8 +38,7 @@ object Trees { * * - You can never observe a `tpe` which is `null` (throws an exception) * - So when creating a typed tree with `withType` we can re-use - * the existing tree transparently, assigning its `tpe` field, - * provided it was `null` before. + * the existing tree transparently, assigning its `tpe` field. * - It is impossible to embed untyped trees in typed ones. * - Typed trees can be embedded in untyped ones provided they are rooted * in a TypedSplice node. From 0eb1d5eaec73c58aac74a513a857efe33796c7b6 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 4 Nov 2021 13:11:17 +0100 Subject: [PATCH 0795/1244] Refine treatment of TypeBounds in patterns Only map type bounds to pattern-bound symbols at the toplevel of a pattern, or when they appear as type arguments. Do not map them in refinements. Fixes #13820 --- .../src/dotty/tools/dotc/typer/Typer.scala | 54 ++++++++++--------- .../fatal-warnings/i13820.scala | 5 ++ tests/pos/i13820.scala | 5 ++ 3 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 tests/neg-custom-args/fatal-warnings/i13820.scala create mode 100644 tests/pos/i13820.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 1d87e03a638a..f3cfed40f6c1 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -876,7 +876,7 @@ class Typer extends Namer wildName = nme.WILDCARD_STAR) } else { - def typedTpt = checkSimpleKinded(typedType(tree.tpt)) + def typedTpt = checkSimpleKinded(typedType(tree.tpt, mapPatternBounds = true)) def handlePattern: Tree = { val tpt1 = typedTpt if !ctx.isAfterTyper && pt != defn.ImplicitScrutineeTypeRef then @@ -1683,7 +1683,9 @@ class Typer extends Namer /** Type a case of a type match */ def typedTypeCase(cdef: untpd.CaseDef, selType: Type, pt: Type)(using Context): CaseDef = { def caseRest(using Context) = { - val pat1 = withMode(Mode.Pattern)(checkSimpleKinded(typedType(cdef.pat))) + val pat1 = withMode(Mode.Pattern) { + checkSimpleKinded(typedType(cdef.pat, mapPatternBounds = true)) + } val pat2 = indexPattern(cdef).transform(pat1) var body1 = typedType(cdef.body, pt) if !body1.isType then @@ -1924,7 +1926,7 @@ class Typer extends Namer // wildcard identifiers `_` instead. TypeTree(tparamBounds).withSpan(arg.span) case _ => - typed(desugaredArg, argPt) + typedType(desugaredArg, argPt, mapPatternBounds = true) } else desugaredArg.withType(UnspecifiedErrorType) } @@ -1991,36 +1993,18 @@ class Typer extends Namer assignType(cpy.ByNameTypeTree(tree)(result1), result1) } - def typedTypeBoundsTree(tree: untpd.TypeBoundsTree, pt: Type)(using Context): Tree = { + def typedTypeBoundsTree(tree: untpd.TypeBoundsTree, pt: Type)(using Context): Tree = val TypeBoundsTree(lo, hi, alias) = tree val lo1 = typed(lo) val hi1 = typed(hi) val alias1 = typed(alias) - val lo2 = if (lo1.isEmpty) typed(untpd.TypeTree(defn.NothingType)) else lo1 val hi2 = if (hi1.isEmpty) typed(untpd.TypeTree(defn.AnyType)) else hi1 - if !alias1.isEmpty then val bounds = TypeBounds(lo2.tpe, hi2.tpe) if !bounds.contains(alias1.tpe) then report.error(em"type ${alias1.tpe} outside bounds $bounds", tree.srcPos) - - val tree1 = assignType(cpy.TypeBoundsTree(tree)(lo2, hi2, alias1), lo2, hi2, alias1) - if (ctx.mode.is(Mode.Pattern)) - // Associate a pattern-bound type symbol with the wildcard. - // The bounds of the type symbol can be constrained when comparing a pattern type - // with an expected type in typedTyped. The type symbol and the defining Bind node - // are eliminated once the enclosing pattern has been typechecked; see `indexPattern` - // in `typedCase`. - //val ptt = if (lo.isEmpty && hi.isEmpty) pt else - if (ctx.isAfterTyper) tree1 - else { - val boundName = WildcardParamName.fresh().toTypeName - val wildcardSym = newPatternBoundSymbol(boundName, tree1.tpe & pt, tree.span) - untpd.Bind(boundName, tree1).withType(wildcardSym.typeRef) - } - else tree1 - } + assignType(cpy.TypeBoundsTree(tree)(lo2, hi2, alias1), lo2, hi2, alias1) def typedBind(tree: untpd.Bind, pt: Type)(using Context): Tree = { if !isFullyDefined(pt, ForceDegree.all) then @@ -2698,7 +2682,9 @@ class Typer extends Namer val pts = if (arity == pt.tupleArity) pt.tupleElementTypes else List.fill(arity)(defn.AnyType) - val elems = tree.trees.lazyZip(pts).map(typed(_, _)) + val elems = tree.trees.lazyZip(pts).map( + if ctx.mode.is(Mode.Type) then typedType(_, _, mapPatternBounds = true) + else typed(_, _)) if (ctx.mode.is(Mode.Type)) elems.foldRight(TypeTree(defn.EmptyTupleModule.termRef): Tree)((elemTpt, elemTpts) => AppliedTypeTree(TypeTree(defn.PairClass.typeRef), List(elemTpt, elemTpts))) @@ -3029,8 +3015,24 @@ class Typer extends Namer def typedExpr(tree: untpd.Tree, pt: Type = WildcardType)(using Context): Tree = withoutMode(Mode.PatternOrTypeBits)(typed(tree, pt)) - def typedType(tree: untpd.Tree, pt: Type = WildcardType)(using Context): Tree = // todo: retract mode between Type and Pattern? - withMode(Mode.Type) { typed(tree, pt) } + + def typedType(tree: untpd.Tree, pt: Type = WildcardType, mapPatternBounds: Boolean = false)(using Context): Tree = + val tree1 = withMode(Mode.Type) { typed(tree, pt) } + if mapPatternBounds && ctx.mode.is(Mode.Pattern) && !ctx.isAfterTyper then + tree1 match + case tree1: TypeBoundsTree => + // Associate a pattern-bound type symbol with the wildcard. + // The bounds of the type symbol can be constrained when comparing a pattern type + // with an expected type in typedTyped. The type symbol and the defining Bind node + // are eliminated once the enclosing pattern has been typechecked; see `indexPattern` + // in `typedCase`. + val boundName = WildcardParamName.fresh().toTypeName + val wildcardSym = newPatternBoundSymbol(boundName, tree1.tpe & pt, tree.span) + untpd.Bind(boundName, tree1).withType(wildcardSym.typeRef) + case tree1 => + tree1 + else tree1 + def typedPattern(tree: untpd.Tree, selType: Type = WildcardType)(using Context): Tree = withMode(Mode.Pattern)(typed(tree, selType)) diff --git a/tests/neg-custom-args/fatal-warnings/i13820.scala b/tests/neg-custom-args/fatal-warnings/i13820.scala new file mode 100644 index 000000000000..234c1a55450e --- /dev/null +++ b/tests/neg-custom-args/fatal-warnings/i13820.scala @@ -0,0 +1,5 @@ +trait Expr { type T } + +def foo[A](e: Expr { type T = A }) = e match + case e1: Expr { type T <: Int } => // error: type test cannot be checked at runtime + val i: Int = ??? : e1.T \ No newline at end of file diff --git a/tests/pos/i13820.scala b/tests/pos/i13820.scala new file mode 100644 index 000000000000..1accdee53fb1 --- /dev/null +++ b/tests/pos/i13820.scala @@ -0,0 +1,5 @@ +trait Expr { type T } + +def foo[A](e: Expr { type T = A }) = e match + case e1: Expr { type T <: Int } => + val i: Int = ??? : e1.T \ No newline at end of file From 07e1a8ede01a358497d40749cc6329e8389de701 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sat, 6 Nov 2021 11:51:26 +0100 Subject: [PATCH 0796/1244] Fix crasher for missing integer argument on command line Fixes #13893 --- .../dotty/tools/dotc/config/Settings.scala | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/config/Settings.scala b/compiler/src/dotty/tools/dotc/config/Settings.scala index 1922007adc11..29a52defa4c6 100644 --- a/compiler/src/dotty/tools/dotc/config/Settings.scala +++ b/compiler/src/dotty/tools/dotc/config/Settings.scala @@ -98,16 +98,33 @@ object Settings: changed = true ArgsSummary(updateIn(sstate, value1), args, errors, dangers) end update + def fail(msg: String, args: List[String]) = ArgsSummary(sstate, args, errors :+ msg, warnings) + def missingArg = fail(s"missing argument for option $name", args) + def setString(argValue: String, args: List[String]) = choices match case Some(xs) if !xs.contains(argValue) => fail(s"$argValue is not a valid choice for $name", args) case _ => update(argValue, args) + + def setInt(argValue: String, args: List[String]) = + try + val x = argValue.toInt + choices match + case Some(r: Range) if x < r.head || r.last < x => + fail(s"$argValue is out of legal range ${r.head}..${r.last} for $name", args) + case Some(xs) if !xs.contains(x) => + fail(s"$argValue is not a valid choice for $name", args) + case _ => + update(x, args) + catch case _: NumberFormatException => + fail(s"$argValue is not an integer argument for $name", args) + def doSet(argRest: String) = ((implicitly[ClassTag[T]], args): @unchecked) match { case (BooleanTag, _) => update(true, args) @@ -136,23 +153,10 @@ object Settings: val output = if (isJar) JarArchive.create(path) else new PlainDirectory(path) update(output, args) } - case (IntTag, _) => - val arg2 :: args2 = if (argRest == "") args else argRest :: args - try { - val x = arg2.toInt - choices match { - case Some(r: Range) if x < r.head || r.last < x => - fail(s"$arg2 is out of legal range ${r.head}..${r.last} for $name", args2) - case Some(xs) if !xs.contains(x) => - fail(s"$arg2 is not a valid choice for $name", args) - case _ => - update(x, args2) - } - } - catch { - case _: NumberFormatException => - fail(s"$arg2 is not an integer argument for $name", args2) - } + case (IntTag, args) if argRest.nonEmpty => + setInt(argRest, args) + case (IntTag, arg2 :: args2) => + setInt(arg2, args2) case (VersionTag, _) => ScalaVersion.parse(argRest) match { case Success(v) => update(v, args) From 119735cb7b77da9cc0a18335166e0e7c5697e530 Mon Sep 17 00:00:00 2001 From: danicheg Date: Sun, 7 Nov 2021 14:26:57 +0300 Subject: [PATCH 0797/1244] Fix link in the IDE support page --- docs/docs/usage/ide-support.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/usage/ide-support.md b/docs/docs/usage/ide-support.md index eabfe29ecf49..25739b021b78 100644 --- a/docs/docs/usage/ide-support.md +++ b/docs/docs/usage/ide-support.md @@ -4,4 +4,4 @@ title: "IDE support for Scala 3" movedTo: https://docs.scala-lang.org/scala3/getting-started.html --- -This page is deprecated. Plese go to [getting-started](getting-started.md) +This page is deprecated. Please go to the [getting-started](https://docs.scala-lang.org/scala3/getting-started.html) From f027b77d1e0f3cbdf0f79479af079e1ce37cbeda Mon Sep 17 00:00:00 2001 From: danicheg Date: Sun, 7 Nov 2021 14:28:56 +0300 Subject: [PATCH 0798/1244] Fix link in the SBT projects page --- docs/docs/usage/sbt-projects.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/usage/sbt-projects.md b/docs/docs/usage/sbt-projects.md index 4b0b72f78f77..13a61eff27db 100644 --- a/docs/docs/usage/sbt-projects.md +++ b/docs/docs/usage/sbt-projects.md @@ -3,4 +3,4 @@ layout: doc-page title: "Using Dotty with sbt" --- -To try it in your project see the [Getting Started User Guide](./getting-started.md). +To try it in your project see the [Getting Started User Guide](https://docs.scala-lang.org/scala3/getting-started.html). From b6a643827b3cc3b26f8f74ca7c991c154e93c521 Mon Sep 17 00:00:00 2001 From: Ondrej Lhotak Date: Fri, 8 Oct 2021 12:04:10 +0200 Subject: [PATCH 0799/1244] enable -Yexplicit-nulls for scala3-library --- library/src/scala/IArray.scala | 31 +++++++++++-------- library/src/scala/reflect/Selectable.scala | 4 +-- library/src/scala/runtime/LazyVals.scala | 10 +++--- library/src/scala/runtime/Scala3RunTime.scala | 3 +- library/src/scala/util/FromDigits.scala | 4 +-- project/Build.scala | 1 + 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/library/src/scala/IArray.scala b/library/src/scala/IArray.scala index c5679ae7aaf9..c930fc8e4db8 100644 --- a/library/src/scala/IArray.scala +++ b/library/src/scala/IArray.scala @@ -328,54 +328,59 @@ object IArray: extension [T, U >: T: ClassTag](x: T) def +:(arr: IArray[U]): IArray[U] = genericArrayOps(arr).prepended(x) + // For backwards compatibility with code compiled without -Yexplicit-nulls + private def mapNull[A, B](a: A, f: =>B): B = + if((a: A|Null) == null) null.asInstanceOf[B] else f + /** Conversion from IArray to immutable.ArraySeq */ implicit def genericWrapArray[T](arr: IArray[T]): ArraySeq[T] = - if arr eq null then null else ArraySeq.unsafeWrapArray(arr) + mapNull(arr, ArraySeq.unsafeWrapArray(arr)) /** Conversion from IArray to immutable.ArraySeq */ implicit def wrapRefArray[T <: AnyRef](arr: IArray[T]): ArraySeq.ofRef[T] = // Since the JVM thinks arrays are covariant, one 0-length Array[AnyRef] // is as good as another for all T <: AnyRef. Instead of creating 100,000,000 // unique ones by way of this implicit, let's share one. - if (arr eq null) null - else if (arr.length == 0) ArraySeq.empty[AnyRef].asInstanceOf[ArraySeq.ofRef[T]] - else ArraySeq.ofRef(arr.asInstanceOf[Array[T]]) + mapNull(arr, + if (arr.length == 0) ArraySeq.empty[AnyRef].asInstanceOf[ArraySeq.ofRef[T]] + else ArraySeq.ofRef(arr.asInstanceOf[Array[T]]) + ) /** Conversion from IArray to immutable.ArraySeq */ implicit def wrapIntArray(arr: IArray[Int]): ArraySeq.ofInt = - if (arr ne null) new ArraySeq.ofInt(arr.asInstanceOf[Array[Int]]) else null + mapNull(arr, new ArraySeq.ofInt(arr.asInstanceOf[Array[Int]])) /** Conversion from IArray to immutable.ArraySeq */ implicit def wrapDoubleIArray(arr: IArray[Double]): ArraySeq.ofDouble = - if (arr ne null) new ArraySeq.ofDouble(arr.asInstanceOf[Array[Double]]) else null + mapNull(arr, new ArraySeq.ofDouble(arr.asInstanceOf[Array[Double]])) /** Conversion from IArray to immutable.ArraySeq */ implicit def wrapLongIArray(arr: IArray[Long]): ArraySeq.ofLong = - if (arr ne null) new ArraySeq.ofLong(arr.asInstanceOf[Array[Long]]) else null + mapNull(arr, new ArraySeq.ofLong(arr.asInstanceOf[Array[Long]])) /** Conversion from IArray to immutable.ArraySeq */ implicit def wrapFloatIArray(arr: IArray[Float]): ArraySeq.ofFloat = - if (arr ne null) new ArraySeq.ofFloat(arr.asInstanceOf[Array[Float]]) else null + mapNull(arr, new ArraySeq.ofFloat(arr.asInstanceOf[Array[Float]])) /** Conversion from IArray to immutable.ArraySeq */ implicit def wrapCharIArray(arr: IArray[Char]): ArraySeq.ofChar = - if (arr ne null) new ArraySeq.ofChar(arr.asInstanceOf[Array[Char]]) else null + mapNull(arr, new ArraySeq.ofChar(arr.asInstanceOf[Array[Char]])) /** Conversion from IArray to immutable.ArraySeq */ implicit def wrapByteIArray(arr: IArray[Byte]): ArraySeq.ofByte = - if (arr ne null) new ArraySeq.ofByte(arr.asInstanceOf[Array[Byte]]) else null + mapNull(arr, new ArraySeq.ofByte(arr.asInstanceOf[Array[Byte]])) /** Conversion from IArray to immutable.ArraySeq */ implicit def wrapShortIArray(arr: IArray[Short]): ArraySeq.ofShort = - if (arr ne null) new ArraySeq.ofShort(arr.asInstanceOf[Array[Short]]) else null + mapNull(arr, new ArraySeq.ofShort(arr.asInstanceOf[Array[Short]])) /** Conversion from IArray to immutable.ArraySeq */ implicit def wrapBooleanIArray(arr: IArray[Boolean]): ArraySeq.ofBoolean = - if (arr ne null) new ArraySeq.ofBoolean(arr.asInstanceOf[Array[Boolean]]) else null + mapNull(arr, new ArraySeq.ofBoolean(arr.asInstanceOf[Array[Boolean]])) /** Conversion from IArray to immutable.ArraySeq */ implicit def wrapUnitIArray(arr: IArray[Unit]): ArraySeq.ofUnit = - if (arr ne null) new ArraySeq.ofUnit(arr.asInstanceOf[Array[Unit]]) else null + mapNull(arr, new ArraySeq.ofUnit(arr.asInstanceOf[Array[Unit]])) /** Convert an array into an immutable array without copying, the original array * must _not_ be mutated after this or the guaranteed immutablity of IArray will diff --git a/library/src/scala/reflect/Selectable.scala b/library/src/scala/reflect/Selectable.scala index 0286eba5a35e..f0bc1f197f5d 100644 --- a/library/src/scala/reflect/Selectable.scala +++ b/library/src/scala/reflect/Selectable.scala @@ -21,7 +21,7 @@ trait Selectable extends scala.Selectable: final def selectDynamic(name: String): Any = val rcls = selectedValue.getClass try - val fld = rcls.getField(name) + val fld = rcls.getField(name).nn ensureAccessible(fld) fld.get(selectedValue) catch case ex: NoSuchFieldException => @@ -35,7 +35,7 @@ trait Selectable extends scala.Selectable: */ final def applyDynamic(name: String, paramTypes: Class[_]*)(args: Any*): Any = val rcls = selectedValue.getClass - val mth = rcls.getMethod(name, paramTypes: _*) + val mth = rcls.getMethod(name, paramTypes: _*).nn ensureAccessible(mth) mth.invoke(selectedValue, args.asInstanceOf[Seq[AnyRef]]: _*) diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala index e370e3cf250d..eeb955faecae 100644 --- a/library/src/scala/runtime/LazyVals.scala +++ b/library/src/scala/runtime/LazyVals.scala @@ -7,13 +7,13 @@ import scala.language.unsafeNulls */ object LazyVals { private[this] val unsafe: sun.misc.Unsafe = - classOf[sun.misc.Unsafe].getDeclaredFields.find { field => - field.getType == classOf[sun.misc.Unsafe] && { - field.setAccessible(true) + classOf[sun.misc.Unsafe].getDeclaredFields.nn.find { field => + field.nn.getType == classOf[sun.misc.Unsafe] && { + field.nn.setAccessible(true) true } } - .map(_.get(null).asInstanceOf[sun.misc.Unsafe]) + .map(_.nn.get(null).asInstanceOf[sun.misc.Unsafe]) .getOrElse { throw new ExceptionInInitializerError { new IllegalStateException("Can't find instance of sun.misc.Unsafe") @@ -21,7 +21,7 @@ object LazyVals { } private[this] val base: Int = { - val processors = java.lang.Runtime.getRuntime.availableProcessors() + val processors = java.lang.Runtime.getRuntime.nn.availableProcessors() 8 * processors * processors } private[this] val monitors: Array[Object] = diff --git a/library/src/scala/runtime/Scala3RunTime.scala b/library/src/scala/runtime/Scala3RunTime.scala index fa141628ceec..b1645f5242aa 100644 --- a/library/src/scala/runtime/Scala3RunTime.scala +++ b/library/src/scala/runtime/Scala3RunTime.scala @@ -15,7 +15,8 @@ object Scala3RunTime: * Extracted to minimize the bytecode size at call site. */ def nn[T](x: T | Null): x.type & T = - if (x == null) throw new NullPointerException("tried to cast away nullability, but value is null") + val isNull = x == null + if (isNull) throw new NullPointerException("tried to cast away nullability, but value is null") else x.asInstanceOf[x.type & T] end Scala3RunTime diff --git a/library/src/scala/util/FromDigits.scala b/library/src/scala/util/FromDigits.scala index 1c5346ad6b97..1577f4103e03 100644 --- a/library/src/scala/util/FromDigits.scala +++ b/library/src/scala/util/FromDigits.scala @@ -135,7 +135,7 @@ object FromDigits { case ex: NumberFormatException => throw MalformedNumber() } if (x.isInfinite) throw NumberTooLarge() - if (x == 0.0f && !zeroFloat.pattern.matcher(digits).matches) throw NumberTooSmall() + if (x == 0.0f && !zeroFloat.pattern.matcher(digits).nn.matches) throw NumberTooSmall() x } @@ -153,7 +153,7 @@ object FromDigits { case ex: NumberFormatException => throw MalformedNumber() } if (x.isInfinite) throw NumberTooLarge() - if (x == 0.0d && !zeroFloat.pattern.matcher(digits).matches) throw NumberTooSmall() + if (x == 0.0d && !zeroFloat.pattern.matcher(digits).nn.matches) throw NumberTooSmall() x } diff --git a/project/Build.scala b/project/Build.scala index ff99753add6e..adbedca984dd 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -790,6 +790,7 @@ object Build { (Compile / scalacOptions) ++= Seq( // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called "-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(File.pathSeparator), + "-Yexplicit-nulls", ), ) From 481dfb1688b24b8ecacbed95bedffa46d0c7840f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lhot=C3=A1k?= Date: Tue, 12 Oct 2021 10:10:19 +0200 Subject: [PATCH 0800/1244] inline mapNull to avoid creating closures Co-authored-by: Nicolas Stucki --- library/src/scala/IArray.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/scala/IArray.scala b/library/src/scala/IArray.scala index c930fc8e4db8..72124bdf8215 100644 --- a/library/src/scala/IArray.scala +++ b/library/src/scala/IArray.scala @@ -329,7 +329,7 @@ object IArray: def +:(arr: IArray[U]): IArray[U] = genericArrayOps(arr).prepended(x) // For backwards compatibility with code compiled without -Yexplicit-nulls - private def mapNull[A, B](a: A, f: =>B): B = + private inline def mapNull[A, B](a: A, inline f: B): B = if((a: A|Null) == null) null.asInstanceOf[B] else f /** Conversion from IArray to immutable.ArraySeq */ From 13a8b9f9ed88d74bdd35c92bd8049f5fc948cb88 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 3 Nov 2021 12:42:31 +0100 Subject: [PATCH 0801/1244] Disallow throws clauses over RuntimeExceptions Fixes #13846 --- compiler/src/dotty/tools/dotc/typer/Typer.scala | 12 +++++++++--- tests/neg/i13846.check | 17 +++++++++++++++++ tests/neg/i13846.scala | 9 +++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 tests/neg/i13846.check create mode 100644 tests/neg/i13846.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index f3cfed40f6c1..878b57778de0 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1942,14 +1942,20 @@ class Typer extends Namer } var checkedArgs = preCheckKinds(args1, paramBounds) // check that arguments conform to bounds is done in phase PostTyper - if (tpt1.symbol == defn.andType) + val tycon = tpt1.symbol + if (tycon == defn.andType) checkedArgs = checkedArgs.mapconserve(arg => checkSimpleKinded(checkNoWildcard(arg))) - else if (tpt1.symbol == defn.orType) + else if (tycon == defn.orType) checkedArgs = checkedArgs.mapconserve(arg => checkSimpleKinded(checkNoWildcard(arg))) + else if tycon == defn.throwsAlias + && checkedArgs.length == 2 + && checkedArgs(1).tpe.derivesFrom(defn.RuntimeExceptionClass) + then + report.error(em"throws clause cannot be defined for RuntimeException", checkedArgs(1).srcPos) else if (ctx.isJava) - if (tpt1.symbol eq defn.ArrayClass) then + if tycon eq defn.ArrayClass then checkedArgs match { case List(arg) => val elemtp = arg.tpe.translateJavaArrayElementType diff --git a/tests/neg/i13846.check b/tests/neg/i13846.check new file mode 100644 index 000000000000..50de19874b8c --- /dev/null +++ b/tests/neg/i13846.check @@ -0,0 +1,17 @@ +-- Error: tests/neg/i13846.scala:3:22 ---------------------------------------------------------------------------------- +3 |def foo(): Int throws ArithmeticException = 1 / 0 // error + | ^^^^^^^^^^^^^^^^^^^ + | throws clause cannot be defined for RuntimeException +-- Error: tests/neg/i13846.scala:7:9 ----------------------------------------------------------------------------------- +7 | foo() // error + | ^ + | The capability to throw exception ArithmeticException is missing. + | The capability can be provided by one of the following: + | - A using clause `(using CanThrow[ArithmeticException])` + | - A `throws` clause in a result type such as `X throws ArithmeticException` + | - an enclosing `try` that catches ArithmeticException + | + | The following import might fix the problem: + | + | import unsafeExceptions.canThrowAny + | diff --git a/tests/neg/i13846.scala b/tests/neg/i13846.scala new file mode 100644 index 000000000000..ac2a8ebd8eef --- /dev/null +++ b/tests/neg/i13846.scala @@ -0,0 +1,9 @@ +import language.experimental.saferExceptions + +def foo(): Int throws ArithmeticException = 1 / 0 // error + +def test(): Unit = + try + foo() // error + catch + case _: ArithmeticException => println("Caught") From efc628ec15b9a3d658629921a8d8df4fe5c23309 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 3 Nov 2021 12:46:01 +0100 Subject: [PATCH 0802/1244] Don't generate CanThrow capabilities for catches with guards --- compiler/src/dotty/tools/dotc/typer/Typer.scala | 2 +- tests/neg/i13849.scala | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 tests/neg/i13849.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 878b57778de0..61cb0a9b4723 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1751,7 +1751,7 @@ class Typer extends Namer .withSpan(expr.span) val caps = for - CaseDef(pat, _, _) <- cases + case CaseDef(pat, EmptyTree, _) <- cases if Feature.enabled(Feature.saferExceptions) && pat.tpe.widen.isCheckedException yield makeCanThrow(pat.tpe.widen) caps.foldLeft(expr)((e, g) => untpd.Block(g :: Nil, e)) diff --git a/tests/neg/i13849.scala b/tests/neg/i13849.scala new file mode 100644 index 000000000000..66d5976dc08b --- /dev/null +++ b/tests/neg/i13849.scala @@ -0,0 +1,16 @@ +import annotation.experimental +import language.experimental.saferExceptions + +@experimental +case class Ex(i: Int) extends Exception(s"Exception: $i") + +@experimental +def foo(): Unit throws Ex = throw Ex(1) + +@experimental +object Main: + def main(args: Array[String]): Unit = + try + foo() // error + catch + case _: Ex if false => println("Caught") From c561ec1d561bc66f44b50b1a310cb64d482b8fca Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 3 Nov 2021 14:34:49 +0100 Subject: [PATCH 0803/1244] Restrict catch patterns under saferExceptions Restrict catch patterns to `ex: T` with no guard under saferExceptions so that capabilities can be generated safely. Fixes #13849 --- .../src/dotty/tools/dotc/typer/Checking.scala | 17 +++++++++++++++++ .../src/dotty/tools/dotc/typer/Typer.scala | 7 +++++-- tests/neg/i13849.check | 5 +++++ tests/neg/i13849.scala | 4 ++-- tests/neg/i13864.check | 18 ++++++++++++++++++ tests/neg/i13864.scala | 11 +++++++++++ 6 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 tests/neg/i13849.check create mode 100644 tests/neg/i13864.check create mode 100644 tests/neg/i13864.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index 3b743906fd51..185b0584a5a2 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -33,6 +33,7 @@ import NameKinds.DefaultGetterName import NameOps._ import SymDenotations.{NoCompleter, NoDenotation} import Applications.unapplyArgs +import Inferencing.isFullyDefined import transform.patmat.SpaceEngine.isIrrefutable import config.Feature import config.Feature.sourceVersion @@ -1362,6 +1363,21 @@ trait Checking { def checkCanThrow(tp: Type, span: Span)(using Context): Unit = if Feature.enabled(Feature.saferExceptions) && tp.isCheckedException then ctx.typer.implicitArgTree(defn.CanThrowClass.typeRef.appliedTo(tp), span) + + /** Check that catch can generate a good CanThrow exception */ + def checkCatch(pat: Tree, guard: Tree)(using Context): Unit = pat match + case Typed(_: Ident, tpt) if isFullyDefined(tpt.tpe, ForceDegree.none) && guard.isEmpty => + // OK + case Bind(_, pat1) => + checkCatch(pat1, guard) + case _ => + val req = + if guard.isEmpty then "for cases of the form `ex: T` where `T` is fully defined" + else "if no pattern guard is given" + report.error( + em"""Implementation restriction: cannot generate CanThrow capability for this kind of catch. + |CanThrow capabilities can only be generated $req.""", + pat.srcPos) } trait ReChecking extends Checking { @@ -1375,6 +1391,7 @@ trait ReChecking extends Checking { override def checkMatchable(tp: Type, pos: SrcPos, pattern: Boolean)(using Context): Unit = () override def checkNoModuleClash(sym: Symbol)(using Context) = () override def checkCanThrow(tp: Type, span: Span)(using Context): Unit = () + override def checkCatch(pat: Tree, guard: Tree)(using Context): Unit = () } trait NoChecking extends ReChecking { diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 61cb0a9b4723..4c2533d6dbba 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1751,9 +1751,12 @@ class Typer extends Namer .withSpan(expr.span) val caps = for - case CaseDef(pat, EmptyTree, _) <- cases + case CaseDef(pat, guard, _) <- cases if Feature.enabled(Feature.saferExceptions) && pat.tpe.widen.isCheckedException - yield makeCanThrow(pat.tpe.widen) + yield + checkCatch(pat, guard) + makeCanThrow(pat.tpe.widen) + caps.foldLeft(expr)((e, g) => untpd.Block(g :: Nil, e)) def typedTry(tree: untpd.Try, pt: Type)(using Context): Try = { diff --git a/tests/neg/i13849.check b/tests/neg/i13849.check new file mode 100644 index 000000000000..6dafaaa30ff1 --- /dev/null +++ b/tests/neg/i13849.check @@ -0,0 +1,5 @@ +-- Error: tests/neg/i13849.scala:16:11 --------------------------------------------------------------------------------- +16 | case _: Ex if false => println("Caught") // error + | ^^^^^ + | Implementation restriction: cannot generate CanThrow capability for this kind of catch. + | CanThrow capabilities can only be generated if no pattern guard is given. diff --git a/tests/neg/i13849.scala b/tests/neg/i13849.scala index 66d5976dc08b..9b734db4be7d 100644 --- a/tests/neg/i13849.scala +++ b/tests/neg/i13849.scala @@ -11,6 +11,6 @@ def foo(): Unit throws Ex = throw Ex(1) object Main: def main(args: Array[String]): Unit = try - foo() // error + foo() catch - case _: Ex if false => println("Caught") + case _: Ex if false => println("Caught") // error diff --git a/tests/neg/i13864.check b/tests/neg/i13864.check new file mode 100644 index 000000000000..bce0788d31ce --- /dev/null +++ b/tests/neg/i13864.check @@ -0,0 +1,18 @@ +-- Error: tests/neg/i13864.scala:11:9 ---------------------------------------------------------------------------------- +11 | case Ex(i: Int) => println("Caught an Int") // error + | ^^^^^^^^^^ + | Implementation restriction: cannot generate CanThrow capability for this kind of catch. + | CanThrow capabilities can only be generated for cases of the form `ex: T` where `T` is fully defined. +-- Error: tests/neg/i13864.scala:9:10 ---------------------------------------------------------------------------------- +9 | foo(1) // error + | ^ + | The capability to throw exception Ex[Int] is missing. + | The capability can be provided by one of the following: + | - A using clause `(using CanThrow[Ex[Int]])` + | - A `throws` clause in a result type such as `X throws Ex[Int]` + | - an enclosing `try` that catches Ex[Int] + | + | The following import might fix the problem: + | + | import unsafeExceptions.canThrowAny + | diff --git a/tests/neg/i13864.scala b/tests/neg/i13864.scala new file mode 100644 index 000000000000..3053a2b12e87 --- /dev/null +++ b/tests/neg/i13864.scala @@ -0,0 +1,11 @@ +import language.experimental.saferExceptions + +case class Ex[A](a: A) extends Exception(s"Ex: $a") + +def foo[A](a: A): Unit throws Ex[A] = throw new Ex(a) + +def test(): Unit = + try + foo(1) // error + catch + case Ex(i: Int) => println("Caught an Int") // error From 9db418e97942f10c6ba4fb97da6d919735cf1fed Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 5 Nov 2021 19:17:14 +0100 Subject: [PATCH 0804/1244] Add explanation about restrictions to docs --- docs/docs/reference/experimental/canthrow.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md index aaf637b06806..6377a040b515 100644 --- a/docs/docs/reference/experimental/canthrow.md +++ b/docs/docs/reference/experimental/canthrow.md @@ -179,6 +179,20 @@ closure may refer to capabilities in its free variables. This means that `map` i already effect polymorphic even though we did not change its signature at all. So the takeaway is that the effects as capabilities model naturally provides for effect polymorphism whereas this is something that other approaches struggle with. +**Note 1:** The compiler will only treat checked exceptions that way. An exception type is _checked_ if it is a subtype of +`Exception` but not of `RuntimeException`. The signature of `CanThrow` still admits `RuntimeException`s since `RuntimeException` is a proper subtype of its bound, `Exception`. But no capabilities will be generated for `RuntimeException`s. Furthermore, `throws` clauses +also may not refer to `RuntimeException`s. + +**Note 2:** To keep things simple, the compiler will currently only generate capabilities +for catch clauses of the form +```scala + case ex: Ex => +``` +where `ex` is an arbitrary variable name (`_` is also allowed), and `Ex` is an arbitrary +checked exception type. Constructor patterns such as `Ex(...)` or patterns with guards +are not allowed. The compiler will issue an error if one of these is used to catch +a checked exception and `saferExceptions` is enabled. + ## Gradual Typing Via Imports Another advantage is that the model allows a gradual migration from current unchecked exceptions to safer exceptions. Imagine for a moment that `experimental.saferExceptions` is turned on everywhere. There would be lots of code that breaks since functions have not yet been properly annotated with `throws`. But it's easy to create an escape hatch that lets us ignore the breakages for a while: simply add the import From 7a3cec0f14f25f43a75c2037d7deb824c501ca04 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Wed, 3 Nov 2021 16:15:00 +0100 Subject: [PATCH 0805/1244] Add missing position when expanding `error` Closes #13871. This issue was already fixed but failed `-Ycheck` due to the missing position. --- compiler/src/dotty/tools/dotc/typer/Inliner.scala | 6 +++--- compiler/test/dotc/pos-test-pickling.blacklist | 1 + tests/pos/i13871.scala | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 tests/pos/i13871.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index b4264dee6e64..4fede9b6b9e4 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -367,9 +367,9 @@ object Inliner { lit(error.pos.column), if kind == ErrorKind.Parser then parserErrorKind else typerErrorKind) - private def packErrors(errors: List[(ErrorKind, Error)])(using Context): Tree = + private def packErrors(errors: List[(ErrorKind, Error)], pos: SrcPos)(using Context): Tree = val individualErrors: List[Tree] = errors.map(packError) - val errorTpt = ref(defn.CompiletimeTesting_ErrorClass) + val errorTpt = ref(defn.CompiletimeTesting_ErrorClass).withSpan(pos.span) mkList(individualErrors, errorTpt) /** Expand call to scala.compiletime.testing.typeChecks */ @@ -380,7 +380,7 @@ object Inliner { /** Expand call to scala.compiletime.testing.typeCheckErrors */ def typeCheckErrors(tree: Tree)(using Context): Tree = val errors = compileForErrors(tree) - packErrors(errors) + packErrors(errors, tree) /** Expand call to scala.compiletime.codeOf */ def codeOf(arg: Tree, pos: SrcPos)(using Context): Tree = diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist index 7136b2f7ac74..9c94e5968fce 100644 --- a/compiler/test/dotc/pos-test-pickling.blacklist +++ b/compiler/test/dotc/pos-test-pickling.blacklist @@ -17,6 +17,7 @@ i7740a.scala i7740b.scala i6507b.scala i12299a.scala +i13871.scala # Tree is huge and blows stack for printing Text i7034.scala diff --git a/tests/pos/i13871.scala b/tests/pos/i13871.scala new file mode 100644 index 000000000000..3b1ed0f1f06c --- /dev/null +++ b/tests/pos/i13871.scala @@ -0,0 +1,10 @@ +import scala.compiletime.{error, codeOf} +import scala.compiletime.testing.* + +inline def testError(inline typeName: Any): String = error("Got error " + codeOf(typeName)) + +transparent inline def compileErrors(inline code: String): List[Error] = typeCheckErrors(code) + +def test = + typeCheckErrors("""testError("string")""") + compileErrors("""testError("string")""") From cb1e2866984e12806359181308b213002e523843 Mon Sep 17 00:00:00 2001 From: Eric Torreborre Date: Thu, 21 Oct 2021 10:25:11 +0200 Subject: [PATCH 0806/1244] added specs2 --- .gitmodules | 3 +++ community-build/community-projects/specs2 | 1 + .../src/scala/dotty/communitybuild/projects.scala | 8 ++++++++ .../scala/dotty/communitybuild/CommunityBuildTest.scala | 1 + 4 files changed, 13 insertions(+) create mode 160000 community-build/community-projects/specs2 diff --git a/.gitmodules b/.gitmodules index 1b50ef1cc54b..2977e923b55e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -213,3 +213,6 @@ [submodule "community-build/community-projects/scala-java8-compat"] path = community-build/community-projects/scala-java8-compat url = https://github.com/dotty-staging/scala-java8-compat.git +[submodule "community-build/community-projects/specs2"] + path = community-build/community-projects/specs2 + url = https://github.com/etorreborre/specs2.git diff --git a/community-build/community-projects/specs2 b/community-build/community-projects/specs2 new file mode 160000 index 000000000000..0652daeefb57 --- /dev/null +++ b/community-build/community-projects/specs2 @@ -0,0 +1 @@ +Subproject commit 0652daeefb57c2d51e3f16ea5c44929bdba722bf diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 6d31cd73b54c..c258154a5c20 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -731,6 +731,13 @@ object projects: dependencies = List(scalaJava8Compat, scalatest) ) + lazy val specs2 = SbtCommunityProject( + project = "specs2", + sbtTestCommand = "core/test", + sbtPublishCommand = "core/publishLocal", + dependencies = List() + ) + end projects def allProjects = List( @@ -809,6 +816,7 @@ def allProjects = List( projects.fs2, projects.libretto, projects.jacksonModuleScala, + projects.specs2, ) lazy val projectMap = allProjects.groupBy(_.project) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index c1d748b4d3ad..9b5c17e85965 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -91,6 +91,7 @@ class CommunityBuildTestC: @Test def sconfig = projects.sconfig.run() @Test def shapeless = projects.shapeless.run() @Test def sourcecode = projects.sourcecode.run() + @Test def specs2 = projects.specs2.run() @Test def stdLib213 = projects.stdLib213.run() @Test def ujson = projects.ujson.run() @Test def upickle = projects.upickle.run() From e227571e4a51716ec43788cc01952ab63fdcaa84 Mon Sep 17 00:00:00 2001 From: Eric Torreborre Date: Thu, 4 Nov 2021 09:58:17 +0100 Subject: [PATCH 0807/1244] exclude some specs2 tests from CI --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index c258154a5c20..61c72f8088f0 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -733,7 +733,7 @@ object projects: lazy val specs2 = SbtCommunityProject( project = "specs2", - sbtTestCommand = "core/test", + sbtTestCommand = "core/testOnly -- exclude ci", sbtPublishCommand = "core/publishLocal", dependencies = List() ) From 607a1ca7f576ac5150b9ad8afe34ac0941627e3b Mon Sep 17 00:00:00 2001 From: Eric Torreborre Date: Tue, 9 Nov 2021 09:27:22 +0100 Subject: [PATCH 0808/1244] use the https://github.com/dotty-staging/specs2 repo as a submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2977e923b55e..d93aab9aa8fe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -215,4 +215,4 @@ url = https://github.com/dotty-staging/scala-java8-compat.git [submodule "community-build/community-projects/specs2"] path = community-build/community-projects/specs2 - url = https://github.com/etorreborre/specs2.git + url = https://github.com/dotty-staging/specs2.git From 399c3d1e483c34f170d620aa5a871e08b688ab8b Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 5 Nov 2021 15:00:33 +0100 Subject: [PATCH 0809/1244] Impose implicit search limit Impose a configurable limit on the total number of nodes constructed during an implicit search. Fixes #13838 --- .../tools/dotc/config/ScalaSettings.scala | 1 + .../dotty/tools/dotc/typer/Implicits.scala | 47 ++++++++++++++++--- .../dotty/tools/dotc/CompilationTests.scala | 1 + tests/neg-custom-args/i13838.check | 18 +++++++ tests/neg-custom-args/i13838.scala | 40 ++++++++++++++++ 5 files changed, 101 insertions(+), 6 deletions(-) create mode 100644 tests/neg-custom-args/i13838.check create mode 100644 tests/neg-custom-args/i13838.scala diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index 6147cd78f3e6..7f8c1a53bec3 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -218,6 +218,7 @@ private sealed trait XSettings: val Xtarget: Setting[String] = ChoiceSetting("-Xtarget", "target", "Emit bytecode for the specified version of the Java platform. This might produce bytecode that will break at runtime. When on JDK 9+, consider -release as a safer alternative.", ScalaSettings.supportedTargetVersions, "", aliases = List("--Xtarget")) val XcheckMacros: Setting[Boolean] = BooleanSetting("-Xcheck-macros", "Check some invariants of macro generated code while expanding macros", aliases = List("--Xcheck-macros")) val XmainClass: Setting[String] = StringSetting("-Xmain-class", "path", "Class for manifest's Main-Class entry (only useful with -d )", "") + val XimplicitSearchLimit: Setting[Int] = IntSetting("-Ximplicit-search-limit", "Maximal number of expressions to be generated in an implicit search", 100000) val XmixinForceForwarders = ChoiceSetting( name = "-Xmixin-force-forwarders", diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index 6c24dc6be119..fd2adc0358de 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -489,6 +489,11 @@ object Implicits: @sharable val NoMatchingImplicitsFailure: SearchFailure = SearchFailure(NoMatchingImplicits, NoSpan)(using NoContext) + @sharable object ImplicitSearchTooLarge extends NoMatchingImplicits(NoType, EmptyTree, OrderingConstraint.empty) + + @sharable val ImplicitSearchTooLargeFailure: SearchFailure = + SearchFailure(ImplicitSearchTooLarge, NoSpan)(using NoContext) + /** An ambiguous implicits failure */ class AmbiguousImplicits(val alt1: SearchSuccess, val alt2: SearchSuccess, val expectedType: Type, val argument: Tree) extends SearchFailureType { def explanation(using Context): String = @@ -1129,18 +1134,44 @@ trait Implicits: val isNotGiven: Boolean = wildProto.classSymbol == defn.NotGivenClass + private def searchTooLarge(): Boolean = ctx.searchHistory match + case root: SearchRoot => + root.nestedSearches = 1 + false + case h => + val limit = ctx.settings.XimplicitSearchLimit.value + val nestedSearches = h.root.nestedSearches + val result = nestedSearches > limit + if result then + var c = ctx + while c.outer.typer eq ctx.typer do c = c.outer + report.echo( + em"""Implicit search problem too large. + |an implicit search was terminated with failure after trying $limit expressions. + | + |You can change the behavior by setting the `-Ximplicit-search-limit` value. + |Smaller values cause the search to fail faster. + |Larger values might make a very large search problem succeed. + |""", + ctx.source.atSpan(span))(using c) + else + h.root.nestedSearches = nestedSearches + 1 + result + /** Try to type-check implicit reference, after checking that this is not * a diverging search */ def tryImplicit(cand: Candidate, contextual: Boolean): SearchResult = if checkDivergence(cand) then SearchFailure(new DivergingImplicit(cand.ref, wideProto, argument), span) - else { + else if searchTooLarge() then + ImplicitSearchTooLargeFailure + else val history = ctx.searchHistory.nest(cand, pt) val typingCtx = nestedContext().setNewTyperState().setFreshGADTBounds.setSearchHistory(history) val result = typedImplicit(cand, pt, argument, span)(using typingCtx) - result match { + result match case res: SearchSuccess => ctx.searchHistory.defineBynameImplicit(wideProto, res) case _ => @@ -1152,8 +1183,6 @@ trait Implicits: // tests/neg/implicitSearch.check typingCtx.typerState.gc() result - } - } /** Search a list of eligible implicit references */ private def searchImplicit(eligible: List[Candidate], contextual: Boolean): SearchResult = @@ -1242,7 +1271,9 @@ trait Implicits: negateIfNot(tryImplicit(cand, contextual)) match { case fail: SearchFailure => - if (fail.isAmbiguous) + if fail eq ImplicitSearchTooLargeFailure then + fail + else if (fail.isAmbiguous) if migrateTo3 then val result = rank(remaining, found, NoMatchingImplicitsFailure :: rfailures) if (result.isSuccess) @@ -1610,13 +1641,17 @@ case class OpenSearch(cand: Candidate, pt: Type, outer: SearchHistory)(using Con end OpenSearch /** - * The the state corresponding to the outermost context of an implicit searcch. + * The state corresponding to the outermost context of an implicit searcch. */ final class SearchRoot extends SearchHistory: val root = this val byname = false def openSearchPairs = Nil + /** How many expressions were constructed so far in the current toplevel implicit search? + */ + var nestedSearches: Int = 0 + /** The dictionary of recursive implicit types and corresponding terms for this search. */ var myImplicitDictionary: mutable.Map[Type, (TermRef, tpd.Tree)] = null private def implicitDictionary = diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index a9f376d3cda6..06526aa6a924 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -183,6 +183,7 @@ class CompilationTests { compileFile("tests/neg-custom-args/feature-shadowing.scala", defaultOptions.and("-Xfatal-warnings", "-feature")), compileDir("tests/neg-custom-args/hidden-type-errors", defaultOptions.and("-explain")), compileFile("tests/neg-custom-args/i13026.scala", defaultOptions.and("-print-lines")), + compileFile("tests/neg-custom-args/i13838.scala", defaultOptions.and("-Ximplicit-search-limit", "1000")), ).checkExpectedErrors() } diff --git a/tests/neg-custom-args/i13838.check b/tests/neg-custom-args/i13838.check new file mode 100644 index 000000000000..e6e5a0eb9e2e --- /dev/null +++ b/tests/neg-custom-args/i13838.check @@ -0,0 +1,18 @@ +-- [E007] Type Mismatch Error: tests/neg-custom-args/i13838.scala:8:48 ------------------------------------------------- +8 | def liftF[F[_], A](fa: F[A]): F[Foo[A]] = map(fa)(???) // error + | ^^ + | Found: (fa : F[A]) + | Required: F²[Foo[A²]] + | + | where: A is a type in method liftF + | A² is a type variable + | F is a type in method liftF with bounds <: [_] =>> Any + | F² is a type variable with constraint <: [_] =>> Any + | + | + | The following import might make progress towards fixing the problem: + | + | import collection.Searching.search + | + +longer explanation available when compiling with `-explain` diff --git a/tests/neg-custom-args/i13838.scala b/tests/neg-custom-args/i13838.scala new file mode 100644 index 000000000000..92e7a6d48439 --- /dev/null +++ b/tests/neg-custom-args/i13838.scala @@ -0,0 +1,40 @@ +implicit def catsSyntaxEq[A: Eq](a: A): Foo[A] = ??? + +class Foo[A] +object Foo: + given [A: Eq]: Eq[Foo[A]] = ??? + +object FooT: + def liftF[F[_], A](fa: F[A]): F[Foo[A]] = map(fa)(???) // error + + def map[F[_], A](ffa: F[Foo[A]])(f: A): Nothing = ??? + + given OrderFFooA[F[_], A](using Ord: Order[F[Foo[A]]]): Order[F[Foo[A]]] = ??? + +trait Eq[A] +trait Order[A] extends Eq[A] + +object Eq { + given catsKernelOrderForTuple1[A0](using A0: Order[A0]): Order[Tuple1[A0]] = ??? + given catsKernelOrderForTuple2[A0, A1](using A0: Order[A0], A1: Order[A1]): Order[(A0, A1)] = ??? + given catsKernelOrderForTuple3[A0, A1, A2](using A0: Order[A0], A1: Order[A1], A2: Order[A2]): Order[(A0, A1, A2)] = ??? + given catsKernelOrderForTuple4[A0, A1, A2, A3](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3]): Order[(A0, A1, A2, A3)] = ??? + given catsKernelOrderForTuple5[A0, A1, A2, A3, A4](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4]): Order[(A0, A1, A2, A3, A4)] = ??? + given catsKernelOrderForTuple6[A0, A1, A2, A3, A4, A5](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5]): Order[(A0, A1, A2, A3, A4, A5)] = ??? + given catsKernelOrderForTuple7[A0, A1, A2, A3, A4, A5, A6](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6]): Order[(A0, A1, A2, A3, A4, A5, A6)] = ??? + given catsKernelOrderForTuple8[A0, A1, A2, A3, A4, A5, A6, A7](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7]): Order[(A0, A1, A2, A3, A4, A5, A6, A7)] = ??? + given catsKernelOrderForTuple9[A0, A1, A2, A3, A4, A5, A6, A7, A8](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8)] = ??? + given catsKernelOrderForTuple10[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9)] = ??? + given catsKernelOrderForTuple11[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)] = ??? + given catsKernelOrderForTuple12[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11)] = ??? + given catsKernelOrderForTuple13[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)] = ??? + given catsKernelOrderForTuple14[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13)] = ??? + given catsKernelOrderForTuple15[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14)] = ??? + given catsKernelOrderForTuple16[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15)] = ??? + given catsKernelOrderForTuple17[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16)] = ??? + given catsKernelOrderForTuple18[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16], A17: Order[A17]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17)] = ??? + given catsKernelOrderForTuple19[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16], A17: Order[A17], A18: Order[A18]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18)] = ??? + given catsKernelOrderForTuple20[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16], A17: Order[A17], A18: Order[A18], A19: Order[A19]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19)] = ??? + given catsKernelOrderForTuple21[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16], A17: Order[A17], A18: Order[A18], A19: Order[A19], A20: Order[A20]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20)] = ??? + given catsKernelOrderForTuple22[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21](using A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13], A14: Order[A14], A15: Order[A15], A16: Order[A16], A17: Order[A17], A18: Order[A18], A19: Order[A19], A20: Order[A20], A21: Order[A21]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21)] = ??? +} From 6a78bb35f83e81946ce59607ba2bb9c0852e0fad Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 5 Nov 2021 16:44:29 +0100 Subject: [PATCH 0810/1244] Issue "search too large" as warnings that cannot be hidden --- .../dotty/tools/dotc/reporting/ErrorMessageID.scala | 3 ++- .../src/dotty/tools/dotc/reporting/Message.scala | 7 +++++++ .../dotc/reporting/UniqueMessagePositions.scala | 13 +++++++++---- .../src/dotty/tools/dotc/reporting/messages.scala | 12 ++++++++++++ compiler/src/dotty/tools/dotc/typer/Implicits.scala | 10 +--------- tests/neg-custom-args/i13838.check | 9 +++++++++ 6 files changed, 40 insertions(+), 14 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala index 342e640ca819..f55196f82a8e 100644 --- a/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala +++ b/compiler/src/dotty/tools/dotc/reporting/ErrorMessageID.scala @@ -175,7 +175,8 @@ enum ErrorMessageID extends java.lang.Enum[ErrorMessageID]: OverrideErrorID, MatchableWarningID, CannotExtendFunctionID, - LossyWideningConstantConversionID + LossyWideningConstantConversionID, + ImplicitSearchTooLargeID def errorNumber = ordinal - 2 diff --git a/compiler/src/dotty/tools/dotc/reporting/Message.scala b/compiler/src/dotty/tools/dotc/reporting/Message.scala index 8ce94f4fa3a3..cd7456cafcc2 100644 --- a/compiler/src/dotty/tools/dotc/reporting/Message.scala +++ b/compiler/src/dotty/tools/dotc/reporting/Message.scala @@ -124,6 +124,13 @@ abstract class Message(val errorId: ErrorMessageID) { self => def explain = self.explain ++ suffix override def canExplain = true + /** Override with `true` for messages that should always be shown even if their + * position overlaps another messsage of a different class. On the other hand + * multiple messages of the same class with overlapping positions will lead + * to only a single message of that class to be issued. + */ + def showAlways = false + override def toString = msg } diff --git a/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala b/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala index fb4c92c12f83..e4312f46f779 100644 --- a/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala +++ b/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala @@ -10,19 +10,24 @@ import core.Contexts._ * are suppressed, unless they are of increasing severity. */ trait UniqueMessagePositions extends Reporter { - private val positions = new mutable.HashMap[(SourceFile, Int), Int] + private val positions = new mutable.HashMap[(SourceFile, Int), Diagnostic] /** Logs a position and returns true if it was already logged. * @note Two positions are considered identical for logging if they have the same point. */ override def isHidden(dia: Diagnostic)(using Context): Boolean = + extension (dia1: Diagnostic) def hides(dia2: Diagnostic): Boolean = + if dia2.msg.showAlways then dia1.msg.getClass == dia2.msg.getClass + else dia1.level >= dia2.level super.isHidden(dia) || { - dia.pos.exists && !ctx.settings.YshowSuppressedErrors.value && { + dia.pos.exists + && !ctx.settings.YshowSuppressedErrors.value + && { var shouldHide = false for (pos <- dia.pos.start to dia.pos.end) positions get (ctx.source, pos) match { - case Some(level) if level >= dia.level => shouldHide = true - case _ => positions((ctx.source, pos)) = dia.level + case Some(dia1) if dia1.hides(dia) => shouldHide = true + case _ => positions((ctx.source, pos)) = dia } shouldHide } diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala index 62bf295fed8c..398827f1a279 100644 --- a/compiler/src/dotty/tools/dotc/reporting/messages.scala +++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala @@ -2515,3 +2515,15 @@ import transform.SymUtils._ |Inlining such definition would multiply this footprint for each call site. |""".stripMargin } + + class ImplicitSearchTooLargeWarning(limit: Int)(using Context) extends TypeMsg(ImplicitSearchTooLargeID): + override def showAlways = true + def msg = + em"""Implicit search problem too large. + |an implicit search was terminated with failure after trying $limit expressions. + | + |You can change the behavior by setting the `-Ximplicit-search-limit` value. + |Smaller values cause the search to fail faster. + |Larger values might make a very large search problem succeed. + |""" + def explain = "" \ No newline at end of file diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index fd2adc0358de..51a9ddfbda16 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -1145,15 +1145,7 @@ trait Implicits: if result then var c = ctx while c.outer.typer eq ctx.typer do c = c.outer - report.echo( - em"""Implicit search problem too large. - |an implicit search was terminated with failure after trying $limit expressions. - | - |You can change the behavior by setting the `-Ximplicit-search-limit` value. - |Smaller values cause the search to fail faster. - |Larger values might make a very large search problem succeed. - |""", - ctx.source.atSpan(span))(using c) + report.warning(ImplicitSearchTooLargeWarning(limit), ctx.source.atSpan(span))(using c) else h.root.nestedSearches = nestedSearches + 1 result diff --git a/tests/neg-custom-args/i13838.check b/tests/neg-custom-args/i13838.check index e6e5a0eb9e2e..8d51bbc36f81 100644 --- a/tests/neg-custom-args/i13838.check +++ b/tests/neg-custom-args/i13838.check @@ -16,3 +16,12 @@ | longer explanation available when compiling with `-explain` +-- [E168] Type Warning: tests/neg-custom-args/i13838.scala:8:50 -------------------------------------------------------- +8 | def liftF[F[_], A](fa: F[A]): F[Foo[A]] = map(fa)(???) // error + | ^ + | Implicit search problem too large. + | an implicit search was terminated with failure after trying 1000 expressions. + | + | You can change the behavior by setting the `-Ximplicit-search-limit` value. + | Smaller values cause the search to fail faster. + | Larger values might make a very large search problem succeed. From 4b0dc7589ddefed3893e39c4a451689883b3fd8f Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sat, 6 Nov 2021 11:37:10 +0100 Subject: [PATCH 0811/1244] Give more information when "search too large" is hit - show what the root query was - under -explain, show the trace until the overflow occurred. --- .../dotty/tools/dotc/reporting/messages.scala | 16 ++++++++++++++-- .../src/dotty/tools/dotc/typer/Implicits.scala | 2 +- tests/neg-custom-args/i13838.check | 5 +++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala index 398827f1a279..4a1efab782a1 100644 --- a/compiler/src/dotty/tools/dotc/reporting/messages.scala +++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala @@ -18,6 +18,7 @@ import ast.Trees import config.{Feature, ScalaVersion} import typer.ErrorReporting.{err, matchReductionAddendum} import typer.ProtoTypes.ViewProto +import typer.Implicits.Candidate import scala.util.control.NonFatal import StdNames.nme import printing.Formatting.hl @@ -2516,14 +2517,25 @@ import transform.SymUtils._ |""".stripMargin } - class ImplicitSearchTooLargeWarning(limit: Int)(using Context) extends TypeMsg(ImplicitSearchTooLargeID): + class ImplicitSearchTooLargeWarning(limit: Int, openSearchPairs: List[(Candidate, Type)])(using Context) + extends TypeMsg(ImplicitSearchTooLargeID): override def showAlways = true + def showQuery(query: (Candidate, Type)): String = + i" ${query._1.ref.symbol.showLocated} for ${query._2}}" def msg = em"""Implicit search problem too large. |an implicit search was terminated with failure after trying $limit expressions. + |The root candidate for the search was: + | + |${showQuery(openSearchPairs.last)} | |You can change the behavior by setting the `-Ximplicit-search-limit` value. |Smaller values cause the search to fail faster. |Larger values might make a very large search problem succeed. |""" - def explain = "" \ No newline at end of file + def explain = + em"""The overflow happened with the following lists of tried expressions and target types, + |starting with the root query: + | + |${openSearchPairs.reverse.map(showQuery)}%\n% + """ diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index 51a9ddfbda16..84a913b47f58 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -1145,7 +1145,7 @@ trait Implicits: if result then var c = ctx while c.outer.typer eq ctx.typer do c = c.outer - report.warning(ImplicitSearchTooLargeWarning(limit), ctx.source.atSpan(span))(using c) + report.warning(ImplicitSearchTooLargeWarning(limit, h.openSearchPairs), ctx.source.atSpan(span))(using c) else h.root.nestedSearches = nestedSearches + 1 result diff --git a/tests/neg-custom-args/i13838.check b/tests/neg-custom-args/i13838.check index 8d51bbc36f81..9b77e1566c16 100644 --- a/tests/neg-custom-args/i13838.check +++ b/tests/neg-custom-args/i13838.check @@ -21,7 +21,12 @@ longer explanation available when compiling with `-explain` | ^ | Implicit search problem too large. | an implicit search was terminated with failure after trying 1000 expressions. + | The root candidate for the search was: + | + | method catsSyntaxEq for ([_] =>> Any)[Foo[Any]]} | | You can change the behavior by setting the `-Ximplicit-search-limit` value. | Smaller values cause the search to fail faster. | Larger values might make a very large search problem succeed. + +longer explanation available when compiling with `-explain` From 3be5520d360041b24702661b4bf85838250f3a9a Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 9 Nov 2021 11:59:51 +0100 Subject: [PATCH 0812/1244] Reduce limit for implicit search too large Half the limit so that we fail in a bit less than a minute instead of more than 5 minutes. --- compiler/src/dotty/tools/dotc/config/ScalaSettings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index 7f8c1a53bec3..d66c5d7ab4c2 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -218,7 +218,7 @@ private sealed trait XSettings: val Xtarget: Setting[String] = ChoiceSetting("-Xtarget", "target", "Emit bytecode for the specified version of the Java platform. This might produce bytecode that will break at runtime. When on JDK 9+, consider -release as a safer alternative.", ScalaSettings.supportedTargetVersions, "", aliases = List("--Xtarget")) val XcheckMacros: Setting[Boolean] = BooleanSetting("-Xcheck-macros", "Check some invariants of macro generated code while expanding macros", aliases = List("--Xcheck-macros")) val XmainClass: Setting[String] = StringSetting("-Xmain-class", "path", "Class for manifest's Main-Class entry (only useful with -d )", "") - val XimplicitSearchLimit: Setting[Int] = IntSetting("-Ximplicit-search-limit", "Maximal number of expressions to be generated in an implicit search", 100000) + val XimplicitSearchLimit: Setting[Int] = IntSetting("-Ximplicit-search-limit", "Maximal number of expressions to be generated in an implicit search", 50000) val XmixinForceForwarders = ChoiceSetting( name = "-Xmixin-force-forwarders", From c439dd1cfd5610a123ffd9be0a39dd70a2a81a0c Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 9 Nov 2021 12:34:07 +0100 Subject: [PATCH 0813/1244] Refine checking for underspecified implicit queries - Use the wildcard approximation instead of the original type since that one determined what is eligible, and the goal is to refuse the search if everything is eligible. - Also refuse underspecified implicit parameters, not just conversions. - Treat wildcard types as underspecified. Two tests had to be reclassified. But the original tests were not meant to compile anyway. They were bout misleading error messages (no longer the case) and crashers. --- .../dotty/tools/dotc/typer/Implicits.scala | 68 +++++++++++-------- .../dotty/tools/dotc/CompilationTests.scala | 1 - tests/neg-custom-args/i13838.check | 32 --------- tests/{pos => neg}/i10082.scala | 0 tests/{neg-custom-args => neg}/i13838.scala | 0 tests/neg/i13838a.scala | 47 +++++++++++++ tests/{pos => neg}/i7745.scala | 2 +- 7 files changed, 86 insertions(+), 64 deletions(-) delete mode 100644 tests/neg-custom-args/i13838.check rename tests/{pos => neg}/i10082.scala (100%) rename tests/{neg-custom-args => neg}/i13838.scala (100%) create mode 100644 tests/neg/i13838a.scala rename tests/{pos => neg}/i7745.scala (72%) diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index 84a913b47f58..a3b0dd02714d 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -795,16 +795,8 @@ trait Implicits: */ def inferView(from: Tree, to: Type)(using Context): SearchResult = { record("inferView") - val wfromtp = from.tpe.widen - if to.isAny - || to.isAnyRef - || to.isRef(defn.UnitClass) - || wfromtp.isRef(defn.NothingClass) - || wfromtp.isRef(defn.NullClass) - || !ctx.mode.is(Mode.ImplicitsEnabled) - || from.isInstanceOf[Super] - || (wfromtp eq NoPrefix) - then NoMatchingImplicitsFailure + if !ctx.mode.is(Mode.ImplicitsEnabled) || from.isInstanceOf[Super] then + NoMatchingImplicitsFailure else { def adjust(to: Type) = to.stripTypeVar.widenExpr match { case SelectionProto(name, memberProto, compat, true) => @@ -1434,27 +1426,43 @@ trait Implicits: rank(sort(eligible), NoMatchingImplicitsFailure, Nil) end searchImplicit + def isUnderSpecifiedArgument(tp: Type): Boolean = + tp.isRef(defn.NothingClass) || tp.isRef(defn.NullClass) || (tp eq NoPrefix) + + private def isUnderspecified(tp: Type): Boolean = tp.stripTypeVar match + case tp: WildcardType => + !tp.optBounds.exists || isUnderspecified(tp.optBounds.hiBound) + case tp: ViewProto => + isUnderspecified(tp.resType) + || tp.resType.isRef(defn.UnitClass) + || isUnderSpecifiedArgument(tp.argType.widen) + case _ => + tp.isAny || tp.isAnyRef + private def searchImplicit(contextual: Boolean): SearchResult = - val eligible = - if contextual then ctx.implicits.eligible(wildProto) - else implicitScope(wildProto).eligible - searchImplicit(eligible, contextual) match - case result: SearchSuccess => - result - case failure: SearchFailure => - failure.reason match - case _: AmbiguousImplicits => failure - case reason => - if contextual then - searchImplicit(contextual = false).recoverWith { - failure2 => failure2.reason match - case _: AmbiguousImplicits => failure2 - case _ => - reason match - case (_: DivergingImplicit) => failure - case _ => List(failure, failure2).maxBy(_.tree.treeSize) - } - else failure + if isUnderspecified(wildProto) then + NoMatchingImplicitsFailure + else + val eligible = + if contextual then ctx.implicits.eligible(wildProto) + else implicitScope(wildProto).eligible + searchImplicit(eligible, contextual) match + case result: SearchSuccess => + result + case failure: SearchFailure => + failure.reason match + case _: AmbiguousImplicits => failure + case reason => + if contextual then + searchImplicit(contextual = false).recoverWith { + failure2 => failure2.reason match + case _: AmbiguousImplicits => failure2 + case _ => + reason match + case (_: DivergingImplicit) => failure + case _ => List(failure, failure2).maxBy(_.tree.treeSize) + } + else failure end searchImplicit /** Find a unique best implicit reference */ diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index 06526aa6a924..a9f376d3cda6 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -183,7 +183,6 @@ class CompilationTests { compileFile("tests/neg-custom-args/feature-shadowing.scala", defaultOptions.and("-Xfatal-warnings", "-feature")), compileDir("tests/neg-custom-args/hidden-type-errors", defaultOptions.and("-explain")), compileFile("tests/neg-custom-args/i13026.scala", defaultOptions.and("-print-lines")), - compileFile("tests/neg-custom-args/i13838.scala", defaultOptions.and("-Ximplicit-search-limit", "1000")), ).checkExpectedErrors() } diff --git a/tests/neg-custom-args/i13838.check b/tests/neg-custom-args/i13838.check deleted file mode 100644 index 9b77e1566c16..000000000000 --- a/tests/neg-custom-args/i13838.check +++ /dev/null @@ -1,32 +0,0 @@ --- [E007] Type Mismatch Error: tests/neg-custom-args/i13838.scala:8:48 ------------------------------------------------- -8 | def liftF[F[_], A](fa: F[A]): F[Foo[A]] = map(fa)(???) // error - | ^^ - | Found: (fa : F[A]) - | Required: F²[Foo[A²]] - | - | where: A is a type in method liftF - | A² is a type variable - | F is a type in method liftF with bounds <: [_] =>> Any - | F² is a type variable with constraint <: [_] =>> Any - | - | - | The following import might make progress towards fixing the problem: - | - | import collection.Searching.search - | - -longer explanation available when compiling with `-explain` --- [E168] Type Warning: tests/neg-custom-args/i13838.scala:8:50 -------------------------------------------------------- -8 | def liftF[F[_], A](fa: F[A]): F[Foo[A]] = map(fa)(???) // error - | ^ - | Implicit search problem too large. - | an implicit search was terminated with failure after trying 1000 expressions. - | The root candidate for the search was: - | - | method catsSyntaxEq for ([_] =>> Any)[Foo[Any]]} - | - | You can change the behavior by setting the `-Ximplicit-search-limit` value. - | Smaller values cause the search to fail faster. - | Larger values might make a very large search problem succeed. - -longer explanation available when compiling with `-explain` diff --git a/tests/pos/i10082.scala b/tests/neg/i10082.scala similarity index 100% rename from tests/pos/i10082.scala rename to tests/neg/i10082.scala diff --git a/tests/neg-custom-args/i13838.scala b/tests/neg/i13838.scala similarity index 100% rename from tests/neg-custom-args/i13838.scala rename to tests/neg/i13838.scala diff --git a/tests/neg/i13838a.scala b/tests/neg/i13838a.scala new file mode 100644 index 000000000000..9fcb7be7bdcf --- /dev/null +++ b/tests/neg/i13838a.scala @@ -0,0 +1,47 @@ +object TooSlow { + trait EqSyntax { + implicit def catsSyntaxEq[A: Eq](a: A): EqOps[A] = ??? + } + + final class EqOps[A] + + object eq extends EqSyntax + + import eq._ + + sealed abstract class Foo[A] + object Foo { + implicit def eqFoo[A: Eq]: Eq[Foo[A]] = ??? + } + + type FooT[F[_], A] = F[Foo[A]] + object FooT { + def liftF[F[_], A](fa: F[A]): F[Foo[A]] = + map(fa)(???) // error + + def map[F[_], A, B](ffa: F[Foo[A]])(f: A => B): F[Foo[B]] = + ??? + } + + trait Order[A] extends Eq[A] + + trait Eq[A] + + object Eq { + implicit def catsKernelOrderForTuple14[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12], A13: Order[A13]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13)] = ??? + implicit def catsKernelOrderForTuple13[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11], A12: Order[A12]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12)] = ??? + implicit def catsKernelOrderForTuple12[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10], A11: Order[A11]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11)] = ??? + implicit def catsKernelOrderForTuple11[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9], A10: Order[A10]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10)] = ??? + implicit def catsKernelOrderForTuple10[A0, A1, A2, A3, A4, A5, A6, A7, A8, A9](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8], A9: Order[A9]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8, A9)] = ??? + implicit def catsKernelOrderForTuple9[A0, A1, A2, A3, A4, A5, A6, A7, A8](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7], A8: Order[A8]): Order[(A0, A1, A2, A3, A4, A5, A6, A7, A8)] = ??? + implicit def catsKernelOrderForTuple8[A0, A1, A2, A3, A4, A5, A6, A7](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6], A7: Order[A7]): Order[(A0, A1, A2, A3, A4, A5, A6, A7)] = ??? + implicit def catsKernelOrderForTuple7[A0, A1, A2, A3, A4, A5, A6](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5], A6: Order[A6]): Order[(A0, A1, A2, A3, A4, A5, A6)] = ??? + implicit def catsKernelOrderForTuple6[A0, A1, A2, A3, A4, A5](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4], A5: Order[A5]): Order[(A0, A1, A2, A3, A4, A5)] = ??? + implicit def catsKernelOrderForTuple5[A0, A1, A2, A3, A4](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3], A4: Order[A4]): Order[(A0, A1, A2, A3, A4)] = ??? + implicit def catsKernelOrderForTuple4[A0, A1, A2, A3](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2], A3: Order[A3]): Order[(A0, A1, A2, A3)] = ??? + implicit def catsKernelOrderForTuple3[A0, A1, A2](implicit A0: Order[A0], A1: Order[A1], A2: Order[A2]): Order[(A0, A1, A2)] = ??? + implicit def catsKernelOrderForTuple2[A0, A1](implicit A0: Order[A0], A1: Order[A1]): Order[(A0, A1)] = ??? + implicit def catsKernelOrderForTuple1[A0](implicit A0: Order[A0]): Order[Tuple1[A0]] = ??? + } + +} \ No newline at end of file diff --git a/tests/pos/i7745.scala b/tests/neg/i7745.scala similarity index 72% rename from tests/pos/i7745.scala rename to tests/neg/i7745.scala index de03d3995d33..7b54be159661 100644 --- a/tests/pos/i7745.scala +++ b/tests/neg/i7745.scala @@ -1,3 +1,3 @@ trait F[x] implicit def foo[f[_], y, x <: f[y]](implicit ev: F[y]): F[x] = ??? -val test = implicitly \ No newline at end of file +val test = implicitly // error \ No newline at end of file From 93dc3e261ce8830e30a8ee8cdb12a1bf4ccdb90c Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 9 Nov 2021 17:24:40 +0100 Subject: [PATCH 0814/1244] Fix neg test --- tests/neg/i9330.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/neg/i9330.scala b/tests/neg/i9330.scala index 6ba57c033473..ca25582ef7e8 100644 --- a/tests/neg/i9330.scala +++ b/tests/neg/i9330.scala @@ -1,4 +1,4 @@ val x = { - () == "" + () == "" // error implicit def foo[A: A] // error // error // error } From 9c350135f9582cbccb7ca57533a4e367af38193a Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 9 Nov 2021 18:13:24 +0100 Subject: [PATCH 0815/1244] Revive original test Make another test to exercise the original large search behavior --- .../dotty/tools/dotc/CompilationTests.scala | 1 + tests/neg-custom-args/i13838.check | 26 +++++++++++++++++++ tests/{neg => neg-custom-args}/i13838.scala | 4 ++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 tests/neg-custom-args/i13838.check rename tests/{neg => neg-custom-args}/i13838.scala (99%) diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index a9f376d3cda6..06526aa6a924 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -183,6 +183,7 @@ class CompilationTests { compileFile("tests/neg-custom-args/feature-shadowing.scala", defaultOptions.and("-Xfatal-warnings", "-feature")), compileDir("tests/neg-custom-args/hidden-type-errors", defaultOptions.and("-explain")), compileFile("tests/neg-custom-args/i13026.scala", defaultOptions.and("-print-lines")), + compileFile("tests/neg-custom-args/i13838.scala", defaultOptions.and("-Ximplicit-search-limit", "1000")), ).checkExpectedErrors() } diff --git a/tests/neg-custom-args/i13838.check b/tests/neg-custom-args/i13838.check new file mode 100644 index 000000000000..5730cb144e52 --- /dev/null +++ b/tests/neg-custom-args/i13838.check @@ -0,0 +1,26 @@ +-- Error: tests/neg-custom-args/i13838.scala:10:5 ---------------------------------------------------------------------- +10 | foo // error + | ^ + |no implicit argument of type Order[X] was found for parameter x$1 of method foo in object FooT + | + |where: X is a type variable + |. + |I found: + | + | FooT.OrderFFooA[F, A](FooT.OrderFFooA[F, A](/* missing */summon[Order[F[Foo[A]]]])) + | + |But given instance OrderFFooA in object FooT produces a diverging implicit search when trying to match type Order[F[Foo[A]]]. +-- [E168] Type Warning: tests/neg-custom-args/i13838.scala:10:5 -------------------------------------------------------- +10 | foo // error + | ^ + | Implicit search problem too large. + | an implicit search was terminated with failure after trying 1000 expressions. + | The root candidate for the search was: + | + | given instance OrderFFooA in object FooT for Order[Any]} + | + | You can change the behavior by setting the `-Ximplicit-search-limit` value. + | Smaller values cause the search to fail faster. + | Larger values might make a very large search problem succeed. + +longer explanation available when compiling with `-explain` diff --git a/tests/neg/i13838.scala b/tests/neg-custom-args/i13838.scala similarity index 99% rename from tests/neg/i13838.scala rename to tests/neg-custom-args/i13838.scala index 92e7a6d48439..c99d3fa1f82d 100644 --- a/tests/neg/i13838.scala +++ b/tests/neg-custom-args/i13838.scala @@ -5,7 +5,9 @@ object Foo: given [A: Eq]: Eq[Foo[A]] = ??? object FooT: - def liftF[F[_], A](fa: F[A]): F[Foo[A]] = map(fa)(???) // error + + def foo[X](using Order[X]): Unit = ??? + foo // error def map[F[_], A](ffa: F[Foo[A]])(f: A): Nothing = ??? From 664d211e0a914e6d530c4a65492441e47731f049 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 12 Oct 2021 09:25:52 +0200 Subject: [PATCH 0816/1244] Name mangle methods with erased context results Add a `$` to the name of a method that has erased context results and that may override some other method. This is to prevent the two methods from having the same names and parameters in their erased signatures. We need a bridge between the two methods, so they are not allowed to already override after erasure. --- .../dotty/tools/dotc/core/Definitions.scala | 28 +++---------------- .../dotty/tools/dotc/core/TypeErasure.scala | 4 +-- .../transform/ContextFunctionResults.scala | 13 +++++++++ .../dotty/tools/dotc/transform/Erasure.scala | 18 +++++++++--- .../dotc/transform/GenericSignatures.scala | 4 +-- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 60f375c116fc..7f2ec75af8df 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -1353,39 +1353,19 @@ class Definitions { def isBoxedUnitClass(cls: Symbol): Boolean = cls.isClass && (cls.owner eq ScalaRuntimePackageClass) && cls.name == tpnme.BoxedUnit - /** Returns the erased class of the function class `cls` - * - FunctionN for N > 22 becomes FunctionXXL - * - FunctionN for 22 > N >= 0 remains as FunctionN - * - ContextFunctionN for N > 22 becomes FunctionXXL - * - ContextFunctionN for N <= 22 becomes FunctionN - * - ErasedFunctionN becomes Function0 - * - ImplicitErasedFunctionN becomes Function0 - * - anything else becomes a NoSymbol - */ - def erasedFunctionClass(cls: Symbol): Symbol = { - val arity = scalaClassName(cls).functionArity - if (cls.name.isErasedFunction) FunctionClass(0) - else if (arity > 22) FunctionXXLClass - else if (arity >= 0) FunctionClass(arity) - else NoSymbol - } - /** Returns the erased type of the function class `cls` * - FunctionN for N > 22 becomes FunctionXXL * - FunctionN for 22 > N >= 0 remains as FunctionN * - ContextFunctionN for N > 22 becomes FunctionXXL * - ContextFunctionN for N <= 22 becomes FunctionN - * - ErasedFunctionN becomes Function0 - * - ImplicitErasedFunctionN becomes Function0 * - anything else becomes a NoType */ - def erasedFunctionType(cls: Symbol): Type = { + def functionTypeErasure(cls: Symbol): Type = val arity = scalaClassName(cls).functionArity - if (cls.name.isErasedFunction) FunctionType(0) - else if (arity > 22) FunctionXXLClass.typeRef - else if (arity >= 0) FunctionType(arity) + if cls.name.isErasedFunction then FunctionType(0) + else if arity > 22 then FunctionXXLClass.typeRef + else if arity >= 0 then FunctionType(arity) else NoType - } val predefClassNames: Set[Name] = Set("Predef$", "DeprecatedPredef", "LowPriorityImplicits").map(_.toTypeName.unmangleClassName) diff --git a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala index 7e89b4e2c2c9..6435d0622ebd 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala @@ -581,7 +581,7 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst val sym = tp.symbol if (!sym.isClass) this(tp.translucentSuperType) else if (semiEraseVCs && isDerivedValueClass(sym)) eraseDerivedValueClass(tp) - else if (defn.isSyntheticFunctionClass(sym)) defn.erasedFunctionType(sym) + else if (defn.isSyntheticFunctionClass(sym)) defn.functionTypeErasure(sym) else eraseNormalClassRef(tp) case tp: AppliedType => val tycon = tp.tycon @@ -791,7 +791,7 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst if (erasedVCRef.exists) return sigName(erasedVCRef) } if (defn.isSyntheticFunctionClass(sym)) - sigName(defn.erasedFunctionType(sym)) + sigName(defn.functionTypeErasure(sym)) else val cls = normalizeClass(sym.asClass) val fullName = diff --git a/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala b/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala index ee56767054fd..4247b835f640 100644 --- a/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala +++ b/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala @@ -8,12 +8,16 @@ import StdNames.nme import ast.untpd import ast.tpd._ import config.Config +import Decorators.* object ContextFunctionResults: /** Annotate methods that have context function result types directly matched by context * closures on their right-hand side. Parameters to such closures will be integrated * as additional method parameters in erasure. + * + * A @ContextResultCount(n) annotation means that the method's result type + * consists of a string of `n` nested context closures. */ def annotateContextResults(mdef: DefDef)(using Context): Unit = def contextResultCount(rhs: Tree, tp: Type): Int = tp match @@ -50,6 +54,15 @@ object ContextFunctionResults: crCount case none => 0 + /** True iff `ContextResultCount` is not zero and all context functions in the result + * type are erased. + */ + def contextResultsAreErased(sym: Symbol)(using Context): Boolean = + def allErased(tp: Type): Boolean = tp.dealias match + case defn.ContextFunctionType(_, resTpe, isErased) => isErased && allErased(resTpe) + case _ => true + contextResultCount(sym) > 0 && allErased(sym.info.finalResultType) + /** Turn the first `crCount` context function types in the result type of `tp` * into the curried method types. */ diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index ae2eac2c20fd..79bc47ced3f1 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -12,7 +12,7 @@ import core.Types._ import core.Names._ import core.StdNames._ import core.NameOps._ -import core.NameKinds.{AdaptedClosureName, BodyRetainerName} +import core.NameKinds.{AdaptedClosureName, BodyRetainerName, ImplMethName} import core.Scopes.newScopeWith import core.Decorators._ import core.Constants._ @@ -57,6 +57,17 @@ class Erasure extends Phase with DenotTransformer { case _ => false } } + def erasedName = + if ref.is(Flags.Method) + && contextResultsAreErased(ref.symbol) + && (ref.owner.is(Flags.Trait) || ref.symbol.allOverriddenSymbols.hasNext) + then + // Add a `$` to prevent this method from having the same signature + // as a method it overrides. We need a bridge between the + // two methods, so they are not allowed to already override after erasure. + ImplMethName(ref.targetName.asTermName) + else + ref.targetName assert(ctx.phase == this, s"transforming $ref at ${ctx.phase}") if (ref.symbol eq defn.ObjectClass) { @@ -80,7 +91,7 @@ class Erasure extends Phase with DenotTransformer { val oldOwner = ref.owner val newOwner = if oldOwner == defn.AnyClass then defn.ObjectClass else oldOwner val oldName = ref.name - val newName = ref.targetName + val newName = erasedName val oldInfo = ref.info var newInfo = transformInfo(oldSymbol, oldInfo) val oldFlags = ref.flags @@ -392,7 +403,6 @@ object Erasure { cast(tree, pt) end adaptToType - /** The following code: * * val f: Function1[Int, Any] = x => ... @@ -720,7 +730,7 @@ object Erasure { assert(sym.isConstructor, s"${sym.showLocated}") defn.specialErasure(owner) else if defn.isSyntheticFunctionClass(owner) then - defn.erasedFunctionClass(owner) + defn.functionTypeErasure(owner).typeSymbol else owner diff --git a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala index c12c5c8b4a6e..18b028d1a024 100644 --- a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala +++ b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala @@ -274,10 +274,10 @@ object GenericSignatures { jsig(erasedUnderlying, toplevel, primitiveOK) } else if (defn.isSyntheticFunctionClass(sym)) { - val erasedSym = defn.erasedFunctionClass(sym) + val erasedSym = defn.functionTypeErasure(sym).typeSymbol classSig(erasedSym, pre, if (erasedSym.typeParams.isEmpty) Nil else args) } - else if (sym.isClass) + else if sym.isClass then classSig(sym, pre, args) else jsig(erasure(tp), toplevel, primitiveOK) From ed05f81391b2694526f1a959aa6801077355360f Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 13 Oct 2021 09:58:44 +0200 Subject: [PATCH 0817/1244] Fix eta expand at erasure to take erased CFTs into account --- compiler/src/dotty/tools/dotc/ast/tpd.scala | 19 +++++- .../src/dotty/tools/dotc/core/Symbols.scala | 4 ++ .../tools/dotc/transform/AccessProxies.scala | 5 +- .../dotty/tools/dotc/transform/Bridges.scala | 53 ++++++++++++++-- .../tools/dotc/transform/ByNameClosures.scala | 6 +- .../transform/ContextFunctionResults.scala | 34 +++-------- .../dotty/tools/dotc/transform/Erasure.scala | 60 +------------------ .../dotty/tools/dotc/typer/Synthesizer.scala | 2 +- .../quoted/runtime/impl/QuoteMatcher.scala | 2 +- .../quoted/runtime/impl/QuotesImpl.scala | 4 +- tests/run/i13691.scala | 53 ++++++++++++++++ tests/run/i13961a.scala | 11 ++++ 12 files changed, 154 insertions(+), 99 deletions(-) create mode 100644 tests/run/i13691.scala create mode 100644 tests/run/i13961a.scala diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index 0c12eff2a0ae..2db0bd6de2d4 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -121,9 +121,9 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { Closure(Nil, call, targetTpt)) } - /** A closure whole anonymous function has the given method type */ + /** A closure whose anonymous function has the given method type */ def Lambda(tpe: MethodType, rhsFn: List[Tree] => Tree)(using Context): Block = { - val meth = newSymbol(ctx.owner, nme.ANON_FUN, Synthetic | Method, tpe) + val meth = newAnonFun(ctx.owner, tpe) Closure(meth, tss => rhsFn(tss.head).changeOwner(ctx.owner, meth)) } @@ -1104,6 +1104,21 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { if (sym.exists) sym.defTree = tree tree } + + def etaExpandCFT(using Context): Tree = + def expand(target: Tree, tp: Type)(using Context): Tree = tp match + case defn.ContextFunctionType(argTypes, resType, isErased) => + val anonFun = newAnonFun( + ctx.owner, + MethodType.companion(isContextual = true, isErased = isErased)(argTypes, resType), + coord = ctx.owner.coord) + def lambdaBody(refss: List[List[Tree]]) = + expand(target.select(nme.apply).appliedToArgss(refss), resType)( + using ctx.withOwner(anonFun)) + Closure(anonFun, lambdaBody) + case _ => + target + expand(tree, tree.tpe.widen) } inline val MapRecursionLimit = 10 diff --git a/compiler/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala index 9e4730534bf7..e49399ff9791 100644 --- a/compiler/src/dotty/tools/dotc/core/Symbols.scala +++ b/compiler/src/dotty/tools/dotc/core/Symbols.scala @@ -712,6 +712,10 @@ object Symbols { coord: Coord = NoCoord)(using Context): TermSymbol = newSymbol(cls, nme.CONSTRUCTOR, flags | Method, MethodType(paramNames, paramTypes, cls.typeRef), privateWithin, coord) + /** Create an anonymous function symbol */ + def newAnonFun(owner: Symbol, info: Type, coord: Coord = NoCoord)(using Context): TermSymbol = + newSymbol(owner, nme.ANON_FUN, Synthetic | Method, info, coord = coord) + /** Create an empty default constructor symbol for given class `cls`. */ def newDefaultConstructor(cls: ClassSymbol)(using Context): TermSymbol = newConstructor(cls, EmptyFlags, Nil, Nil) diff --git a/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala b/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala index 81d029e023fb..de25cb140da0 100644 --- a/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala +++ b/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala @@ -51,7 +51,10 @@ abstract class AccessProxies { forwardedArgss.nonEmpty && forwardedArgss.head.nonEmpty) // defensive conditions accessRef.becomes(forwardedArgss.head.head) else - accessRef.appliedToTypeTrees(forwardedTpts).appliedToArgss(forwardedArgss) + accessRef + .appliedToTypeTrees(forwardedTpts) + .appliedToArgss(forwardedArgss) + .etaExpandCFT(using ctx.withOwner(accessor)) rhs.withSpan(accessed.span) }) diff --git a/compiler/src/dotty/tools/dotc/transform/Bridges.scala b/compiler/src/dotty/tools/dotc/transform/Bridges.scala index d91840f247b6..f7c00ef74b94 100644 --- a/compiler/src/dotty/tools/dotc/transform/Bridges.scala +++ b/compiler/src/dotty/tools/dotc/transform/Bridges.scala @@ -9,6 +9,11 @@ import ast.untpd import collection.{mutable, immutable} import util.Spans.Span import util.SrcPos +import ContextFunctionResults.{contextResultCount, contextFunctionResultTypeAfter} +import StdNames.nme +import Constants.Constant +import TypeErasure.transformInfo +import Erasure.Boxing.adaptClosure /** A helper class for generating bridge methods in class `root`. */ class Bridges(root: ClassSymbol, thisPhase: DenotTransformer)(using Context) { @@ -112,12 +117,52 @@ class Bridges(root: ClassSymbol, thisPhase: DenotTransformer)(using Context) { toBeRemoved += other } - def bridgeRhs(argss: List[List[Tree]]) = { + val memberCount = contextResultCount(member) + + /** Eta expand application `ref(args)` as needed. + * To do this correctly, we have to look at the member's original pre-erasure + * type and figure out which context function types in its result are + * not yet instantiated. + */ + def etaExpand(ref: Tree, args: List[Tree])(using Context): Tree = + def expand(args: List[Tree], tp: Type, n: Int)(using Context): Tree = + if n <= 0 then + assert(ctx.typer.isInstanceOf[Erasure.Typer]) + ctx.typer.typed(untpd.cpy.Apply(ref)(ref, args), member.info.finalResultType) + else + val defn.ContextFunctionType(argTypes, resType, isErased) = tp: @unchecked + val anonFun = newAnonFun(ctx.owner, + MethodType(if isErased then Nil else argTypes, resType), + coord = ctx.owner.coord) + anonFun.info = transformInfo(anonFun, anonFun.info) + + def lambdaBody(refss: List[List[Tree]]) = + val refs :: Nil = refss: @unchecked + val expandedRefs = refs.map(_.withSpan(ctx.owner.span.endPos)) match + case (bunchedParam @ Ident(nme.ALLARGS)) :: Nil => + argTypes.indices.toList.map(n => + bunchedParam + .select(nme.primitive.arrayApply) + .appliedTo(Literal(Constant(n)))) + case refs1 => refs1 + expand(args ::: expandedRefs, resType, n - 1)(using ctx.withOwner(anonFun)) + + val unadapted = Closure(anonFun, lambdaBody) + cpy.Block(unadapted)(unadapted.stats, + adaptClosure(unadapted.expr.asInstanceOf[Closure])) + end expand + + val otherCount = contextResultCount(other) + val start = contextFunctionResultTypeAfter(member, otherCount)(using preErasureCtx) + expand(args, start, memberCount - otherCount)(using ctx.withOwner(bridge)) + end etaExpand + + def bridgeRhs(argss: List[List[Tree]]) = assert(argss.tail.isEmpty) val ref = This(root).select(member) - if (member.info.isParameterless) ref // can happen if `member` is a module - else Erasure.partialApply(ref, argss.head) - } + if member.info.isParameterless then ref // can happen if `member` is a module + else if memberCount == 0 then ref.appliedToTermArgs(argss.head) + else etaExpand(ref, argss.head) bridges += DefDef(bridge, bridgeRhs(_).withSpan(bridge.span)) } diff --git a/compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala b/compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala index 00bcd1e5076a..51242e7f2dbe 100644 --- a/compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala +++ b/compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala @@ -30,11 +30,9 @@ class ByNameClosures extends TransformByNameApply with IdentityDenotTransformer // ExpanSAMs applied to partial functions creates methods that need // to be fully defined before converting. Test case is pos/i9391.scala. - override def mkByNameClosure(arg: Tree, argType: Type)(using Context): Tree = { - val meth = newSymbol( - ctx.owner, nme.ANON_FUN, Synthetic | Method, MethodType(Nil, Nil, argType)) + override def mkByNameClosure(arg: Tree, argType: Type)(using Context): Tree = + val meth = newAnonFun(ctx.owner, MethodType(Nil, argType)) Closure(meth, _ => arg.changeOwnerAfter(ctx.owner, meth, thisPhase)).withSpan(arg.span) - } } object ByNameClosures { diff --git a/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala b/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala index 4247b835f640..14134b4bb1fa 100644 --- a/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala +++ b/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala @@ -99,33 +99,13 @@ object ContextFunctionResults: normalParamCount(sym.info) end totalParamCount - /** The rightmost context function type in the result type of `meth` - * that represents `paramCount` curried, non-erased parameters that - * are included in the `contextResultCount` of `meth`. - * Example: - * - * Say we have `def m(x: A): B ?=> (C1, C2, C3) ?=> D ?=> E ?=> F`, - * paramCount == 4, and the contextResultCount of `m` is 3. - * Then we return the type `(C1, C2, C3) ?=> D ?=> E ?=> F`, since this - * type covers the 4 rightmost parameters C1, C2, C3 and D before the - * contextResultCount runs out at E ?=> F. - * Erased parameters are ignored; they contribute nothing to the - * parameter count. - */ - def contextFunctionResultTypeCovering(meth: Symbol, paramCount: Int)(using Context) = - atPhase(erasurePhase) { - // Recursive instances return pairs of context types and the - // # of parameters they represent. - def missingCR(tp: Type, crCount: Int): (Type, Int) = - if crCount == 0 then (tp, 0) - else - val defn.ContextFunctionType(formals, resTpe, isErased) = tp: @unchecked - val result @ (rt, nparams) = missingCR(resTpe, crCount - 1) - assert(nparams <= paramCount) - if nparams == paramCount || isErased then result - else (tp, nparams + formals.length) - missingCR(meth.info.finalResultType, contextResultCount(meth))._1 - } + /** The `depth` levels nested context function type in the result type of `meth` */ + def contextFunctionResultTypeAfter(meth: Symbol, depth: Int)(using Context) = + def recur(tp: Type, n: Int): Type = + if n == 0 then tp + else tp match + case defn.ContextFunctionType(_, resTpe, _) => recur(resTpe, n - 1) + recur(meth.info.finalResultType, depth) /** Should selection `tree` be eliminated since it refers to an `apply` * node of a context function type whose parameters will end up being diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index 79bc47ced3f1..48064d9dc280 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -57,6 +57,7 @@ class Erasure extends Phase with DenotTransformer { case _ => false } } + def erasedName = if ref.is(Flags.Method) && contextResultsAreErased(ref.symbol) @@ -383,8 +384,8 @@ object Erasure { case _: FunProto | AnyFunctionProto => tree case _ => tree.tpe.widen match case mt: MethodType if tree.isTerm => - if mt.paramInfos.isEmpty then adaptToType(tree.appliedToNone, pt) - else etaExpand(tree, mt, pt) + assert(mt.paramInfos.isEmpty) + adaptToType(tree.appliedToNone, pt) case tpw => if (pt.isInstanceOf[ProtoType] || tree.tpe <:< pt) tree @@ -533,61 +534,6 @@ object Erasure { else tree end adaptClosure - - /** Eta expand given `tree` that has the given method type `mt`, so that - * it conforms to erased result type `pt`. - * To do this correctly, we have to look at the tree's original pre-erasure - * type and figure out which context function types in its result are - * not yet instantiated. - */ - def etaExpand(tree: Tree, mt: MethodType, pt: Type)(using Context): Tree = - report.log(i"eta expanding $tree") - val defs = new mutable.ListBuffer[Tree] - val tree1 = LiftErased.liftApp(defs, tree) - val xmt = if tree.isInstanceOf[Apply] then mt else expandedMethodType(mt, tree) - val targetLength = xmt.paramInfos.length - val origOwner = ctx.owner - - // The original type from which closures should be constructed - val origType = contextFunctionResultTypeCovering(tree.symbol, targetLength) - - def abstracted(args: List[Tree], tp: Type, pt: Type)(using Context): Tree = - if args.length < targetLength then - try - val defn.ContextFunctionType(argTpes, resTpe, isErased) = tp: @unchecked - if isErased then abstracted(args, resTpe, pt) - else - val anonFun = newSymbol( - ctx.owner, nme.ANON_FUN, Flags.Synthetic | Flags.Method, - MethodType(argTpes, resTpe), coord = tree.span.endPos) - anonFun.info = transformInfo(anonFun, anonFun.info) - def lambdaBody(refss: List[List[Tree]]) = - val refs :: Nil = refss: @unchecked - val expandedRefs = refs.map(_.withSpan(tree.span.endPos)) match - case (bunchedParam @ Ident(nme.ALLARGS)) :: Nil => - argTpes.indices.toList.map(n => - bunchedParam - .select(nme.primitive.arrayApply) - .appliedTo(Literal(Constant(n)))) - case refs1 => refs1 - abstracted(args ::: expandedRefs, resTpe, anonFun.info.finalResultType)( - using ctx.withOwner(anonFun)) - - val unadapted = Closure(anonFun, lambdaBody) - cpy.Block(unadapted)(unadapted.stats, adaptClosure(unadapted.expr.asInstanceOf[Closure])) - catch case ex: MatchError => - println(i"error while abstracting tree = $tree | mt = $mt | args = $args%, % | tp = $tp | pt = $pt") - throw ex - else - assert(args.length == targetLength, i"wrong # args tree = $tree | args = $args%, % | mt = $mt | tree type = ${tree.tpe}") - val app = untpd.cpy.Apply(tree1)(tree1, args) - assert(ctx.typer.isInstanceOf[Erasure.Typer]) - ctx.typer.typed(app, pt) - .changeOwnerAfter(origOwner, ctx.owner, erasurePhase.asInstanceOf[Erasure]) - - seq(defs.toList, abstracted(Nil, origType, pt)) - end etaExpand - end Boxing class Typer(erasurePhase: DenotTransformer) extends typer.ReTyper with NoChecking { diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala index 2dd088d70671..44351b9a213c 100644 --- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala @@ -70,7 +70,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): ref(defn.NoneModule)) } val tpe = MethodType(List(nme.s))(_ => List(tp1), mth => defn.OptionClass.typeRef.appliedTo(mth.newParamRef(0) & tp2)) - val meth = newSymbol(ctx.owner, nme.ANON_FUN, Synthetic | Method, tpe, coord = span) + val meth = newAnonFun(ctx.owner, tpe, coord = span) val typeTestType = defn.TypeTestClass.typeRef.appliedTo(List(tp1, tp2)) Closure(meth, tss => body(tss.head).changeOwner(ctx.owner, meth), targetType = typeTestType).withSpan(span) case _ => diff --git a/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala b/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala index 1ee0d9d34dfa..6d9ff6ca68a8 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala @@ -212,7 +212,7 @@ object QuoteMatcher { } val argTypes = args.map(x => x.tpe.widenTermRefExpr) val methTpe = MethodType(names)(_ => argTypes, _ => pattern.tpe) - val meth = newSymbol(ctx.owner, nme.ANON_FUN, Synthetic | Method, methTpe) + val meth = newAnonFun(ctx.owner, methTpe) def bodyFn(lambdaArgss: List[List[Tree]]): Tree = { val argsMap = args.map(_.symbol).zip(lambdaArgss.head).toMap val body = new TreeMap { diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala index 1510640cfce6..d6e13fbbd168 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala @@ -385,7 +385,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler case t => t } val closureTpe = Types.MethodType(mtpe.paramNames, mtpe.paramInfos, closureResType) - val closureMethod = dotc.core.Symbols.newSymbol(owner, nme.ANON_FUN, Synthetic | Method, closureTpe) + val closureMethod = dotc.core.Symbols.newAnonFun(owner, closureTpe) tpd.Closure(closureMethod, tss => new tpd.TreeOps(self).appliedToTermArgs(tss.head).etaExpand(closureMethod)) case _ => self } @@ -793,7 +793,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler object Lambda extends LambdaModule: def apply(owner: Symbol, tpe: MethodType, rhsFn: (Symbol, List[Tree]) => Tree): Block = - val meth = dotc.core.Symbols.newSymbol(owner, nme.ANON_FUN, Synthetic | Method, tpe) + val meth = dotc.core.Symbols.newAnonFun(owner, tpe) withDefaultPos(tpd.Closure(meth, tss => xCheckMacroedOwners(xCheckMacroValidExpr(rhsFn(meth, tss.head.map(withDefaultPos))), meth))) def unapply(tree: Block): Option[(List[ValDef], Term)] = tree match { diff --git a/tests/run/i13691.scala b/tests/run/i13691.scala new file mode 100644 index 000000000000..6db01ee0de35 --- /dev/null +++ b/tests/run/i13691.scala @@ -0,0 +1,53 @@ +import language.experimental.erasedDefinitions + +erased class CanThrow[-E <: Exception] +erased class Foo +class Bar + +object unsafeExceptions: + given canThrowAny: CanThrow[Exception] = null + +object test1: + trait Decoder[+T]: + def apply(): T + + def deco: Decoder[CanThrow[Exception] ?=> Int] = new Decoder[CanThrow[Exception] ?=> Int]: + def apply(): CanThrow[Exception] ?=> Int = 1 + +object test2: + trait Decoder[+T]: + def apply(): T + + def deco: Decoder[(CanThrow[Exception], Foo) ?=> Int] = new Decoder[(CanThrow[Exception], Foo) ?=> Int]: + def apply(): (CanThrow[Exception], Foo) ?=> Int = 1 + +object test3: + trait Decoder[+T]: + def apply(): T + + def deco: Decoder[CanThrow[Exception] ?=> Foo ?=> Int] = new Decoder[CanThrow[Exception] ?=> Foo ?=> Int]: + def apply(): CanThrow[Exception] ?=> Foo ?=> Int = 1 + +object test4: + trait Decoder[+T]: + def apply(): T + + def deco: Decoder[CanThrow[Exception] ?=> Bar ?=> Int] = new Decoder[CanThrow[Exception] ?=> Bar ?=> Int]: + def apply(): CanThrow[Exception] ?=> Bar ?=> Int = 1 + +object test5: + trait Decoder[+T]: + def apply(): T + + def deco: Decoder[Bar ?=> CanThrow[Exception] ?=> Int] = new Decoder[Bar ?=> CanThrow[Exception] ?=> Int]: + def apply(): Bar ?=> CanThrow[Exception] ?=> Int = 1 + +@main def Test(): Unit = + import unsafeExceptions.canThrowAny + given Foo = ??? + given Bar = Bar() + test1.deco.apply().apply + test2.deco.apply().apply + test3.deco.apply().apply + test4.deco.apply().apply + test5.deco.apply().apply diff --git a/tests/run/i13961a.scala b/tests/run/i13961a.scala new file mode 100644 index 000000000000..9d49ab30b0a4 --- /dev/null +++ b/tests/run/i13961a.scala @@ -0,0 +1,11 @@ +import language.experimental.saferExceptions + +trait Decoder[+T]: + def apply(): T + +given Decoder[Int throws Exception] = new Decoder[Int throws Exception]: + def apply(): Int throws Exception = 1 + +@main def Test(): Unit = + import unsafeExceptions.canThrowAny + summon[Decoder[Int throws Exception]]() \ No newline at end of file From 305a6a65e0fa3644c9a970acbf1d45845733dbf4 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 3 Nov 2021 10:24:52 +0100 Subject: [PATCH 0818/1244] Bring back deleted doc comment --- compiler/src/dotty/tools/dotc/core/Definitions.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 7f2ec75af8df..16ce0e381c75 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -1358,6 +1358,8 @@ class Definitions { * - FunctionN for 22 > N >= 0 remains as FunctionN * - ContextFunctionN for N > 22 becomes FunctionXXL * - ContextFunctionN for N <= 22 becomes FunctionN + * - ErasedFunctionN becomes Function0 + * - ImplicitErasedFunctionN becomes Function0 * - anything else becomes a NoType */ def functionTypeErasure(cls: Symbol): Type = From 7f17c55228dc635f9e211f771f80941d18f8b4d0 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 3 Nov 2021 10:43:47 +0100 Subject: [PATCH 0819/1244] Use "$direct" instead of just "$" to prevent erasure clashes Use "$direct" instead of just "$" to prevent erasure clashes of methods with erased context function results. --- compiler/src/dotty/tools/dotc/core/NameKinds.scala | 2 +- compiler/src/dotty/tools/dotc/core/NameTags.scala | 7 ++++--- compiler/src/dotty/tools/dotc/transform/Erasure.scala | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/NameKinds.scala b/compiler/src/dotty/tools/dotc/core/NameKinds.scala index e17e772de993..b77f870b72b7 100644 --- a/compiler/src/dotty/tools/dotc/core/NameKinds.scala +++ b/compiler/src/dotty/tools/dotc/core/NameKinds.scala @@ -365,7 +365,7 @@ object NameKinds { val ExtMethName: SuffixNameKind = new SuffixNameKind(EXTMETH, "$extension") val ParamAccessorName: SuffixNameKind = new SuffixNameKind(PARAMACC, "$accessor") val ModuleClassName: SuffixNameKind = new SuffixNameKind(OBJECTCLASS, "$", optInfoString = "ModuleClass") - val ImplMethName: SuffixNameKind = new SuffixNameKind(IMPLMETH, "$") + val DirectMethName: SuffixNameKind = new SuffixNameKind(DIRECT, "$direct") val AdaptedClosureName: SuffixNameKind = new SuffixNameKind(ADAPTEDCLOSURE, "$adapted") { override def definesNewName = true } val SyntheticSetterName: SuffixNameKind = new SuffixNameKind(SETTER, "_$eq") diff --git a/compiler/src/dotty/tools/dotc/core/NameTags.scala b/compiler/src/dotty/tools/dotc/core/NameTags.scala index 63aea8853235..67dfcec73c53 100644 --- a/compiler/src/dotty/tools/dotc/core/NameTags.scala +++ b/compiler/src/dotty/tools/dotc/core/NameTags.scala @@ -24,8 +24,9 @@ object NameTags extends TastyFormat.NameTags { final val ADAPTEDCLOSURE = 31 // Used in Erasure to adapt closures over primitive types. - final val IMPLMETH = 32 // Used to define methods in implementation classes - // (can probably be removed). + final val DIRECT = 32 // Used to define implementations of methods with + // erased context function results that can override some + // other method. final val PARAMACC = 33 // Used for a private parameter alias @@ -48,7 +49,7 @@ object NameTags extends TastyFormat.NameTags { case INITIALIZER => "INITIALIZER" case FIELD => "FIELD" case EXTMETH => "EXTMETH" - case IMPLMETH => "IMPLMETH" + case DIRECT => "DIRECT" case PARAMACC => "PARAMACC" case ADAPTEDCLOSURE => "ADAPTEDCLOSURE" case OBJECTCLASS => "OBJECTCLASS" diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index 48064d9dc280..ab6f00dfc575 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -12,7 +12,7 @@ import core.Types._ import core.Names._ import core.StdNames._ import core.NameOps._ -import core.NameKinds.{AdaptedClosureName, BodyRetainerName, ImplMethName} +import core.NameKinds.{AdaptedClosureName, BodyRetainerName, DirectMethName} import core.Scopes.newScopeWith import core.Decorators._ import core.Constants._ @@ -63,10 +63,10 @@ class Erasure extends Phase with DenotTransformer { && contextResultsAreErased(ref.symbol) && (ref.owner.is(Flags.Trait) || ref.symbol.allOverriddenSymbols.hasNext) then - // Add a `$` to prevent this method from having the same signature + // Add a `$direct` to prevent this method from having the same signature // as a method it overrides. We need a bridge between the // two methods, so they are not allowed to already override after erasure. - ImplMethName(ref.targetName.asTermName) + DirectMethName(ref.targetName.asTermName) else ref.targetName From 01b5b4b9ba5d837b254550d0057ef869b8eaa349 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 8 Nov 2021 11:26:33 +0000 Subject: [PATCH 0820/1244] Fix messages leaking via suspended messages It isn't clear what StoreReporter's purpose is. Is it simply a store of all messages, or is it a store of "real" messages, i.e. messages that aren't suppressed with `@nowarn` or -Wconf (i.e. configurable warnings)? I believe StoreReporter is often used as a way to get programmatic access to the real messages. Typer, with its TyperState, uses StoreReporter as a more general buffer while making typing attempts, such as when trying to apply an implicit conversion. But with configurable warnings, we don't know if a warning is real or not until we've typed all the `@nowarn` annotation in the code, which is why we suspend the messages, on Run. So we add an override for TyperState, so that StoreReporter is used as simply a buffer. When it then unbuffers its messages in flush to the parent context's reporter, it will run through the regular "issueIfNotSuppressed" code (assuming it's not another store reporter). --- .../dotty/tools/dotc/core/TyperState.scala | 2 +- .../dotc/reporting/ExploringReporter.scala | 2 +- .../dotty/tools/dotc/reporting/Reporter.scala | 68 ++++++++++--------- .../tools/dotc/reporting/StoreReporter.scala | 9 ++- .../tools/dotc/reporting/TestReporter.scala | 2 +- 5 files changed, 46 insertions(+), 37 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/TyperState.scala b/compiler/src/dotty/tools/dotc/core/TyperState.scala index 9aa51a6714c3..6163eebfbef4 100644 --- a/compiler/src/dotty/tools/dotc/core/TyperState.scala +++ b/compiler/src/dotty/tools/dotc/core/TyperState.scala @@ -103,7 +103,7 @@ class TyperState() { this /** A fresh typer state with the same constraint as this one. */ - def fresh(reporter: Reporter = StoreReporter(this.reporter), + def fresh(reporter: Reporter = StoreReporter(this.reporter, fromTyperState = true), committable: Boolean = this.isCommittable): TyperState = util.Stats.record("TyperState.fresh") TyperState().init(this, this.constraint) diff --git a/compiler/src/dotty/tools/dotc/reporting/ExploringReporter.scala b/compiler/src/dotty/tools/dotc/reporting/ExploringReporter.scala index e7b636cddf02..9255820140d8 100644 --- a/compiler/src/dotty/tools/dotc/reporting/ExploringReporter.scala +++ b/compiler/src/dotty/tools/dotc/reporting/ExploringReporter.scala @@ -7,7 +7,7 @@ import core.Contexts.Context import Diagnostic._ /** A re-usable Reporter used in Contexts#test */ -class ExploringReporter extends StoreReporter(null): +class ExploringReporter extends StoreReporter(null, fromTyperState = false): infos = new mutable.ListBuffer[Diagnostic] override def hasUnreportedErrors: Boolean = diff --git a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala index 8c736993de8e..e159b5f83863 100644 --- a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala +++ b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala @@ -137,42 +137,44 @@ abstract class Reporter extends interfaces.ReporterResult { var unreportedWarnings: Map[String, Int] = Map.empty + /** Issue the diagnostic, ignoring `-Wconf` and `@nowarn` configurations, + * but still honouring `-nowarn`, `-Werror`, and conditional warnings. */ + def issueUnconfigured(dia: Diagnostic)(using Context): Unit = dia match + case w: Warning if ctx.settings.silentWarnings.value => + case w: ConditionalWarning if w.isSummarizedConditional => + val key = w.enablingOption.name + val count = unreportedWarnings.getOrElse(key, 0) + unreportedWarnings = unreportedWarnings.updated(key, count + 1) + case _ => + // conditional warnings that are not enabled are not fatal + val d = dia match + case w: Warning if ctx.settings.XfatalWarnings.value => w.toError + case _ => dia + if !isHidden(d) then // avoid isHidden test for summarized warnings so that message is not forced + withMode(Mode.Printing)(doReport(d)) + d match { + case _: Warning => _warningCount += 1 + case e: Error => + errors = e :: errors + _errorCount += 1 + if ctx.typerState.isGlobalCommittable then + ctx.base.errorsToBeReported = true + case _: Info => // nothing to do here + // match error if d is something else + } + end issueUnconfigured + def issueIfNotSuppressed(dia: Diagnostic)(using Context): Unit = def go() = import Action._ - - val toReport = dia match - case w: Warning => - def fatal(w: Warning) = if ctx.settings.XfatalWarnings.value && !w.isSummarizedConditional then Some(w.toError) else Some(w) - if ctx.settings.silentWarnings.value then None - else WConf.parsed.action(dia) match - case Silent => None - case Info => Some(w.toInfo) - case Warning => fatal(w) - case Verbose => fatal(w).tap(_.foreach(_.setVerbose())) - case Error => Some(w.toError) - case _ => Some(dia) - - toReport foreach { - case cw: ConditionalWarning if cw.isSummarizedConditional => - val key = cw.enablingOption.name - unreportedWarnings = - unreportedWarnings.updated(key, unreportedWarnings.getOrElse(key, 0) + 1) - case d if !isHidden(d) => - withMode(Mode.Printing)(doReport(d)) - d match { - case _: Warning => _warningCount += 1 - case e: Error => - errors = e :: errors - _errorCount += 1 - if ctx.typerState.isGlobalCommittable then - ctx.base.errorsToBeReported = true - case _: Info => // nothing to do here - // match error if d is something else - } - case _ => // hidden - } - end go + dia match + case w: Warning => WConf.parsed.action(w) match + case Error => issueUnconfigured(w.toError) + case Warning => issueUnconfigured(w) + case Verbose => issueUnconfigured(w.setVerbose()) + case Info => issueUnconfigured(w.toInfo) + case Silent => + case _ => issueUnconfigured(dia) // `ctx.run` can be null in test, also in the repl when parsing the first line. The parser runs early, the Run is // only created in ReplDriver.compile when a line is submitted. This means that `@nowarn` doesnt work on parser diff --git a/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala b/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala index d3c334599666..db39ed6527d1 100644 --- a/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala +++ b/compiler/src/dotty/tools/dotc/reporting/StoreReporter.scala @@ -17,7 +17,7 @@ import Diagnostic._ * - The reporter is not flushed and the message containers capture a * `Context` (about 4MB) */ -class StoreReporter(outer: Reporter = Reporter.NoReporter) extends Reporter { +class StoreReporter(outer: Reporter = Reporter.NoReporter, fromTyperState: Boolean = false) extends Reporter { protected var infos: mutable.ListBuffer[Diagnostic] = null @@ -40,4 +40,11 @@ class StoreReporter(outer: Reporter = Reporter.NoReporter) extends Reporter { override def pendingMessages(using Context): List[Diagnostic] = if (infos != null) infos.toList else Nil override def errorsReported: Boolean = hasErrors || (outer != null && outer.errorsReported) + + // If this is a TyperState buffering reporter then buffer the messages, + // so that then only when the messages are unbuffered (when the reporter if flushed) + // do they go through -Wconf, and possibly then buffered on the Run as a suspended message + override def report(dia: Diagnostic)(using Context): Unit = + if fromTyperState then issueUnconfigured(dia) + else super.report(dia) } diff --git a/compiler/src/dotty/tools/dotc/reporting/TestReporter.scala b/compiler/src/dotty/tools/dotc/reporting/TestReporter.scala index 8ad5b525de5c..a3d84e462bf0 100644 --- a/compiler/src/dotty/tools/dotc/reporting/TestReporter.scala +++ b/compiler/src/dotty/tools/dotc/reporting/TestReporter.scala @@ -6,7 +6,7 @@ import collection.mutable import Diagnostic._ /** A re-usable Reporter used in Contexts#test */ -class TestingReporter extends StoreReporter(null): +class TestingReporter extends StoreReporter(null, fromTyperState = false): infos = new mutable.ListBuffer[Diagnostic] override def hasUnreportedErrors: Boolean = infos.exists(_.isInstanceOf[Error]) def reset(): Unit = infos.clear() From 57a21adc2e9d45987e671a22f99cb87b788c0b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Mon, 8 Nov 2021 11:08:57 +0100 Subject: [PATCH 0821/1244] Add source position for errors from doc-root-content file --- .../tools/scaladoc/tasty/comments/Comments.scala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala index 52093e42a6f0..e3df52b11d61 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala @@ -88,6 +88,11 @@ abstract class MarkupConversion[T](val repr: Repr)(using dctx: DocContext) { if repr == null then null.asInstanceOf[qctx.reflect.Symbol] else repr.sym private given qctx.type = qctx + lazy val srcPos = if owner == qctx.reflect.defn.RootClass then { + val sourceFile = dctx.args.rootDocPath.map(p => dotty.tools.dotc.util.SourceFile(dotty.tools.io.AbstractFile.getFile(p), scala.io.Codec.UTF8)) + sourceFile.fold(dotty.tools.dotc.util.NoSourcePosition)(sf => dotty.tools.dotc.util.SourcePosition(sf, dotty.tools.dotc.util.Spans.NoSpan)) + } else owner.pos.get.asInstanceOf[dotty.tools.dotc.util.SrcPos] + object SymOpsWithLinkCache extends SymOpsWithLinkCache export SymOpsWithLinkCache._ import SymOps._ @@ -96,8 +101,7 @@ abstract class MarkupConversion[T](val repr: Repr)(using dctx: DocContext) { if SchemeUri.matches(queryStr) then DocLink.ToURL(queryStr) else QueryParser(queryStr).tryReadQuery() match case Left(err) => - // TODO convert owner.pos to get to the comment, add stack trace - report.warning(s"Unable to parse query `$queryStr`: ${err.getMessage}") + report.warning(s"Unable to parse query `$queryStr`: ${err.getMessage}", srcPos) val msg = s"Unable to parse query: ${err.getMessage}" DocLink.UnresolvedDRI(queryStr, msg) case Right(query) => @@ -112,7 +116,8 @@ abstract class MarkupConversion[T](val repr: Repr)(using dctx: DocContext) { val msg = s"$txt: $queryStr" if (!summon[DocContext].args.noLinkWarnings) then - report.warning(msg, owner.pos.get.asInstanceOf[dotty.tools.dotc.util.SrcPos]) + + report.warning(msg, srcPos) DocLink.UnresolvedDRI(queryStr, txt) From be318fb711ecae2beac4be15db0856e733d9b5ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Mon, 8 Nov 2021 11:29:28 +0100 Subject: [PATCH 0822/1244] Fix double implicit modifier --- scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala index 6e80c164d1d9..e412475cbf2c 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala @@ -100,7 +100,7 @@ object SymOps: Flags.Case -> Modifier.Case, ).collect { case (flag, mod) if sym.flags.is(flag) => mod - } ++ Seq(Modifier.Implicit).filter(_ => sym.isImplicitClass) + } def isHiddenByVisibility(using dctx: DocContext): Boolean = import VisibilityScope._ From e9ae876e00ee235b178e7fc29ac0677bc43f32b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Fri, 12 Nov 2021 11:20:23 +0100 Subject: [PATCH 0823/1244] Add test for implicit class --- scaladoc-testcases/src/tests/classModifiers.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scaladoc-testcases/src/tests/classModifiers.scala b/scaladoc-testcases/src/tests/classModifiers.scala index a189c0e0c53b..c129ef92de2c 100644 --- a/scaladoc-testcases/src/tests/classModifiers.scala +++ b/scaladoc-testcases/src/tests/classModifiers.scala @@ -11,3 +11,5 @@ sealed case class D(c: String) final case class E(c: String) open class F + +implicit class Foo(i: Int) From e433a9b2dc2b53691a2258ff3c86be3b6cd87e54 Mon Sep 17 00:00:00 2001 From: comcx Date: Sun, 14 Nov 2021 15:51:28 +0800 Subject: [PATCH 0824/1244] fix typo in doc --- compiler/src/dotty/tools/dotc/core/Names.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/core/Names.scala b/compiler/src/dotty/tools/dotc/core/Names.scala index 97356c76dde8..f12aaecdd12d 100644 --- a/compiler/src/dotty/tools/dotc/core/Names.scala +++ b/compiler/src/dotty/tools/dotc/core/Names.scala @@ -245,7 +245,7 @@ object Names { myMangledString } - /** If this a qualified name, split it into underlyng, last part, and separator + /** If this a qualified name, split it into underlying, last part, and separator * Otherwise return an empty name, the name itself, and "") */ def split: (TermName, TermName, String) From 6f2b8da2be1542ce63ce3c1b07a66d9102063220 Mon Sep 17 00:00:00 2001 From: Arthur Sengileyev Date: Mon, 25 Oct 2021 14:20:57 +0300 Subject: [PATCH 0825/1244] Consider minTargetVersion as always supported --- compiler/src/dotty/tools/dotc/config/ScalaSettings.scala | 2 +- compiler/test/dotty/tools/dotc/CompilationTests.scala | 2 ++ tests/neg-custom-args/jdk-9-app.check | 6 ++++++ tests/neg-custom-args/jdk-9-app.scala | 5 +++++ tests/pos-custom-args/jdk-8-app.scala | 5 +++++ 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 tests/neg-custom-args/jdk-9-app.check create mode 100644 tests/neg-custom-args/jdk-9-app.scala create mode 100644 tests/pos-custom-args/jdk-8-app.scala diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index d66c5d7ab4c2..13adb0165c77 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -24,7 +24,7 @@ object ScalaSettings: val jdkVersion = JDK9Reflectors.runtimeVersionMajor(JDK9Reflectors.runtimeVersion()).intValue() val maxVersion = Math.min(jdkVersion, maxTargetVersion) (minTargetVersion to maxVersion).toList.map(_.toString) - else List() + else List(minTargetVersion).map(_.toString) def defaultClasspath: String = sys.env.getOrElse("CLASSPATH", ".") diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index 06526aa6a924..4a85d863ed9f 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -64,6 +64,7 @@ class CompilationTests { compileFile("tests/pos-custom-args/help.scala", defaultOptions.and("-help", "-V", "-W", "-X", "-Y")), compileFile("tests/pos-custom-args/i10383.scala", defaultOptions.and("-source", "future", "-deprecation", "-Xfatal-warnings")), compileFile("tests/pos-custom-args/i13044.scala", defaultOptions.and("-Xmax-inlines:33")), + compileFile("tests/pos-custom-args/jdk-8-app.scala", defaultOptions.and("-release:8")), ).checkCompile() } @@ -184,6 +185,7 @@ class CompilationTests { compileDir("tests/neg-custom-args/hidden-type-errors", defaultOptions.and("-explain")), compileFile("tests/neg-custom-args/i13026.scala", defaultOptions.and("-print-lines")), compileFile("tests/neg-custom-args/i13838.scala", defaultOptions.and("-Ximplicit-search-limit", "1000")), + compileFile("tests/neg-custom-args/jdk-9-app.scala", defaultOptions.and("-release:8")), ).checkExpectedErrors() } diff --git a/tests/neg-custom-args/jdk-9-app.check b/tests/neg-custom-args/jdk-9-app.check new file mode 100644 index 000000000000..e2b94e2cb115 --- /dev/null +++ b/tests/neg-custom-args/jdk-9-app.check @@ -0,0 +1,6 @@ +-- [E006] Not Found Error: tests/neg-custom-args/jdk-9-app.scala:4:10 -------------------------------------------------- +4 | println(ProcessHandle.current().pid()) // error: not found + | ^^^^^^^^^^^^^ + | Not found: ProcessHandle + +longer explanation available when compiling with `-explain` diff --git a/tests/neg-custom-args/jdk-9-app.scala b/tests/neg-custom-args/jdk-9-app.scala new file mode 100644 index 000000000000..3dfd55332492 --- /dev/null +++ b/tests/neg-custom-args/jdk-9-app.scala @@ -0,0 +1,5 @@ +import java.lang.ProcessHandle + +object Jdk9App extends App { + println(ProcessHandle.current().pid()) // error: not found +} diff --git a/tests/pos-custom-args/jdk-8-app.scala b/tests/pos-custom-args/jdk-8-app.scala new file mode 100644 index 000000000000..6a9d07155958 --- /dev/null +++ b/tests/pos-custom-args/jdk-8-app.scala @@ -0,0 +1,5 @@ +import java.time.LocalDate + +object Jdk8App extends App { + println(LocalDate.now()) +} From bf0ecd36be86c0ad31951f51147bac3c4e68023d Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 5 Nov 2021 11:19:08 +0100 Subject: [PATCH 0826/1244] Try to instantiate type variables in tryInsertImplicitOnQualifier Fixes #13842 What happened in #13842 was that we were not hitting this case in `tryWiden`, which is a method in ApproximatingTypeMap that tries to dealias or widen before propagating a Range outwards: ```scala case info: SingletonType => // if H#x: y.type, then for any x in L..H, x.type =:= y.type, // hence we can replace with y.type under all variances reapply(info) ``` The actual info here was a TypeVar with a singleton type as lower bound. Instantiating the TypeVar produces a SingletonType and case applies. We cannot really instantiate TypeVars here since this is very low-level code. For instance we might be in a state where the instantiation is provisional and the TyperState is thrown away. But AsSeenFrom results are cached so we'd have the wrong type in the caches. What we do instead is add an additional case in `tryInsertImplicitOnQualifier` which is the last resort when an application fails. Here, if we can instantiate some type variables in the qualifier, we try again. --- .../dotty/tools/dotc/typer/Inferencing.scala | 16 +++++---- .../src/dotty/tools/dotc/typer/Typer.scala | 35 +++++++++++++------ .../test/dotc/pos-test-pickling.blacklist | 4 +++ tests/pos/i13842.scala | 14 ++++++++ 4 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 tests/pos/i13842.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala index d0565857db91..c544a0423d51 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala @@ -96,8 +96,12 @@ object Inferencing { * their instantiation could uncover new type members. However that search is best * effort only. It might miss type variables that appear in structures involving * alias types and type projections. + * @param applied Test is done in a `tryInsertImplicitOnQualifier` application. + * In this case, we always try to instantiate TypeVars in type arguments. + * If `applied` is false, we only try that in arguments that may affect + * the result type. */ - def couldInstantiateTypeVar(tp: Type)(using Context): Boolean = tp.dealias match + def couldInstantiateTypeVar(tp: Type, applied: Boolean = false)(using Context): Boolean = tp.dealias match case tvar: TypeVar if !tvar.isInstantiated && ctx.typerState.constraint.contains(tvar) @@ -120,14 +124,14 @@ object Inferencing { case _ => Nil case _ => Nil case _ => Nil - couldInstantiateTypeVar(tycon) - || argsInResult.exists(couldInstantiateTypeVar) + couldInstantiateTypeVar(tycon, applied) + || (if applied then args else argsInResult).exists(couldInstantiateTypeVar(_, applied)) case RefinedType(parent, _, _) => - couldInstantiateTypeVar(parent) + couldInstantiateTypeVar(parent, applied) case tp: AndOrType => - couldInstantiateTypeVar(tp.tp1) || couldInstantiateTypeVar(tp.tp2) + couldInstantiateTypeVar(tp.tp1, applied) || couldInstantiateTypeVar(tp.tp2, applied) case AnnotatedType(tp, _) => - couldInstantiateTypeVar(tp) + couldInstantiateTypeVar(tp, applied) case _ => false diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 4c2533d6dbba..6177faf6b6b0 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -81,6 +81,12 @@ object Typer { */ private val InsertedApply = new Property.Key[Unit] + /** An attachment on a result of an implicit conversion or extension method + * that was added by tryInsertImplicitOnQualifier. Needed to prevent infinite + * expansions in error cases (e.g. in fuzzy/i9293.scala). + */ + private val InsertedImplicitOnQualifier = new Property.Key[Unit] + /** An attachment on a tree `t` occurring as part of a `t()` where * the `()` was dropped by the Typer. */ @@ -3141,21 +3147,30 @@ class Typer extends Namer } /** If this tree is a select node `qual.name` (possibly applied to type variables) - * that does not conform to `pt`, try to insert an implicit conversion `c` around - * `qual` so that `c(qual).name` conforms to `pt`. + * that does not conform to `pt`, try two mitigations: + * 1. Instantiate any TypeVars in the widened type of `tree` with their lower bounds. + * 2. Try to insert an implicit conversion `c` around `qual` so that + * `c(qual).name` conforms to `pt`. */ def tryInsertImplicitOnQualifier(tree: Tree, pt: Type, locked: TypeVars)(using Context): Option[Tree] = trace(i"try insert impl on qualifier $tree $pt") { tree match case tree @ Select(qual, name) if name != nme.CONSTRUCTOR => - val selProto = SelectionProto(name, pt, NoViewsAllowed, privateOK = false) - if selProto.isMatchedBy(qual.tpe) then None + if couldInstantiateTypeVar(qual.tpe.widen, applied = true) + then + Some(adapt(tree, pt, locked)) else - tryEither { - val tree1 = tryExtensionOrConversion(tree, pt, pt, qual, locked, NoViewsAllowed, inSelect = false) - if tree1.isEmpty then None - else Some(adapt(tree1, pt, locked)) - } { (_, _) => None - } + val selProto = SelectionProto(name, pt, NoViewsAllowed, privateOK = false) + if selProto.isMatchedBy(qual.tpe) || tree.hasAttachment(InsertedImplicitOnQualifier) then + None + else + tryEither { + val tree1 = tryExtensionOrConversion(tree, pt, pt, qual, locked, NoViewsAllowed, inSelect = false) + if tree1.isEmpty then None + else + tree1.putAttachment(InsertedImplicitOnQualifier, ()) + Some(adapt(tree1, pt, locked)) + } { (_, _) => None + } case TypeApply(fn, args) if args.forall(_.isInstanceOf[untpd.InferredTypeTree]) => tryInsertImplicitOnQualifier(fn, pt, locked) case _ => None diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist index 9c94e5968fce..42f2e417d759 100644 --- a/compiler/test/dotc/pos-test-pickling.blacklist +++ b/compiler/test/dotc/pos-test-pickling.blacklist @@ -68,6 +68,10 @@ i8182.scala # local lifted value in annotation argument has different position after pickling i2797a +# Late instantiation of type variable in tryInsertImplicitOnQualifier +# allows to simplify a type that was already computed +i13842.scala + # GADT cast applied to singleton type difference i4176-gadt.scala diff --git a/tests/pos/i13842.scala b/tests/pos/i13842.scala new file mode 100644 index 000000000000..7d29633619ec --- /dev/null +++ b/tests/pos/i13842.scala @@ -0,0 +1,14 @@ +class Parent { class E } + +object ChildA extends Parent + +object ChildB extends Parent + +class Printer[C <: Parent](val child: C): + def print22(e: child.E): String = "" + +def test = + Printer(ChildA).print22(new ChildA.E) // does not work + + //Printer[ChildA.type](ChildA).print22(new ChildA.E) // works + //val p = Printer(ChildA); p.print22(new ChildA.E) // works From bc6a743f9f47fb70b134a5352e266faeb86b6b0e Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Wed, 13 Oct 2021 04:29:35 -0400 Subject: [PATCH 0827/1244] Fix for the secondary constructor parameters bug - Insert the parameters of the secondary constructor into the `Objekt` of `thisV`, so that they can be looked up when it is referenced. - Add tests --- .../tools/dotc/transform/init/Semantic.scala | 23 ++++++++++++++++--- tests/init/pos/second-ctor-fields.scala | 17 ++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 tests/init/pos/second-ctor-fields.scala diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala index 4c88fd80bc3a..88794c609805 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala @@ -652,6 +652,15 @@ object Semantic { } def callConstructor(ctor: Symbol, args: List[ArgInfo], source: Tree): Contextual[Result] = log("call " + ctor.show + ", args = " + args, printer, (_: Result).show) { + // init "fake" param fields for the secondary constructor + def addParamsAsFields(env: Env, ref: Ref, ctorDef: DefDef) = { + val paramSyms = ctorDef.termParamss.flatten.map(_.symbol) + paramSyms.map { acc => + val value = env.lookup(acc) + ref.updateField(acc, value) + printer.println(acc.show + " initialized with " + value) + } + } value match { case Hot | Cold | _: RefSet | _: Fun => report.error("unexpected constructor call, meth = " + ctor + ", value = " + value, source) @@ -668,6 +677,7 @@ object Semantic { val tpl = cls.defTree.asInstanceOf[TypeDef].rhs.asInstanceOf[Template] init(tpl, ref, cls) else + addParamsAsFields(env, ref, ddef) val initCall = ddef.rhs match case Block(call :: _, _) => call case call => call @@ -682,12 +692,13 @@ object Semantic { given Trace = trace1 val cls = ctor.owner.enclosingClass.asClass val ddef = ctor.defTree.asInstanceOf[DefDef] - given Env= Env(ddef, args.map(_.value).widenArgs) + given Env = Env(ddef, args.map(_.value).widenArgs) if ctor.isPrimaryConstructor then val tpl = cls.defTree.asInstanceOf[TypeDef].rhs.asInstanceOf[Template] val res = withTrace(trace.add(cls.defTree)) { eval(tpl, ref, cls, cacheResult = true) } Result(ref, res.errors) else + addParamsAsFields(env, ref, ddef) eval(ddef.rhs, ref, cls, cacheResult = true) else if ref.canIgnoreMethodCall(ctor) then Result(Hot, Nil) @@ -752,19 +763,25 @@ object Semantic { Result(value2, errors) } } + end extension + extension (ref: Ref) def accessLocal(tmref: TermRef, klass: ClassSymbol, source: Tree): Contextual[Result] = val sym = tmref.symbol def default() = Result(Hot, Nil) if sym.is(Flags.Param) && sym.owner.isConstructor then + // if we can get the field from the Ref (which can only possibly be + // a secondary constructor parameter), then use it. + if (ref.objekt.hasField(sym)) + Result(ref.objekt.field(sym), Errors.empty) // instances of local classes inside secondary constructors cannot // reach here, as those values are abstracted by Cold instead of Warm. // This enables us to simplify the domain without sacrificing // expressiveness nor soundess, as local classes inside secondary // constructors are uncommon. - if sym.isContainedIn(klass) then + else if sym.isContainedIn(klass) then Result(env.lookup(sym), Nil) else // We don't know much about secondary constructor parameters in outer scope. @@ -777,7 +794,7 @@ object Semantic { case vdef: ValDef => // resolve this for local variable val enclosingClass = sym.owner.enclosingClass.asClass - val thisValue2 = resolveThis(enclosingClass, value, klass, source) + val thisValue2 = resolveThis(enclosingClass, ref, klass, source) thisValue2 match { case Hot => Result(Hot, Errors.empty) diff --git a/tests/init/pos/second-ctor-fields.scala b/tests/init/pos/second-ctor-fields.scala new file mode 100644 index 000000000000..70e7b46791b6 --- /dev/null +++ b/tests/init/pos/second-ctor-fields.scala @@ -0,0 +1,17 @@ + +class A(b: B) { + def this(b: B, m: Int) = { + this(b) + def foo = m // resolved to parameter `m` + class C { foo } // resolved to parameter `m`, as hidden field of `A` + new C + } +} + +class D(b: B) extends A(b, 10) { + val n = 10 +} + +class B { + val a = new D(this) +} From cd4db255ff27db8f2e75fc22b2773ad5fc364e53 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 15 Nov 2021 09:57:02 +0100 Subject: [PATCH 0828/1244] move implementation of ordinal in enums to posttyper also add a check that ordinal is not implemented by the user, or mixed in by a trait - this is necessary as scala.deriving.Mirror.Sum delegates to ordinal method on an enum. Note that before this commit, as enum cases would previously declare ordinal methods at desugaring (without an override flag), refchecks would issue an override-without-override-modifier error anyway. Co-authored-by: Jamie Thompson Co-authored-by: Martin Odersky --- .../src/dotty/tools/dotc/ast/DesugarEnums.scala | 11 +++-------- .../src/dotty/tools/dotc/core/Definitions.scala | 1 + .../tools/dotc/transform/SyntheticMembers.scala | 14 +++++++++++++- .../src/dotty/tools/dotc/typer/Checking.scala | 13 +++++++++++++ tests/neg/enumsLabel-singleimpl.scala | 8 ++++---- tests/pos/i13554.scala | 6 ++++++ tests/pos/i13554a.scala | 15 +++++++++++++++ 7 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 tests/pos/i13554.scala create mode 100644 tests/pos/i13554a.scala diff --git a/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala b/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala index d47fd93abaf4..009aba09f2f6 100644 --- a/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala +++ b/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala @@ -179,13 +179,12 @@ object DesugarEnums { * } */ private def enumValueCreator(using Context) = { - val fieldMethods = if isJavaEnum then Nil else ordinalMeth(Ident(nme.ordinalDollar_)) :: Nil val creator = New(Template( constr = emptyConstructor, parents = enumClassRef :: scalaRuntimeDot(tpnme.EnumValue) :: Nil, derived = Nil, self = EmptyValDef, - body = fieldMethods + body = Nil ).withAttachment(ExtendsSingletonMirror, ())) DefDef(nme.DOLLAR_NEW, List(List(param(nme.ordinalDollar_, defn.IntType), param(nme.nameDollar, defn.StringType))), @@ -270,8 +269,6 @@ object DesugarEnums { def param(name: TermName, typ: Type)(using Context): ValDef = param(name, TypeTree(typ)) def param(name: TermName, tpt: Tree)(using Context): ValDef = ValDef(name, tpt, EmptyTree).withFlags(Param) - private def isJavaEnum(using Context): Boolean = enumClass.derivesFrom(defn.JavaEnumClass) - def ordinalMeth(body: Tree)(using Context): DefDef = DefDef(nme.ordinal, Nil, TypeTree(defn.IntType), body).withAddedFlags(Synthetic) @@ -290,10 +287,8 @@ object DesugarEnums { expandSimpleEnumCase(name, mods, definesLookups, span) else { val (tag, scaffolding) = nextOrdinal(name, CaseKind.Object, definesLookups) - val impl1 = cpy.Template(impl)( - parents = impl.parents :+ scalaRuntimeDot(tpnme.EnumValue), - body = if isJavaEnum then Nil else ordinalMethLit(tag) :: Nil - ).withAttachment(ExtendsSingletonMirror, ()) + val impl1 = cpy.Template(impl)(parents = impl.parents :+ scalaRuntimeDot(tpnme.EnumValue), body = Nil) + .withAttachment(ExtendsSingletonMirror, ()) val vdef = ValDef(name, TypeTree(), New(impl1)).withMods(mods.withAddedFlags(EnumValue, span)) flatTree(vdef :: scaffolding).withSpan(span) } diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 16ce0e381c75..d6c713039190 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -733,6 +733,7 @@ class Definitions { @tu lazy val NoneModule: Symbol = requiredModule("scala.None") @tu lazy val EnumClass: ClassSymbol = requiredClass("scala.reflect.Enum") + @tu lazy val Enum_ordinal: Symbol = EnumClass.requiredMethod(nme.ordinal) @tu lazy val EnumValueSerializationProxyClass: ClassSymbol = requiredClass("scala.runtime.EnumValueSerializationProxy") @tu lazy val EnumValueSerializationProxyConstructor: TermSymbol = diff --git a/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala b/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala index ac8d96afb604..3a94a78b3d8e 100644 --- a/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala +++ b/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala @@ -66,7 +66,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) { myCaseSymbols = defn.caseClassSynthesized myCaseModuleSymbols = myCaseSymbols.filter(_ ne defn.Any_equals) myEnumValueSymbols = List(defn.Product_productPrefix) - myNonJavaEnumValueSymbols = myEnumValueSymbols :+ defn.Any_toString + myNonJavaEnumValueSymbols = myEnumValueSymbols :+ defn.Any_toString :+ defn.Enum_ordinal } def valueSymbols(using Context): List[Symbol] = { initSymbols; myValueSymbols } @@ -132,6 +132,17 @@ class SyntheticMembers(thisPhase: DenotTransformer) { else // assume owner is `val Foo = new MyEnum { def ordinal = 0 }` Literal(Constant(clazz.owner.name.toString)) + def ordinalRef: Tree = + if isSimpleEnumValue then // owner is `def $new(_$ordinal: Int, $name: String) = new MyEnum { ... }` + ref(clazz.owner.paramSymss.head.find(_.name == nme.ordinalDollar_).get) + else // val CaseN = new MyEnum { ... def ordinal: Int = n } + val vdef = clazz.owner + val parentEnum = vdef.owner.companionClass + val children = parentEnum.children.zipWithIndex + val candidate: Option[Int] = children.collectFirst { case (child, idx) if child == vdef => idx } + assert(candidate.isDefined, i"could not find child for $vdef") + Literal(Constant(candidate.get)) + def toStringBody(vrefss: List[List[Tree]]): Tree = if (clazz.is(ModuleClass)) ownName else if (isNonJavaEnumValue) identifierRef @@ -143,6 +154,7 @@ class SyntheticMembers(thisPhase: DenotTransformer) { case nme.toString_ => toStringBody(vrefss) case nme.equals_ => equalsBody(vrefss.head.head) case nme.canEqual_ => canEqualBody(vrefss.head.head) + case nme.ordinal => ordinalRef case nme.productArity => Literal(Constant(accessors.length)) case nme.productPrefix if isEnumValue => nameRef case nme.productPrefix => ownName diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index 185b0584a5a2..6343f0bc4716 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -1217,8 +1217,19 @@ trait Checking { /** 1. Check that all case classes that extend `scala.reflect.Enum` are `enum` cases * 2. Check that parameterised `enum` cases do not extend java.lang.Enum. * 3. Check that only a static `enum` base class can extend java.lang.Enum. + * 4. Check that user does not implement an `ordinal` method in the body of an enum class. */ def checkEnum(cdef: untpd.TypeDef, cls: Symbol, firstParent: Symbol)(using Context): Unit = { + def existingDef(sym: Symbol, clazz: ClassSymbol)(using Context): Symbol = // adapted from SyntheticMembers + val existing = sym.matchingMember(clazz.thisType) + if existing != sym && !existing.is(Deferred) then existing else NoSymbol + def checkExistingOrdinal(using Context) = + val decl = existingDef(defn.Enum_ordinal, cls.asClass) + if decl.exists then + if decl.owner == cls then + report.error(em"the ordinal method of enum $cls can not be defined by the user", decl.srcPos) + else + report.error(em"enum $cls can not inherit the concrete ordinal method of ${decl.owner}", cdef.srcPos) def isEnumAnonCls = cls.isAnonymousClass && cls.owner.isTerm @@ -1238,6 +1249,8 @@ trait Checking { // this test allows inheriting from `Enum` by hand; // see enum-List-control.scala. report.error(ClassCannotExtendEnum(cls, firstParent), cdef.srcPos) + if cls.isEnumClass && !isJavaEnum then + checkExistingOrdinal } /** Check that the firstParent for an enum case derives from the declaring enum class, if not, adds it as a parent diff --git a/tests/neg/enumsLabel-singleimpl.scala b/tests/neg/enumsLabel-singleimpl.scala index 8f72a6cc71f2..a246ac9e5461 100644 --- a/tests/neg/enumsLabel-singleimpl.scala +++ b/tests/neg/enumsLabel-singleimpl.scala @@ -1,13 +1,13 @@ enum Ordinalled { - case A // error: method ordinal of type => Int needs `override` modifier + case A - def ordinal: Int = -1 + def ordinal: Int = -1 // error: the ordinal method of enum class Ordinalled can not be defined by the user } trait HasOrdinal { def ordinal: Int = 23 } -enum MyEnum extends HasOrdinal { - case Foo // error: method ordinal of type => Int needs `override` modifier +enum MyEnum extends HasOrdinal { // error: enum class MyEnum can not inherit the concrete ordinal method of trait HasOrdinal + case Foo } diff --git a/tests/pos/i13554.scala b/tests/pos/i13554.scala new file mode 100644 index 000000000000..e30d3eb9bd9f --- /dev/null +++ b/tests/pos/i13554.scala @@ -0,0 +1,6 @@ +object StatusCode: + class Matcher + +enum StatusCode(m: StatusCode.Matcher): + case InternalServerError extends StatusCode(???) + diff --git a/tests/pos/i13554a.scala b/tests/pos/i13554a.scala new file mode 100644 index 000000000000..0c6f0c6c972f --- /dev/null +++ b/tests/pos/i13554a.scala @@ -0,0 +1,15 @@ +object StatusCode: + enum Matcher: + case ServerError extends Matcher + end Matcher +end StatusCode + +enum StatusCode(code: Int, m: StatusCode.Matcher): + case InternalServerError extends StatusCode(500, StatusCode.Matcher.ServerError) +end StatusCode + +object Main { + def main(args: Array[String]): Unit = { + println(StatusCode.InternalServerError) + } +} From aec179f12d405307034b7a3771b3e6374c127117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Fri, 12 Nov 2021 14:23:47 +0100 Subject: [PATCH 0829/1244] Add support for tables in wiki syntax --- .../src/example/level2/Documentation.scala | 13 + .../scaladoc/renderers/DocRenderer.scala | 19 + .../scaladoc/tasty/comments/Comments.scala | 1 + .../tasty/comments/wiki/Entities.scala | 9 + .../scaladoc/tasty/comments/wiki/Parser.scala | 396 +++++++++++++++--- .../src/dotty/tools/scaladoc/util/html.scala | 6 + 6 files changed, 392 insertions(+), 52 deletions(-) diff --git a/scaladoc-testcases/src/example/level2/Documentation.scala b/scaladoc-testcases/src/example/level2/Documentation.scala index cd8e13451df8..bbfd31669f3c 100644 --- a/scaladoc-testcases/src/example/level2/Documentation.scala +++ b/scaladoc-testcases/src/example/level2/Documentation.scala @@ -149,6 +149,19 @@ abstract class Documentation[T, A <: Int, B >: String, -X, +Y](c1: String, val c */ def loremIpsum[T](a: T): Map[T, T] = ??? + /** + *   + * | How to convert ... | to a [[PartialFunction]] | to an optional [[Function]] | to an extractor | + * | :---: | --- | --- | --- | + * | from a [[PartialFunction]] | [[Predef.identity]] | [[lift]] | [[Predef.identity]] | + * | from optional [[Function]] | [[Function1.UnliftOps#unlift]] or [[Function.unlift]] | [[Predef.identity]] | [[Function1.UnliftOps#unlift]] | + * | from an extractor | `{ case extractor(x) => x }` | `extractor.unapply _` | [[Predef.identity]] | + *   + * + * @syntax wiki + */ + def table(foo: String) = ??? + protected[example] val valWithScopeModifier = ??? protected[this] val valWithScopeModifierThis = ??? diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala index 03daa7acfe62..19e7e8a86995 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala @@ -42,6 +42,16 @@ class DocRender(signatureRenderer: SignatureRenderer)(using DocContext): val tooltip = s"Problem linking $query: $msg" signatureRenderer.unresolvedLink(linkBody(query), titleAttr := tooltip) + private def renderHeader(header: Row): AppliedTag = + tr( + header.cells.map(c => th(c.blocks.map(renderElement))) + ) + + private def renderRow(row: Row): AppliedTag = + tr( + row.cells.map(c => td(c.blocks.map(renderElement))) + ) + private def renderElement(e: WikiDocElement): AppliedTag = e match case Title(text, level) => val content = renderElement(text) @@ -55,6 +65,15 @@ class DocRender(signatureRenderer: SignatureRenderer)(using DocContext): case Paragraph(text) => p(renderElement(text)) case Code(data: String) => pre(code(raw(data.escapeReservedTokens))) // TODO add classes case HorizontalRule => hr + case Table(header, columns, rows) => + table( + thead( + renderHeader(header) + ), + tbody( + rows.map(renderRow) + ) + ) case UnorderedList(items) => ul(listItems(items)) case OrderedList(items, style) => ol(listItems(items)) // TODO use style diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala index e3df52b11d61..261de910d4f6 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala @@ -235,6 +235,7 @@ class WikiCommentParser(repr: Repr)(using DocContext) case wiki.OrderedList(elems, _) => elems.headOption.fold("")(flatten) case wiki.DefinitionList(items) => items.headOption.fold("")(e => flatten(e._1)) case wiki.HorizontalRule => "" + case wiki.Table(header, columns, rows) => (header +: rows).flatMap(_.cells).flatMap(_.blocks).map(flatten).mkString def markupToString(str: wiki.Body) = str.blocks.headOption.fold("")(flatten) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala index 5cec60977813..f11e8095afe7 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Entities.scala @@ -50,6 +50,15 @@ final case class UnorderedList(items: Seq[Block]) extends Block final case class OrderedList(items: Seq[Block], style: String) extends Block final case class DefinitionList(items: SortedMap[Inline, Block]) extends Block object HorizontalRule extends Block +final case class Table(header: Row, columnOptions: Seq[ColumnOption], rows: Seq[Row]) extends Block +final case class ColumnOption(option: 'L' | 'C' | 'R') +object ColumnOption { + val ColumnOptionLeft = ColumnOption('L') + val ColumnOptionCenter = ColumnOption('C') + val ColumnOptionRight = ColumnOption('R') +} +final case class Row(cells: Seq[Cell]) +final case class Cell(blocks: Seq[Block]) /** An section of text inside a block, possibly with formatting. */ sealed abstract class Inline extends WikiDocElement: diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala index 2436ca4e5239..a844f3384793 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/wiki/Parser.scala @@ -2,6 +2,7 @@ package dotty.tools.scaladoc package tasty.comments.wiki import scala.collection.mutable +import scala.annotation.tailrec import dotty.tools.scaladoc.tasty.comments.Regexes._ @@ -35,6 +36,8 @@ final class Parser( hrule() else if (checkList) listBlock() + else if (checkTableRow) + table() else { para() } @@ -127,6 +130,282 @@ final class Parser( HorizontalRule } + + /** Starts and end with a cell separator matching the minimal row || and all other possible rows */ + private val TableRow = """^\|.*\|$""".r + private val TableCellStart = "|" + + /* Checks for a well-formed table row */ + private def checkTableRow = { + check(TableCellStart) && { + val newlineIdx = buffer.indexOf('\n', offset) + newlineIdx != -1 && + TableRow.findFirstIn(buffer.substring(offset, newlineIdx)).isDefined + } + } + + /** {{{ + * table ::= headerRow '\n' delimiterRow '\n' dataRows '\n' + * content ::= inline-content + * row ::= '|' { content '|' }+ + * headerRow ::= row + * dataRows ::= row* + * align ::= ':' '-'+ | '-'+ | '-'+ ':' | ':' '-'+ ':' + * delimiterRow :: = '|' { align '|' }+ + * }}} + */ + def table(): Block = { + /* Helpers */ + + def peek(tag: String): Unit = { + val peek: String = buffer.substring(offset) + val limit = 60 + val limitedPeek = peek.substring(0, limit min peek.length) + println(s"peek: $tag: '$limitedPeek'") + } + + /* Accumulated state */ + + var header: Option[Row] = None + + val rows = mutable.ListBuffer.empty[Row] + + val cells = mutable.ListBuffer.empty[Cell] + + def finalizeCells(): Unit = { + if (cells.nonEmpty) { + rows += Row(cells.toList) + } + cells.clear() + } + + def finalizeHeaderCells(): Unit = { + if (cells.nonEmpty) { + if (header.isDefined) { + reportError("more than one table header") + } else { + header = Some(Row(cells.toList)) + } + } + cells.clear() + } + + val escapeChar = "\\" + + /* Poor man's negative lookbehind */ + def checkInlineEnd = + (check(TableCellStart) && !check(escapeChar, -1)) || check("\n") + + def decodeEscapedCellMark(text: String) = text.replace(escapeChar + TableCellStart, TableCellStart) + + def isEndOfText = char == endOfText + + //def isNewline = char == endOfLine + + //def skipNewline() = jump(endOfLine) + + def isStartMarkNewline = check(TableCellStart + endOfLine) + + def skipStartMarkNewline() = jump(TableCellStart + endOfLine) + + def isStartMark = check(TableCellStart) + + def skipStartMark() = jump(TableCellStart) + + def contentNonEmpty(content: Inline) = content != Text("") + + /* Parse cells of a table. + * @param cellStartMark The char indicating the start or end of a cell + * @param finalizeRow Function to invoke when the row has been fully parsed + */ + def parseCells(cellStartMark: String, finalizeRow: () => Unit): Unit = { + def jumpCellStartMark() = { + if (!jump(cellStartMark)) { + peek(s"Expected $cellStartMark") + sys.error(s"Precondition violated: Expected $cellStartMark.") + } + } + + val startPos = offset + + jumpCellStartMark() + + val content = Paragraph(getInline(isInlineEnd = checkInlineEnd, textTransform = decodeEscapedCellMark)) + + parseCells0(content :: Nil, finalizeRow, startPos, offset) + } + + // Continue parsing a table row. + // + // After reading inline content the following conditions will be encountered, + // + // Case : Next Chars + // .................. + // 1 : end-of-text + // 2 : '|' '\n' + // 3 : '|' + // 4 : '\n' + // + // Case 1. + // State : End of text + // Action: Store the current contents, close the row, report warning, stop parsing. + // + // Case 2. + // State : The cell separator followed by a newline + // Action: Store the current contents, skip the cell separator and newline, close the row, stop parsing. + // + // Case 3. + // State : The cell separator not followed by a newline + // Action: Store the current contents, skip the cell separator, continue parsing the row. + // + @tailrec def parseCells0( + contents: List[Block], + finalizeRow: () => Unit, + progressPreParse: Int, + progressPostParse: Int + ): Unit = { + + def storeContents() = cells += Cell(contents.reverse) + + val startPos = offset + + // The ordering of the checks ensures the state checks are correct. + if (progressPreParse == progressPostParse) { + peek("no-progress-table-row-parsing") + sys.error("No progress while parsing table row") + } else if (isEndOfText) { + // peek("1: end-of-text") + // Case 1 + storeContents() + finalizeRow() + reportError("unclosed table row") + } else if (isStartMarkNewline) { + // peek("2: start-mark-new-line/before") + // Case 2 + storeContents() + finalizeRow() + skipStartMarkNewline() + // peek("2: start-mark-new-line/after") + } else if (isStartMark) { + // peek("3: start-mark") + // Case 3 + storeContents() + skipStartMark() + val content = getInline(isInlineEnd = checkInlineEnd, textTransform = decodeEscapedCellMark) + // TrailingCellsEmpty produces empty content + val accContents = if (contentNonEmpty(content)) Paragraph(content) :: Nil else Nil + parseCells0(accContents, finalizeRow, startPos, offset) + } else { + // Case π√ⅈ + // When the impossible happens leave some clues. + reportError("unexpected table row markdown") + peek("parseCell0") + storeContents() + finalizeRow() + } + } + + /* Parsing */ + + jumpWhitespace() + + parseCells(TableCellStart, () => finalizeHeaderCells()) + + while (checkTableRow) { + val initialOffset = offset + + parseCells(TableCellStart, () => finalizeCells()) + + /* Progress should always be made */ + if (offset == initialOffset) { + peek("no-progress-table-parsing") + sys.error("No progress while parsing table") + } + } + + /* Finalize */ + + /* Structural consistency checks and coercion */ + + // https://github.github.com/gfm/#tables-extension- + // TODO: The header row must match the delimiter row in the number of cells. If not, a table will not be recognized: + // TODO: Break at following block level element: The table is broken at the first empty line, or beginning of another block-level structure: + // TODO: Do not return a table when: The header row must match the delimiter row in the number of cells. If not, a table will not be recognized + + if (cells.nonEmpty) { + reportError(s"Parsed and unused content: $cells") + } + assert(header.isDefined, "table header was not parsed") + val enforcedCellCount = header.get.cells.size + + def applyColumnCountConstraint(row: Row, defaultCell: Cell, rowType: String): Row = { + if (row.cells.size == enforcedCellCount) + row + else if (row.cells.size > enforcedCellCount) { + val excess = row.cells.size - enforcedCellCount + reportError(s"Dropping $excess excess table $rowType cells from row.") + Row(row.cells.take(enforcedCellCount)) + } else { + val missing = enforcedCellCount - row.cells.size + Row(row.cells ++ List.fill(missing)(defaultCell)) + } + } + + // TODO: Abandon table parsing when the delimiter is missing instead of fixing and continuing. + val delimiterRow :: dataRows = { + if (rows.nonEmpty) rows.toList + else { + reportError("Fixing missing delimiter row") + Row(Cell(Paragraph(Text("-")) :: Nil) :: Nil) :: Nil + } + } + + if (delimiterRow.cells.isEmpty) sys.error("TODO: Handle table with empty delimiter row") + + val constrainedDelimiterRow = applyColumnCountConstraint(delimiterRow, delimiterRow.cells(0), "delimiter") + + val constrainedDataRows = dataRows.map(applyColumnCountConstraint(_, Cell(Nil), "data")) + + /* Convert the row following the header row to column options */ + + val leftAlignmentPattern = "^:?-++$".r + val centerAlignmentPattern = "^:-++:$".r + val rightAlignmentPattern = "^-++:$".r + + import ColumnOption._ + /* Encourage user to fix by defaulting to least ignorable fix. */ + val defaultColumnOption = ColumnOptionRight + val columnOptions = constrainedDelimiterRow.cells.map { + alignmentSpecifier => + alignmentSpecifier.blocks match { + // TODO: Parse the second row without parsing inline markdown + // TODO: Save pos when delimiter row is parsed and use here in reported errors + case Paragraph(Text(as)) :: Nil => + as.trim match { + case leftAlignmentPattern(_*) => ColumnOptionLeft + case centerAlignmentPattern(_*) => ColumnOptionCenter + case rightAlignmentPattern(_*) => ColumnOptionRight + case x => + reportError(s"Fixing invalid column alignment: $x") + defaultColumnOption + } + case x => + reportError(s"Fixing invalid column alignment: $x") + defaultColumnOption + } + } + + if (check("\n", -1)) { + prevChar() + } else { + peek("expected-newline-missing") + sys.error("table parsing left buffer in unexpected state") + } + + blockEnded("table") + Table(header.get, columnOptions, constrainedDataRows) + } + /** {{{ para ::= inline '\n' }}} */ def para(): Block = { val p = @@ -185,67 +464,67 @@ final class Parser( list mkString } - def getInline(isInlineEnd: => Boolean): Inline = { + def getInline(isInlineEnd: => Boolean, textTransform: String => String = identity): Inline = { - def inline0(): Inline = { - if (char == safeTagMarker) { - val tag = htmlTag() - HtmlTag(tag.data + readHTMLFrom(tag)) - } - else if (check("'''")) bold() - else if (check("''")) italic() - else if (check("`")) monospace() - else if (check("__")) underline() - else if (check("^")) superscript() - else if (check(",,")) subscript() - else if (check("[[")) link() - else { - val str = readUntil { - char == safeTagMarker || - check("''") || - char == '`' || - check("__") || - char == '^' || - check(",,") || - check("[[") || - isInlineEnd || - checkParaEnded() || - char == endOfLine + def inline0(): Inline = { + if (char == safeTagMarker) { + val tag = htmlTag() + HtmlTag(tag.data + readHTMLFrom(tag)) + } + else if (check("'''")) bold() + else if (check("''")) italic() + else if (check("`")) monospace() + else if (check("__")) underline() + else if (check("^")) superscript() + else if (check(",,")) subscript() + else if (check("[[")) link() + else { + val str = readUntil { + char == safeTagMarker || + check("''") || + char == '`' || + check("__") || + char == '^' || + check(",,") || + check("[[") || + isInlineEnd || + checkParaEnded() || + char == endOfLine + } + Text(textTransform(str)) } - Text(str) } - } - val inlines: List[Inline] = { - val iss = mutable.ListBuffer.empty[Inline] - iss += inline0() - while (!isInlineEnd && !checkParaEnded()) { - val skipEndOfLine = if (char == endOfLine) { - nextChar() - true - } else { - false - } + val inlines: List[Inline] = { + val iss = mutable.ListBuffer.empty[Inline] + iss += inline0() + while (!isInlineEnd && !checkParaEnded()) { + val skipEndOfLine = if (char == endOfLine) { + nextChar() + true + } else { + false + } - val current = inline0() - (iss.last, current) match { - case (Text(t1), Text(t2)) if skipEndOfLine => - iss.update(iss.length - 1, Text(t1 + endOfLine + t2)) - case (i1, i2) if skipEndOfLine => - iss ++= List(Text(endOfLine.toString), i2) - case _ => iss += current + val current = inline0() + (iss.last, current) match { + case (Text(t1), Text(t2)) if skipEndOfLine => + iss.update(iss.length - 1, Text(t1 + endOfLine + t2)) + case (i1, i2) if skipEndOfLine => + iss ++= List(Text(endOfLine.toString), i2) + case _ => iss += current + } } + iss.toList } - iss.toList - } - inlines match { - case Nil => Text("") - case i :: Nil => i - case is => Chain(is) - } + inlines match { + case Nil => Text("") + case i :: Nil => i + case is => Chain(is) + } - } + } def htmlTag(): HtmlTag = { jump(safeTagMarker) @@ -371,6 +650,7 @@ final class Parser( checkSkipInitWhitespace('=') || checkSkipInitWhitespace("{{{") || checkList || + check(TableCellStart) || checkSkipInitWhitespace('\u003D') } offset = poff @@ -400,6 +680,10 @@ sealed class CharReader(buffer: String) { reader => final def nextChar() = offset += 1 + final def prevChar(): Unit = { + offset -= 1 + } + final def check(chars: String): Boolean = { val poff = offset val ok = jump(chars) @@ -407,6 +691,14 @@ sealed class CharReader(buffer: String) { reader => ok } + final def check(chars: String, checkOffset: Int): Boolean = { + val poff = offset + offset += checkOffset + val ok = jump(chars) + offset = poff + ok + } + def checkSkipInitWhitespace(c: Char): Boolean = { val poff = offset jumpWhitespace() diff --git a/scaladoc/src/dotty/tools/scaladoc/util/html.scala b/scaladoc/src/dotty/tools/scaladoc/util/html.scala index 63810af47fcd..790891b95d99 100644 --- a/scaladoc/src/dotty/tools/scaladoc/util/html.scala +++ b/scaladoc/src/dotty/tools/scaladoc/util/html.scala @@ -82,6 +82,12 @@ object HTML: val li = Tag("li") val code = Tag("code") val pre = Tag("pre") + val table = Tag("table") + val thead = Tag("thead") + val tbody = Tag("tbody") + val th = Tag("th") + val tr = Tag("tr") + val td = Tag("td") val cls = Attr("class") val href = Attr("href") From d3fe48e70b8db95fc05267bb9d95c8486e1920eb Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Wed, 1 Sep 2021 18:40:19 -0700 Subject: [PATCH 0830/1244] Avoid shadowing of name 'name' --- .../dotty/tools/dotc/parsing/Scanners.scala | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index 84a181769e3b..e36773d4f61d 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -242,24 +242,17 @@ object Scanners { /** A buffer for comments */ private val commentBuf = CharBuffer() - private def handleMigration(keyword: Token): Token = - if scala3keywords.contains(keyword) && migrateTo3 then treatAsIdent() - else keyword - - private def treatAsIdent(): Token = - val name0 = name // don't capture the `name` var in the message closure, it may be null later - report.errorOrMigrationWarning( - i"$name0 is now a keyword, write `$name0` instead of $name0 to keep it as an identifier", - sourcePos()) - patch(source, Span(offset), "`") - patch(source, Span(offset + name.length), "`") - IDENTIFIER - - def toToken(name: SimpleName): Token = { - val idx = name.start + def toToken(identifier: SimpleName): Token = + def handleMigration(keyword: Token): Token = + if scala3keywords.contains(keyword) && migrateTo3 then + report.errorOrMigrationWarning(i"$identifier is now a keyword, write `$identifier` instead of $identifier to keep it as an identifier", sourcePos()) + patch(source, Span(offset), "`") + patch(source, Span(offset + identifier.length), "`") + IDENTIFIER + else keyword + val idx = identifier.start if (idx >= 0 && idx <= lastKeywordStart) handleMigration(kwArray(idx)) else IDENTIFIER - } def newTokenData: TokenData = new TokenData {} From 21ffafecd92104dda4d19276f12fb2f35d38589f Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Wed, 1 Sep 2021 20:00:05 -0700 Subject: [PATCH 0831/1244] Use tokenString --- compiler/src/dotty/tools/dotc/parsing/Scanners.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index e36773d4f61d..7e9362af5493 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -245,7 +245,8 @@ object Scanners { def toToken(identifier: SimpleName): Token = def handleMigration(keyword: Token): Token = if scala3keywords.contains(keyword) && migrateTo3 then - report.errorOrMigrationWarning(i"$identifier is now a keyword, write `$identifier` instead of $identifier to keep it as an identifier", sourcePos()) + val what = tokenString(keyword) + report.errorOrMigrationWarning(i"$what is now a keyword, write `$what` instead of $what to keep it as an identifier", sourcePos()) patch(source, Span(offset), "`") patch(source, Span(offset + identifier.length), "`") IDENTIFIER From f6c9264986ba5ee5cd22861b74a0e3bed07a85b8 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Wed, 1 Sep 2021 20:13:35 -0700 Subject: [PATCH 0832/1244] Distinguish simple finishNamed from fiddly finishNamedToken --- .../src/dotty/tools/dotc/parsing/Scanners.scala | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index 7e9362af5493..0fa71dd02a8b 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -135,10 +135,13 @@ object Scanners { */ protected def putChar(c: Char): Unit = litBuf.append(c) - /** Clear buffer and set name and token - * If `target` is different from `this`, don't treat identifiers as end tokens + /** Finish an IDENTIFIER with `this.name`. */ + inline def finishNamed(): Unit = finishNamedToken(IDENTIFIER, this) + + /** Clear buffer and set name and token. + * If `target` is different from `this`, don't treat identifiers as end tokens. */ - def finishNamed(idtoken: Token = IDENTIFIER, target: TokenData = this): Unit = + def finishNamedToken(idtoken: Token, target: TokenData): Unit = target.name = termName(litBuf.chars, 0, litBuf.length) litBuf.clear() target.token = idtoken @@ -996,7 +999,7 @@ object Scanners { getLitChars('`') if (ch == '`') { nextChar() - finishNamed(BACKQUOTED_IDENT) + finishNamedToken(BACKQUOTED_IDENT, target = this) if (name.length == 0) error("empty quoted identifier") else if (name == nme.WILDCARD) @@ -1162,7 +1165,7 @@ object Scanners { nextRawChar() ch != SU && Character.isUnicodeIdentifierPart(ch) do () - finishNamed(target = next) + finishNamedToken(IDENTIFIER, target = next) } else error("invalid string interpolation: `$$`, `$\"`, `$`ident or `$`BlockExpr expected") From 18dee7b1f3c1cf06e946cfb99124c675ba4126f5 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Wed, 1 Sep 2021 21:53:31 -0700 Subject: [PATCH 0833/1244] Test interpolation of keyword --- tests/neg-custom-args/fatal-warnings/i13440.check | 12 ++++++++++-- tests/neg-custom-args/fatal-warnings/i13440.scala | 6 +++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tests/neg-custom-args/fatal-warnings/i13440.check b/tests/neg-custom-args/fatal-warnings/i13440.check index 0e9dd7dd5e50..fde8133419b6 100644 --- a/tests/neg-custom-args/fatal-warnings/i13440.check +++ b/tests/neg-custom-args/fatal-warnings/i13440.check @@ -1,4 +1,12 @@ --- Error: tests/neg-custom-args/fatal-warnings/i13440.scala:3:13 ------------------------------------------------------- -3 |case class A(enum: List[Int] = Nil) // error +-- Error: tests/neg-custom-args/fatal-warnings/i13440.scala:3:4 -------------------------------------------------------- +3 |def given = 42 // error + | ^ + | given is now a keyword, write `given` instead of given to keep it as an identifier +-- Error: tests/neg-custom-args/fatal-warnings/i13440.scala:5:13 ------------------------------------------------------- +5 |case class C(enum: List[Int] = Nil) { // error | ^ | enum is now a keyword, write `enum` instead of enum to keep it as an identifier +-- Error: tests/neg-custom-args/fatal-warnings/i13440.scala:6:11 ------------------------------------------------------- +6 | val s = s"$enum" // error + | ^ + | enum is now a keyword, write `enum` instead of enum to keep it as an identifier diff --git a/tests/neg-custom-args/fatal-warnings/i13440.scala b/tests/neg-custom-args/fatal-warnings/i13440.scala index 8e3af76ad3fa..6cb4956e7434 100644 --- a/tests/neg-custom-args/fatal-warnings/i13440.scala +++ b/tests/neg-custom-args/fatal-warnings/i13440.scala @@ -1,3 +1,7 @@ import language.`3.0-migration` -case class A(enum: List[Int] = Nil) // error +def given = 42 // error + +case class C(enum: List[Int] = Nil) { // error + val s = s"$enum" // error +} From 71f282714f1775042cc571d33d75963fc321e8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 16 Nov 2021 11:02:23 +0100 Subject: [PATCH 0834/1244] Add missing styles to snippets that are not Scala --- scaladoc-js/src/code-snippets/CodeSnippets.scala | 2 +- .../tasty/comments/markdown/SnippetRenderer.scala | 2 +- .../comments/markdown/SnippetRenderingExtension.scala | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scaladoc-js/src/code-snippets/CodeSnippets.scala b/scaladoc-js/src/code-snippets/CodeSnippets.scala index 92e82b40957f..3d4b4af2ab64 100644 --- a/scaladoc-js/src/code-snippets/CodeSnippets.scala +++ b/scaladoc-js/src/code-snippets/CodeSnippets.scala @@ -20,7 +20,7 @@ class CodeSnippets: case _ => None } - def enrichSnippets() = document.querySelectorAll("div.snippet").foreach { + def enrichSnippets() = document.querySelectorAll("div.snippet[scala-snippet]").foreach { case snippet: html.Element => snippet.addEventListener("click", (e: MouseEvent) => e.asInstanceOf[js.Dynamic].fromSnippet = true) snippetAnchor(snippet) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala index 55f3ac31a7bb..a989cfa124e3 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala @@ -137,7 +137,7 @@ object SnippetRenderer: def renderSnippetWithMessages(snippetName: Option[String], codeLines: Seq[String], messages: Seq[SnippetCompilerMessage], hasContext: Boolean): String = val transformedLines = wrapCodeLines.andThen(addCompileMessages(messages)).apply(codeLines).map(_.toHTML) val codeHTML = s"""${transformedLines.mkString("")}""" - s"""

$codeHTML
${snippetName.fold("")(snippetLabel(_))}
""" + s"""
$codeHTML
${snippetName.fold("")(snippetLabel(_))}
""" def renderSnippetWithMessages(node: ExtendedFencedCodeBlock): String = renderSnippetWithMessages( diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala index 7a7edc0f5e86..74d4f461dc7b 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala @@ -12,6 +12,7 @@ import com.vladsch.flexmark.util.ast._ import com.vladsch.flexmark.util.options._ import com.vladsch.flexmark.util.sequence.BasedSequence import com.vladsch.flexmark._ +import com.vladsch.flexmark.ast.FencedCodeBlock /** * SnippetRenderingExtension is responsible for running an analysis for scala codeblocks in the static documentation/scaladoc comments. @@ -26,10 +27,17 @@ object SnippetRenderingExtension extends HtmlRenderer.HtmlRendererExtension: SnippetRenderer.renderSnippetWithMessages(node) ) + object FencedCodeBlockHandler extends CustomNodeRenderer[FencedCodeBlock]: + override def render(node: FencedCodeBlock, c: NodeRendererContext, html: HtmlWriter): Unit = + html.raw("""
""") + c.delegateRender() + html.raw("""
""") + object Render extends NodeRenderer: override def getNodeRenderingHandlers: JSet[NodeRenderingHandler[_]] = JSet( new NodeRenderingHandler(classOf[ExtendedFencedCodeBlock], ExtendedFencedCodeBlockHandler), + new NodeRenderingHandler(classOf[FencedCodeBlock], FencedCodeBlockHandler) ) object Factory extends NodeRendererFactory: From c3d8006f1f8d35eb4932b337a5d2d3329d285b63 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Wed, 17 Nov 2021 10:42:29 +0100 Subject: [PATCH 0835/1244] Improve issue templates --- .github/ISSUE_TEMPLATE/bug.md | 6 ++++++ .github/ISSUE_TEMPLATE/crash.md | 6 ++++++ .github/ISSUE_TEMPLATE/syntax-highlight.md | 7 +++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index d6a891e1c518..e7c8bcc40527 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -14,6 +14,12 @@ If you're not sure what version you're using, run `print scalaVersion` from sbt ## Minimized code + + ```Scala println("hello, world") ``` diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md index dc935e310548..390a57273260 100644 --- a/.github/ISSUE_TEMPLATE/crash.md +++ b/.github/ISSUE_TEMPLATE/crash.md @@ -14,6 +14,12 @@ If you're not sure what version you're using, run `print scalaVersion` from sbt ## Minimized code + + ```Scala println("hello, world") ``` diff --git a/.github/ISSUE_TEMPLATE/syntax-highlight.md b/.github/ISSUE_TEMPLATE/syntax-highlight.md index 17b720d4d2aa..722c8ed5fa73 100644 --- a/.github/ISSUE_TEMPLATE/syntax-highlight.md +++ b/.github/ISSUE_TEMPLATE/syntax-highlight.md @@ -1,10 +1,13 @@ --- name: Syntax highlighting -about: Please create a syntax highlighting issue here https://github.com/scala/vscode-scala-syntax/issues +about: '' title: '' labels: '' assignees: '' --- -Please create a syntax highlighting issue here: [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax/issues). +Please create a syntax highlighting issue here +* VS Code / GitHub: https://github.com/scala/vscode-scala-syntax/issues +* IntelliJ: https://youtrack.jetbrains.com/issues/SCL?q=tag:%20%7BScala%203%7D%20tag:%20%7BSyntax%20Highlighting%7D +* highlight.js: https://github.com/highlightjs/highlight.js/issues \ No newline at end of file From 3f88a7b397987fb382e6f7f3f4e5059273b69a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Wed, 3 Nov 2021 13:59:59 +0100 Subject: [PATCH 0836/1244] Fix #13860: Ignore bridges when looking for a default getter's attached method. --- .../dotty/tools/backend/sjs/JSCodeGen.scala | 2 +- .../compiler/RegressionTestScala3.scala | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala index 53885ba523ec..e30ddd9a55da 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala @@ -4706,7 +4706,7 @@ object JSCodeGen { if (!overloads.isOverloaded) overloads.symbol else - overloads.suchThat(_.is(HasDefaultParams)).symbol + overloads.suchThat(_.is(HasDefaultParams, butNot = Bridge)).symbol } } diff --git a/tests/sjs-junit/test/org/scalajs/testsuite/compiler/RegressionTestScala3.scala b/tests/sjs-junit/test/org/scalajs/testsuite/compiler/RegressionTestScala3.scala index 90d7df3ab281..08aa26726dc7 100644 --- a/tests/sjs-junit/test/org/scalajs/testsuite/compiler/RegressionTestScala3.scala +++ b/tests/sjs-junit/test/org/scalajs/testsuite/compiler/RegressionTestScala3.scala @@ -52,6 +52,13 @@ class RegressionTestScala3 { def intPlusString(x: String): String = 5 + x assertEquals("5bc", intPlusString("bc")) } + + @Test def defaultParamsInModuleDefWithBridgesIssue13860(): Unit = { + import Issue13860._ + + assertEquals(0L, Foo.bar().x) + assertEquals(5L, Foo.bar(5L).x) + } } object RegressionTestScala3 { @@ -100,6 +107,18 @@ object RegressionTestScala3 { import I._ def blah = i } + + object Issue13860 { + class Foo(var x: Long) + + trait Companion[A] { + def bar(x: Long = 0): A + } + + object Foo extends Companion[Foo] { + def bar(x: Long = 0): Foo = new Foo(x) + } + } } // This class needs to be at the top-level, not in an object, to reproduce the issue From 4b9e969ed6ae915e294d7a9666e85405685ced24 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Wed, 17 Nov 2021 09:00:16 +0100 Subject: [PATCH 0837/1244] Add regression test ConstructExpr and DestructExpr are used to construct and destruct case classes into and from tuples containing the expressions of their elements. --- .../contruct-desturct/ConstructExpr.scala | 45 ++++++++++++++++++ .../contruct-desturct/DestructExpr.scala | 47 +++++++++++++++++++ tests/pos-macros/contruct-desturct/Test.scala | 7 +++ 3 files changed, 99 insertions(+) create mode 100644 tests/pos-macros/contruct-desturct/ConstructExpr.scala create mode 100644 tests/pos-macros/contruct-desturct/DestructExpr.scala create mode 100644 tests/pos-macros/contruct-desturct/Test.scala diff --git a/tests/pos-macros/contruct-desturct/ConstructExpr.scala b/tests/pos-macros/contruct-desturct/ConstructExpr.scala new file mode 100644 index 000000000000..6a2a6f40f0c5 --- /dev/null +++ b/tests/pos-macros/contruct-desturct/ConstructExpr.scala @@ -0,0 +1,45 @@ +package scala.quoted +package util + +trait ConstructExpr[T] { + + type Elems <: Tuple + + def from(x: Elems)(using Quotes): Expr[T] + // def from(x: Tuple.Map[Elems, Expr])(using Quotes): Expr[T] // alternative + +} + +object ConstructExpr { + + def apply[T](using ce: ConstructExpr[T]): ce.type = ce + + /** Default implementation of `ConstructExpr[Tuple1[T]]` */ + given EmptyTupleConstructExpr[T: Type]: ConstructExpr[EmptyTuple] with { + type Elems = EmptyTuple + def from(x: Elems)(using Quotes): Expr[EmptyTuple] = + '{ EmptyTuple } + } + + /** Default implementation of `ConstructExpr[Tuple1[T]]` */ + given Tuple1ConstructExpr[T: Type]: ConstructExpr[Tuple1[T]] with { + type Elems = Tuple1[Expr[T]] + def from(x: Elems)(using Quotes): Expr[Tuple1[T]] = + '{ Tuple1[T](${x._1}) } + } + + /** Default implementation of `ConstructExpr[Tuple2[T1, T2]]` */ + given Tuple2ConstructExpr[T1: Type, T2: Type]: ConstructExpr[Tuple2[T1, T2]] with { + type Elems = (Expr[T1], Expr[T2]) + def from(x: Elems)(using Quotes): Expr[Tuple2[T1, T2]] = + '{ Tuple2[T1, T2](${x._1}, ${x._2}) } + } + + /** Default implementation of `ConstructExpr[Tuple3[T1, T2, T3]]` */ + given Tuple3ConstructExpr[T1: Type, T2: Type, T3: Type]: ConstructExpr[Tuple3[T1, T2, T3]] with { + type Elems = (Expr[T1], Expr[T2], Expr[T3]) + def from(x: Elems)(using Quotes): Expr[Tuple3[T1, T2, T3]] = + '{ Tuple3[T1, T2, T3](${x._1}, ${x._2}, ${x._3}) } + } + +} diff --git a/tests/pos-macros/contruct-desturct/DestructExpr.scala b/tests/pos-macros/contruct-desturct/DestructExpr.scala new file mode 100644 index 000000000000..b54be5e1116a --- /dev/null +++ b/tests/pos-macros/contruct-desturct/DestructExpr.scala @@ -0,0 +1,47 @@ +package scala.quoted +package util + +trait DestructExpr[T] { + + type Elems <: Tuple + + def unapply(x: Expr[T])(using Quotes): Option[Elems] + // def unapply(x: Expr[T])(using Quotes): Option[Tuple.Map[Elems, Expr]] // alternative + +} + +/** Default given instances of `DestructExpr` */ +object DestructExpr { + + def unapply[T](x: Expr[T])(using de: DestructExpr[T])(using Quotes): Option[de.Elems] = + de.unapply(x) + + + /** Default implementation of `DestructExpr[Tuple1[...]]` + * - Transform `'{Tuple1(x1)}` into `Some(Tuple1('{x1}))` + * - Otherwise returns `None` + */ + given DestructTuple1[T1](using Type[T1]): DestructExpr[Tuple1[T1]] with { + type Elems = Tuple1[Expr[T1]] + def unapply(x: Expr[Tuple1[T1]])(using Quotes) = x match { + case '{ new Tuple1[T1]($y) } => Some(Tuple1(y)) + case '{ Tuple1[T1]($y) } => Some(Tuple1(y)) + case _ => None + } + } + + /** Default implementation of `DestructExpr[Tuple2[...]]` + * - Transform `'{Tuple2(x1, x2)}` into `Some(Tuple2('{x1}, '{x2}))` + * - Otherwise returns `None` + */ + given DestructTuple2[T1, T2](using Type[T1], Type[T2]): DestructExpr[Tuple2[T1, T2]] with { + type Elems = (Expr[T1], Expr[T2]) + def unapply(x: Expr[Tuple2[T1, T2]])(using Quotes) = x match { + case '{ new Tuple2[T1, T2]($y1, $y2) } => Some(Tuple2(y1, y2)) + case '{ Tuple2[T1, T2]($y1, $y2) } => Some(Tuple2(y1, y2)) + case '{ ($y1: T1) -> ($y2: T2) } => Some(Tuple2(y1, y2)) + case _ => None + } + } + +} diff --git a/tests/pos-macros/contruct-desturct/Test.scala b/tests/pos-macros/contruct-desturct/Test.scala new file mode 100644 index 000000000000..a4d159ed7d35 --- /dev/null +++ b/tests/pos-macros/contruct-desturct/Test.scala @@ -0,0 +1,7 @@ +import scala.quoted.* +import scala.quoted.util.* + +def test(using Quotes) = + '{ Tuple2(1, 2) } match + case DestructExpr((a, b)) => + ConstructExpr[(Int, Int)].from((a, b)) From aa726d6b439839f5340a8c7abd672678e1126160 Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Tue, 16 Nov 2021 21:05:10 -0800 Subject: [PATCH 0838/1244] Bump sbt-sonatype in hopes of fixing timeout issues publishing nightlies --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4e70c7f3122a..1716bb51b7f1 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0") From 98198e946d26e8dc685f330d08ad61627a99b41c Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Wed, 17 Nov 2021 15:40:05 +0100 Subject: [PATCH 0839/1244] Complete when improting same symbol multiple times This is related to https://github.com/lampepfl/dotty/issues/13623 - since it seems that Predef might be imported more than once, but this doesn't yet solve the issue. --- .../dotty/tools/dotc/interactive/Completion.scala | 13 +++++++++++-- .../dotty/tools/languageserver/CompletionTest.scala | 13 +++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala index 68cc0b37fd56..b57c300defae 100644 --- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala +++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala @@ -201,13 +201,22 @@ object Completion { mappings.foreach { (name, denotss) => val first = denotss.head + + // import a.c + def isSingleImport = denotss.length < 2 + // import a.C + // locally { import b.C } + def isImportedInDifferentScope = first.ctx.scope ne denotss(1).ctx.scope + // import a.C + // import a.C + def isSameSymbolImportedDouble = denotss.forall(_.denots == first.denots) + denotss.find(!_.ctx.isImportContext) match { // most deeply nested member or local definition if not shadowed by an import case Some(local) if local.ctx.scope == first.ctx.scope => resultMappings += name -> local.denots - // most deeply nested import if not shadowed by another import - case None if denotss.length < 2 || (denotss(1).ctx.scope ne first.ctx.scope) => + case None if isSingleImport || isImportedInDifferentScope || isSameSymbolImportedDouble => resultMappings += name -> first.denots case _ => diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala index 6ef219187475..bc870e329f4f 100644 --- a/language-server/test/dotty/tools/languageserver/CompletionTest.scala +++ b/language-server/test/dotty/tools/languageserver/CompletionTest.scala @@ -404,6 +404,19 @@ class CompletionTest { .completion(m1, Set()) } + @Test def completeFromSameImportsForEqualNestingLevels: Unit = { + code"""object Foo { + | def xxxx(i: Int): Int = i + |} + |object Test { + | import Foo.xxxx + | import Foo.xxxx + | import Foo.xxxx + | val x = xx$m1 + |}""".withSource + .completion(m1, Set(("xxxx", Method, "(i: Int): Int"))) + } + @Test def preferLocalDefinitionToImportForEqualNestingLevels: Unit = { code"""object Foo { | val xxxx = 1 From 573e4e75059b71941fa1c7497cde4127fc7f28e1 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 21 Oct 2021 13:20:12 +0000 Subject: [PATCH 0840/1244] Add spire to community build --- .gitmodules | 6 ++++++ community-build/community-projects/spire | 1 + .../src/scala/dotty/communitybuild/projects.scala | 8 ++++++++ .../scala/dotty/communitybuild/CommunityBuildTest.scala | 1 + library/src/scala/runtime/LazyVals.scala | 2 -- 5 files changed, 16 insertions(+), 2 deletions(-) create mode 160000 community-build/community-projects/spire diff --git a/.gitmodules b/.gitmodules index d93aab9aa8fe..dff9d04cf40d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -213,6 +213,12 @@ [submodule "community-build/community-projects/scala-java8-compat"] path = community-build/community-projects/scala-java8-compat url = https://github.com/dotty-staging/scala-java8-compat.git +<<<<<<< HEAD [submodule "community-build/community-projects/specs2"] path = community-build/community-projects/specs2 url = https://github.com/dotty-staging/specs2.git +======= +[submodule "community-build/community-projects/spire"] + path = community-build/community-projects/spire + url = https://github.com/typelevel/spire.git +>>>>>>> Add spire to community build diff --git a/community-build/community-projects/spire b/community-build/community-projects/spire new file mode 160000 index 000000000000..c98b32c6844f --- /dev/null +++ b/community-build/community-projects/spire @@ -0,0 +1 @@ +Subproject commit c98b32c6844f501491ab3a22d6f5be50b9b80c8d diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 61c72f8088f0..46f0f4dd4eba 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -731,11 +731,19 @@ object projects: dependencies = List(scalaJava8Compat, scalatest) ) +<<<<<<< HEAD lazy val specs2 = SbtCommunityProject( project = "specs2", sbtTestCommand = "core/testOnly -- exclude ci", sbtPublishCommand = "core/publishLocal", dependencies = List() +======= + lazy val spire = SbtCommunityProject( + project = "spire", + sbtTestCommand = "test", + sbtPublishCommand = "publishLocal", + dependencies = List(cats, algebra, disciplineMunit) +>>>>>>> Add spire to community build ) end projects diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 9b5c17e85965..4aad0e26d265 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -90,6 +90,7 @@ class CommunityBuildTestC: @Test def scas = projects.scas.run() @Test def sconfig = projects.sconfig.run() @Test def shapeless = projects.shapeless.run() + @Test def spire = projects.spire.run() @Test def sourcecode = projects.sourcecode.run() @Test def specs2 = projects.specs2.run() @Test def stdLib213 = projects.stdLib213.run() diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala index eeb955faecae..85ca4f5cb3a0 100644 --- a/library/src/scala/runtime/LazyVals.scala +++ b/library/src/scala/runtime/LazyVals.scala @@ -1,7 +1,5 @@ package scala.runtime -import scala.language.unsafeNulls - /** * Helper methods used in thread-safe lazy vals. */ From c695c84fa8581ccae00c9e491beb0215a0aaee2d Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 21 Oct 2021 13:24:50 -0700 Subject: [PATCH 0841/1244] Remove algebra from spire deps --- .gitmodules | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index dff9d04cf40d..44c9f7bc39e6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -213,12 +213,6 @@ [submodule "community-build/community-projects/scala-java8-compat"] path = community-build/community-projects/scala-java8-compat url = https://github.com/dotty-staging/scala-java8-compat.git -<<<<<<< HEAD -[submodule "community-build/community-projects/specs2"] - path = community-build/community-projects/specs2 - url = https://github.com/dotty-staging/specs2.git -======= [submodule "community-build/community-projects/spire"] path = community-build/community-projects/spire url = https://github.com/typelevel/spire.git ->>>>>>> Add spire to community build From a74d05b0b00f5a32f6f033ff00d243840bd48068 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 17 Nov 2021 11:07:40 -0500 Subject: [PATCH 0842/1244] Use dotty-staging repo --- .gitmodules | 2 +- .../src/scala/dotty/communitybuild/projects.scala | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 44c9f7bc39e6..848021e16a1b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -215,4 +215,4 @@ url = https://github.com/dotty-staging/scala-java8-compat.git [submodule "community-build/community-projects/spire"] path = community-build/community-projects/spire - url = https://github.com/typelevel/spire.git + url = https://github.com/dotty-staging/spire.git diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 46f0f4dd4eba..3ce8b22dd455 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -731,21 +731,19 @@ object projects: dependencies = List(scalaJava8Compat, scalatest) ) -<<<<<<< HEAD lazy val specs2 = SbtCommunityProject( project = "specs2", sbtTestCommand = "core/testOnly -- exclude ci", sbtPublishCommand = "core/publishLocal", dependencies = List() -======= + ) + lazy val spire = SbtCommunityProject( project = "spire", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", dependencies = List(cats, algebra, disciplineMunit) ->>>>>>> Add spire to community build ) - end projects def allProjects = List( From c12760b77b9c8ed678f153e1438a186db30ca53f Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 1 Nov 2021 16:22:57 +0100 Subject: [PATCH 0843/1244] Keep annotation of @main methods in `def main` Co-authored-by: Guillaume Martres --- compiler/src/dotty/tools/dotc/ast/MainProxies.scala | 12 ++++++++++++ tests/neg-custom-args/no-experimental/i13848.scala | 7 +++++++ tests/pos-custom-args/no-experimental/i13848.scala | 8 ++++++++ 3 files changed, 27 insertions(+) create mode 100644 tests/neg-custom-args/no-experimental/i13848.scala create mode 100644 tests/pos-custom-args/no-experimental/i13848.scala diff --git a/compiler/src/dotty/tools/dotc/ast/MainProxies.scala b/compiler/src/dotty/tools/dotc/ast/MainProxies.scala index 9178478c399b..2eafeca16e39 100644 --- a/compiler/src/dotty/tools/dotc/ast/MainProxies.scala +++ b/compiler/src/dotty/tools/dotc/ast/MainProxies.scala @@ -94,8 +94,20 @@ object MainProxies { val body = Try(call, handler :: Nil, EmptyTree) val mainArg = ValDef(nme.args, TypeTree(defn.ArrayType.appliedTo(defn.StringType)), EmptyTree) .withFlags(Param) + /** Replace typed `Ident`s that have been typed with a TypeSplice with the reference to the symbol. + * The annotations will be retype-checked in another scope that may not have the same imports. + */ + def insertTypeSplices = new TreeMap { + override def transform(tree: Tree)(using Context): Tree = tree match + case tree: tpd.Ident @unchecked => TypedSplice(tree) + case tree => super.transform(tree) + } + val annots = mainFun.annotations + .filterNot(_.matches(defn.MainAnnot)) + .map(annot => insertTypeSplices.transform(annot.tree)) val mainMeth = DefDef(nme.main, (mainArg :: Nil) :: Nil, TypeTree(defn.UnitType), body) .withFlags(JavaStatic) + .withAnnotations(annots) val mainTempl = Template(emptyConstructor, Nil, Nil, EmptyValDef, mainMeth :: Nil) val mainCls = TypeDef(mainFun.name.toTypeName, mainTempl) .withFlags(Final | Invisible) diff --git a/tests/neg-custom-args/no-experimental/i13848.scala b/tests/neg-custom-args/no-experimental/i13848.scala new file mode 100644 index 000000000000..886ab1e85d67 --- /dev/null +++ b/tests/neg-custom-args/no-experimental/i13848.scala @@ -0,0 +1,7 @@ +import annotation.experimental + +@main +def run(): Unit = f // error + +@experimental +def f = 2 diff --git a/tests/pos-custom-args/no-experimental/i13848.scala b/tests/pos-custom-args/no-experimental/i13848.scala new file mode 100644 index 000000000000..8b65ccb078e1 --- /dev/null +++ b/tests/pos-custom-args/no-experimental/i13848.scala @@ -0,0 +1,8 @@ +import annotation.experimental + +@main +@experimental +def run(): Unit = f + +@experimental +def f = 2 From 83584846cad62f2c97c8fc0481ae9cb476415bf2 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Tue, 16 Nov 2021 18:12:58 +0000 Subject: [PATCH 0844/1244] Tighten product match logic in irrefutable check This avoids accidentally considering refutable name-based extractors as irrefutable because they also happen to be a Product. With this change some tests no longer go through the Typ to Prod rewrite that occurs in `minus(a, b)` when `a` is a Typ and `b` is a Prod, leading to a Typ result. This renders in the counter-example as a generic value type rather than a product, which we see in the warning text changes in the tests. Co-authored-by: Gagandeep Kalra Co-authored-by: Mark T. Kennedy --- .../tools/dotc/transform/patmat/Space.scala | 19 ++++++++++--------- .../src/dotty/tools/dotc/typer/Checking.scala | 2 +- tests/patmat/i13737.check | 1 + tests/patmat/i13737.scala | 15 +++++++++++++++ tests/patmat/irrefutable.check | 2 +- 5 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 tests/patmat/i13737.check create mode 100644 tests/patmat/i13737.scala diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala index 2bfff0baad6e..45e811e6d91c 100644 --- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala +++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala @@ -108,7 +108,7 @@ trait SpaceLogic { def decompose(tp: Type): List[Typ] /** Whether the extractor covers the given type */ - def covers(unapp: TermRef, scrutineeTp: Type): Boolean + def covers(unapp: TermRef, scrutineeTp: Type, argLen: Int): Boolean /** Display space in string format */ def show(sp: Space): String @@ -186,7 +186,7 @@ trait SpaceLogic { isSubType(tp1, tp2) case (Typ(tp1, _), Prod(tp2, fun, ss)) => isSubType(tp1, tp2) - && covers(fun, tp1) + && covers(fun, tp1, ss.length) && isSubspace(Prod(tp2, fun, signature(fun, tp2, ss.length).map(Typ(_, false))), b) case (Prod(_, fun1, ss1), Prod(_, fun2, ss2)) => isSameUnapply(fun1, fun2) && ss1.zip(ss2).forall((isSubspace _).tupled) @@ -240,7 +240,7 @@ trait SpaceLogic { else a case (Typ(tp1, _), Prod(tp2, fun, ss)) => // rationale: every instance of `tp1` is covered by `tp2(_)` - if isSubType(tp1, tp2) && covers(fun, tp1) then + if isSubType(tp1, tp2) && covers(fun, tp1, ss.length) then minus(Prod(tp1, fun, signature(fun, tp1, ss.length).map(Typ(_, false))), b) else if canDecompose(tp1) then tryDecompose1(tp1) @@ -262,6 +262,7 @@ trait SpaceLogic { a case (Prod(tp1, fun1, ss1), Prod(tp2, fun2, ss2)) => if (!isSameUnapply(fun1, fun2)) return a + if (fun1.symbol.name == nme.unapply && ss1.length != ss2.length) return a val range = (0 until ss1.size).toList val cache = Array.fill[Space](ss2.length)(null) @@ -288,13 +289,13 @@ object SpaceEngine { /** Is the unapply or unapplySeq irrefutable? * @param unapp The unapply function reference */ - def isIrrefutable(unapp: TermRef)(using Context): Boolean = { + def isIrrefutable(unapp: TermRef, argLen: Int)(using Context): Boolean = { val unappResult = unapp.widen.finalResultType unappResult.isRef(defn.SomeClass) || unappResult <:< ConstantType(Constant(true)) // only for unapply || (unapp.symbol.is(Synthetic) && unapp.symbol.owner.linkedClass.is(Case)) // scala2 compatibility || unapplySeqTypeElemTp(unappResult).exists // only for unapplySeq - || productArity(unappResult) > 0 + || isProductMatch(unappResult, argLen) || { val isEmptyTp = extractorMemberType(unappResult, nme.isEmpty, NoSourcePosition) isEmptyTp <:< ConstantType(Constant(false)) @@ -304,10 +305,10 @@ object SpaceEngine { /** Is the unapply or unapplySeq irrefutable? * @param unapp The unapply function tree */ - def isIrrefutable(unapp: tpd.Tree)(using Context): Boolean = { + def isIrrefutable(unapp: tpd.Tree, argLen: Int)(using Context): Boolean = { val fun1 = tpd.funPart(unapp) val funRef = fun1.tpe.asInstanceOf[TermRef] - isIrrefutable(funRef) + isIrrefutable(funRef, argLen) } } @@ -606,8 +607,8 @@ class SpaceEngine(using Context) extends SpaceLogic { } /** Whether the extractor covers the given type */ - def covers(unapp: TermRef, scrutineeTp: Type): Boolean = - SpaceEngine.isIrrefutable(unapp) || unapp.symbol == defn.TypeTest_unapply && { + def covers(unapp: TermRef, scrutineeTp: Type, argLen: Int): Boolean = + SpaceEngine.isIrrefutable(unapp, argLen) || unapp.symbol == defn.TypeTest_unapply && { val AppliedType(_, _ :: tp :: Nil) = unapp.prefix.widen.dealias scrutineeTp <:< tp } diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index 6343f0bc4716..2b539d54ef49 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -821,7 +821,7 @@ trait Checking { recur(pat1, pt) case UnApply(fn, _, pats) => check(pat, pt) && - (isIrrefutable(fn) || fail(pat, pt)) && { + (isIrrefutable(fn, pats.length) || fail(pat, pt)) && { val argPts = unapplyArgs(fn.tpe.widen.finalResultType, fn, pats, pat.srcPos) pats.corresponds(argPts)(recur) } diff --git a/tests/patmat/i13737.check b/tests/patmat/i13737.check new file mode 100644 index 000000000000..87d5896f5a1a --- /dev/null +++ b/tests/patmat/i13737.check @@ -0,0 +1 @@ +14: Pattern Match Exhaustivity: _: Success diff --git a/tests/patmat/i13737.scala b/tests/patmat/i13737.scala new file mode 100644 index 000000000000..f415e9028334 --- /dev/null +++ b/tests/patmat/i13737.scala @@ -0,0 +1,15 @@ +sealed trait Result + +case class Success(result: String, next: Int) extends Result { + def isEmpty: Boolean = 10 % 2 == 1 + def get: String = result +} + +object Success { + def unapply(x: Success): Success = x +} + +def main = + val res: Result = ??? + res match // error + case Success(v) => v diff --git a/tests/patmat/irrefutable.check b/tests/patmat/irrefutable.check index 383a04115664..3d07c35a5502 100644 --- a/tests/patmat/irrefutable.check +++ b/tests/patmat/irrefutable.check @@ -1,2 +1,2 @@ 22: Pattern Match Exhaustivity: _: A, _: B, C(_, _) -65: Pattern Match Exhaustivity: ExM(_, _) +65: Pattern Match Exhaustivity: _: M From 2dee22d5dc04b930cf68d7322ed9b9daf38b0cb2 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Mon, 15 Nov 2021 12:31:52 +0100 Subject: [PATCH 0845/1244] Initialize quote cache on tasty run This fixes #13919 --- .../sbt-dotty/tasty-inspector-cache/build.sbt | 24 +++++++++++++++++++ .../inspector/src/main/scala/main.scala | 14 +++++++++++ .../lib/src/main/scala/dummy.scala | 1 + sbt-test/sbt-dotty/tasty-inspector-cache/test | 1 + .../tasty/inspector/TastyInspector.scala | 7 +++++- 5 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 sbt-test/sbt-dotty/tasty-inspector-cache/build.sbt create mode 100644 sbt-test/sbt-dotty/tasty-inspector-cache/inspector/src/main/scala/main.scala create mode 100644 sbt-test/sbt-dotty/tasty-inspector-cache/lib/src/main/scala/dummy.scala create mode 100644 sbt-test/sbt-dotty/tasty-inspector-cache/test diff --git a/sbt-test/sbt-dotty/tasty-inspector-cache/build.sbt b/sbt-test/sbt-dotty/tasty-inspector-cache/build.sbt new file mode 100644 index 000000000000..3bece1b43fa7 --- /dev/null +++ b/sbt-test/sbt-dotty/tasty-inspector-cache/build.sbt @@ -0,0 +1,24 @@ +lazy val dottyVersion = sys.props("plugin.scalaVersion") + +lazy val lib = project + .in(file("lib")) + .settings( + scalaVersion := dottyVersion + ) + +val jarDest = file("target") / "app.jar" + +val runTest = Def.taskKey[Unit]("run tests") + +lazy val inspector = project + .in(file("inspector")) + .settings( + scalaVersion := dottyVersion, + libraryDependencies += "org.scala-lang" %% "scala3-tasty-inspector" % scalaVersion.value, + runTest := + Def.sequential( + Def.task(IO.copyFile((lib/Compile/packageBin).value, jarDest)), + (Compile/run).toTask(" " + jarDest.getAbsolutePath) + ).value + ) + .dependsOn(lib) diff --git a/sbt-test/sbt-dotty/tasty-inspector-cache/inspector/src/main/scala/main.scala b/sbt-test/sbt-dotty/tasty-inspector-cache/inspector/src/main/scala/main.scala new file mode 100644 index 000000000000..8335a016578f --- /dev/null +++ b/sbt-test/sbt-dotty/tasty-inspector-cache/inspector/src/main/scala/main.scala @@ -0,0 +1,14 @@ +import scala.quoted.Quotes +import scala.quoted.quotes +import scala.tasty.inspector as ins + +// Test for https://github.com/lampepfl/dotty/issues/13919 +class MyInspector extends ins.Inspector: + def inspect(using Quotes)(tastys: List[ins.Tasty[quotes.type]]): Unit = + import quotes.reflect._ + TypeRepr.of[Int] + TypeRepr.of[String] + + +@main def main(args: String*): Unit = + ins.TastyInspector.inspectTastyFilesInJar(args.head)(new MyInspector) diff --git a/sbt-test/sbt-dotty/tasty-inspector-cache/lib/src/main/scala/dummy.scala b/sbt-test/sbt-dotty/tasty-inspector-cache/lib/src/main/scala/dummy.scala new file mode 100644 index 000000000000..52d946a2a65d --- /dev/null +++ b/sbt-test/sbt-dotty/tasty-inspector-cache/lib/src/main/scala/dummy.scala @@ -0,0 +1 @@ +class Dummy // we need at least one file for the tasty inspector to run diff --git a/sbt-test/sbt-dotty/tasty-inspector-cache/test b/sbt-test/sbt-dotty/tasty-inspector-cache/test new file mode 100644 index 000000000000..8fa783e886e2 --- /dev/null +++ b/sbt-test/sbt-dotty/tasty-inspector-cache/test @@ -0,0 +1 @@ +> inspector/runTest diff --git a/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala b/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala index ab3f3e86357f..4c6440530ba2 100644 --- a/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala +++ b/tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala @@ -10,6 +10,7 @@ import dotty.tools.dotc.core.Contexts.Context import dotty.tools.dotc.core.Mode import dotty.tools.dotc.core.Phases.Phase import dotty.tools.dotc.fromtasty._ +import dotty.tools.dotc.quoted.QuotesCache import dotty.tools.dotc.util.ClasspathFromClassloader import dotty.tools.dotc.CompilationUnit import dotty.tools.unsupported @@ -64,7 +65,11 @@ object TastyInspector: class TastyInspectorPhase extends Phase: override def phaseName: String = "tastyInspector" - override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] = + override def runOn(units: List[CompilationUnit])(using ctx0: Context): List[CompilationUnit] = + val ctx = QuotesCache.init(ctx0.fresh) + runOnImpl(units)(using ctx) + + private def runOnImpl(units: List[CompilationUnit])(using Context): List[CompilationUnit] = val quotesImpl = QuotesImpl() class TastyImpl(val path: String, val ast: quotesImpl.reflect.Tree) extends Tasty[quotesImpl.type] { val quotes = quotesImpl From 1b1dbd35931b8be227ecc1152ef4705c9db05d79 Mon Sep 17 00:00:00 2001 From: Rikito Taniguchi Date: Mon, 6 Sep 2021 18:08:49 +0900 Subject: [PATCH 0846/1244] Support TypeApplication in Synthetic --- .../dotc/semanticdb/ExtractSemanticDB.scala | 5 + .../dotc/semanticdb/SyntheticsExtractor.scala | 48 ++++++- tests/semanticdb/metac.expect | 130 +++++++++++++++++- 3 files changed, 175 insertions(+), 8 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala index 086c844e9d03..3c2c08ded7a0 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala @@ -251,6 +251,11 @@ class ExtractSemanticDB extends Phase: case tree: Inlined => traverse(tree.call) + + case tree: TypeApply => + synth.tryFindSynthetic(tree).foreach(synthetics.addOne) + traverseChildren(tree) + case tree: TypeTree => tree.typeOpt match // Any types could be appear inside of `TypeTree`, but diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala b/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala index c6d87c67a578..0818b7cf1be1 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala @@ -11,14 +11,44 @@ import scala.collection.mutable class SyntheticsExtractor: import Scala3.{_, given} + val visited = collection.mutable.HashSet[Tree]() + def tryFindSynthetic(tree: Tree)(using Context, SemanticSymbolBuilder, TypeOps): Option[s.Synthetic] = extension (synth: s.Synthetic) def toOpt: Some[s.Synthetic] = Some(synth) - if tree.span.isSynthetic then + val forSynthetic = tree match // not yet supported (for synthetics) + case tree: Apply if isForSynthetic(tree) => true + case tree: TypeApply if isForSynthetic(tree) => true + case _ => false + + if visited.contains(tree) || forSynthetic then None + else tree match - case tree: Apply if isForSynthetic(tree) => - None // not yet supported (for synthetics) + case tree: TypeApply + if tree.span.isSynthetic && + tree.args.forall(arg => !arg.symbol.is(Scala2x)) && + !tree.span.isZeroExtent => + visited.add(tree) + val fnTree = tree.fun match + // Something like `List.apply[Int](1,2,3)` + case select @ Select(qual, _) if isSyntheticName(select) => + s.SelectTree( + s.OriginalTree(range(qual.span, tree.source)), + Some(select.toSemanticId) + ) + case _ => + s.OriginalTree( + range(tree.fun.span, tree.source) + ) + val targs = tree.args.map(targ => targ.tpe.toSemanticType(targ.symbol)(using LinkMode.SymlinkChildren)) + s.Synthetic( + range(tree.span, tree.source), + s.TypeApplyTree( + fnTree, targs + ) + ).toOpt + case tree: Apply if tree.args.nonEmpty && tree.args.forall(arg => @@ -46,7 +76,6 @@ class SyntheticsExtractor: ).toOpt case _ => None - else None private given TreeOps: AnyRef with extension (tree: Tree) @@ -95,4 +124,15 @@ class SyntheticsExtractor: case select: Select => isForComprehensionSyntheticName(select) case _ => false + private def isSyntheticName(select: Select): Boolean = + select.span.toSynthetic == select.qualifier.span.toSynthetic && ( + select.name == nme.apply || + select.name == nme.update || + select.name == nme.foreach || + select.name == nme.withFilter || + select.name == nme.flatMap || + select.name == nme.map || + select.name == nme.unapplySeq || + select.name == nme.unapply) + end SyntheticsExtractor diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect index 07b3174b3d93..732e9b07aa85 100644 --- a/tests/semanticdb/metac.expect +++ b/tests/semanticdb/metac.expect @@ -224,6 +224,7 @@ Text => empty Language => Scala Symbols => 23 entries Occurrences => 52 entries +Synthetics => 2 entries Symbols: annot/Alias. => final object Alias extends Object { self: Alias.type => +2 decls } @@ -304,6 +305,10 @@ Occurrences: [39:11..39:26): ClassAnnotation -> com/javacp/annot/ClassAnnotation# [39:28..39:33): param -> scala/annotation/meta/param# +Synthetics: +[25:2..25:20):@throws[Exception] => *[Exception] +[25:2..25:20):@throws[Exception] => *[Exception] + expect/Anonymous.scala ---------------------- @@ -314,6 +319,7 @@ Text => empty Language => Scala Symbols => 14 entries Occurrences => 30 entries +Synthetics => 2 entries Symbols: example/Anonymous# => class Anonymous extends Object { self: Anonymous & Anonymous => +6 decls } @@ -363,6 +369,10 @@ Occurrences: [18:6..18:9): foo <- example/Anonymous#foo. [18:16..18:19): Foo -> example/Anonymous#Foo# +Synthetics: +[10:2..10:9):locally => *[Unit] +[13:2..13:9):locally => *[Unit] + expect/AnonymousGiven.scala --------------------------- @@ -397,6 +407,7 @@ Text => empty Language => Scala Symbols => 109 entries Occurrences => 113 entries +Synthetics => 2 entries Symbols: classes/C1# => final class C1 extends AnyVal { self: C1 => +2 decls } @@ -624,6 +635,10 @@ Occurrences: [53:4..53:9): local -> local4 [53:10..53:11): + -> scala/Int#`+`(+4). +Synthetics: +[51:16..51:27):List(1).map => *[Int] +[51:16..51:20):List => *.apply[Int] + expect/Empty.scala ------------------ @@ -826,6 +841,7 @@ Text => empty Language => Scala Symbols => 181 entries Occurrences => 148 entries +Synthetics => 10 entries Symbols: _empty_/Enums. => final object Enums extends Object { self: Enums.type => +30 decls } @@ -1160,6 +1176,18 @@ Occurrences: [68:9..68:16): Neptune <- _empty_/Enums.Planet.Neptune. [68:25..68:31): Planet -> _empty_/Enums.Planet# +Synthetics: +[46:28..46:35):C <:< C => *[C, C] +[49:27..49:31):Refl => *.apply[T] +[52:9..52:13):Refl => *.unapply[Option[B]] +[52:19..52:30):opt.flatMap => *[B] +[52:31..52:50):identity[Option[B]] => *[Function1[A, Option[B]]] +[54:14..54:18):Some => *.apply[Some[Int]] +[54:14..54:34):Some(Some(1)).unwrap => *(given_<:<_T_T[Option[Int]]) +[54:19..54:23):Some => *.apply[Int] +[54:28..54:34):unwrap => *[Some[Int], Int] +[56:52..56:64):Enum[Planet] => *[Planet] + expect/EtaExpansion.scala ------------------------- @@ -1170,6 +1198,7 @@ Text => empty Language => Scala Symbols => 3 entries Occurrences => 8 entries +Synthetics => 5 entries Symbols: example/EtaExpansion# => class EtaExpansion extends Object { self: EtaExpansion => +1 decls } @@ -1186,6 +1215,13 @@ Occurrences: [4:10..4:18): foldLeft -> scala/collection/LinearSeqOps#foldLeft(). [4:25..4:26): + -> java/lang/String#`+`(). +Synthetics: +[3:2..3:13):Some(1).map => *[Int] +[3:2..3:6):Some => *.apply[Int] +[3:14..3:22):identity => *[Int] +[4:2..4:18):List(1).foldLeft => *[String] +[4:2..4:6):List => *.apply[Int] + expect/Example.scala -------------------- @@ -1334,6 +1370,7 @@ Text => empty Language => Scala Symbols => 13 entries Occurrences => 52 entries +Synthetics => 6 entries Symbols: example/ForComprehension# => class ForComprehension extends Object { self: ForComprehension => +1 decls } @@ -1404,6 +1441,14 @@ Occurrences: [40:6..40:7): e -> local9 [41:6..41:7): f -> local10 +Synthetics: +[4:9..4:13):List => *.apply[Int] +[5:9..5:13):List => *.apply[Int] +[10:9..10:13):List => *.apply[Int] +[11:9..11:13):List => *.apply[Int] +[19:9..19:13):List => *.apply[Tuple2[Int, Int]] +[33:9..33:13):List => *.apply[Tuple4[Int, Int, Int, Int]] + expect/Givens.scala ------------------- @@ -1414,6 +1459,7 @@ Text => empty Language => Scala Symbols => 29 entries Occurrences => 65 entries +Synthetics => 3 entries Symbols: a/b/Givens. => final object Givens extends Object { self: Givens.type => +12 decls } @@ -1513,6 +1559,11 @@ Occurrences: [26:57..26:58): A -> a/b/Givens.foo().(A) [26:59..26:64): empty -> a/b/Givens.Monoid#empty(). +Synthetics: +[12:17..12:25):sayHello => *[Int] +[13:19..13:29):sayGoodbye => *[Int] +[14:18..14:27):saySoLong => *[Int] + expect/ImplicitConversion.scala ------------------------------- @@ -1655,6 +1706,7 @@ Text => empty Language => Scala Symbols => 8 entries Occurrences => 52 entries +Synthetics => 2 entries Symbols: example/InstrumentTyper# => class InstrumentTyper extends Object { self: AnyRef & InstrumentTyper => +5 decls } @@ -1720,6 +1772,10 @@ Occurrences: [24:30..24:36): Option -> scala/Option# [24:37..24:40): Int -> scala/Int# +Synthetics: +[8:12..8:16):List => *.apply[Matchable] +[20:4..20:8):List => *.apply[Nothing] + expect/InventedNames.scala -------------------------- @@ -1907,6 +1963,7 @@ Text => empty Language => Scala Symbols => 6 entries Occurrences => 10 entries +Synthetics => 1 entries Symbols: example/Local# => class Local extends Object { self: Local => +2 decls } @@ -1928,6 +1985,9 @@ Occurrences: [4:25..4:26): a -> local1 [5:4..5:6): id -> local2 +Synthetics: +[5:4..5:6):id => *[Int] + expect/Locals.scala ------------------- @@ -1938,6 +1998,7 @@ Text => empty Language => Scala Symbols => 3 entries Occurrences => 6 entries +Synthetics => 1 entries Symbols: local0 => val local x: Int @@ -1952,6 +2013,9 @@ Occurrences: [5:4..5:8): List -> scala/package.List. [5:9..5:10): x -> local0 +Synthetics: +[5:4..5:8):List => *.apply[Int] + expect/MetacJava.scala ---------------------- @@ -2049,7 +2113,7 @@ Text => empty Language => Scala Symbols => 3 entries Occurrences => 80 entries -Synthetics => 1 entries +Synthetics => 2 entries Symbols: example/MethodUsages# => class MethodUsages extends Object { self: MethodUsages => +2 decls } @@ -2139,6 +2203,7 @@ Occurrences: [34:8..34:9): m -> example/Methods#m17.m(). Synthetics: +[13:2..13:6):m.m7 => *[Int] [13:2..13:26):m.m7(m, new m.List[Int]) => *(Int) expect/Methods.scala @@ -2715,7 +2780,7 @@ Text => empty Language => Scala Symbols => 68 entries Occurrences => 110 entries -Synthetics => 1 entries +Synthetics => 3 entries Symbols: example/C# => class C extends Object { self: C => +3 decls } @@ -2900,7 +2965,9 @@ Occurrences: [32:57..32:59): as -> example/PickOneRefinement_1#run().(as) Synthetics: +[15:23..15:34):elems.toMap => *[String, Any] [15:23..15:34):elems.toMap => *(refl[Tuple2[String, Any]]) +[32:47..32:56):s.pickOne => *[String] expect/RightAssociativeExtension.scala -------------------------------------- @@ -2989,7 +3056,7 @@ Text => empty Language => Scala Symbols => 52 entries Occurrences => 132 entries -Synthetics => 21 entries +Synthetics => 36 entries Symbols: example/Synthetic# => class Synthetic extends Object { self: Synthetic => +23 decls } @@ -3180,15 +3247,26 @@ Occurrences: [58:6..58:9): foo -> example/Synthetic#Contexts.foo(). Synthetics: +[5:2..5:13):List(1).map => *[Int] +[5:2..5:6):List => *.apply[Int] [6:2..6:18):Array.empty[Int] => intArrayOps(*) [7:2..7:8):"fooo" => augmentString(*) [10:13..10:24):"name:(.*)" => augmentString(*) +[11:17..11:25):LazyList => *.apply[Int] +[13:4..13:28):#:: 2 #:: LazyList.empty => *[Int] [13:8..13:28):2 #:: LazyList.empty => toDeferrer[Int](*) +[13:10..13:28):#:: LazyList.empty => *[Int] [13:14..13:28):LazyList.empty => toDeferrer[Nothing](*) +[13:14..13:28):LazyList.empty => *[Nothing] +[15:25..15:33):LazyList => *.apply[Int] +[17:14..17:38):#:: 2 #:: LazyList.empty => *[Int] [17:18..17:38):2 #:: LazyList.empty => toDeferrer[Int](*) +[17:20..17:38):#:: LazyList.empty => *[Int] [17:24..17:38):LazyList.empty => toDeferrer[Nothing](*) +[17:24..17:38):LazyList.empty => *[Nothing] [19:12..19:13):1 => intWrapper(*) [19:26..19:27):0 => intWrapper(*) +[19:46..19:50):x -> => *[Int] [19:46..19:47):x => ArrowAssoc[Int](*) [20:12..20:13):1 => intWrapper(*) [20:26..20:27):0 => intWrapper(*) @@ -3197,6 +3275,10 @@ Synthetics: [32:35..32:49):Array.empty[T] => *(evidence$1) [36:22..36:27):new F => orderingToOrdered[F](*) [36:22..36:27):new F => *(ordering) +[40:9..40:43):scala.concurrent.Future.successful => *[Int] +[41:9..41:43):scala.concurrent.Future.successful => *[Int] +[44:9..44:43):scala.concurrent.Future.successful => *[Int] +[45:9..45:43):scala.concurrent.Future.successful => *[Int] [51:24..51:30):foo(0) => *(x$1) [52:27..52:33):foo(0) => *(x) [55:6..55:12):foo(x) => *(x) @@ -3252,6 +3334,7 @@ Text => empty Language => Scala Symbols => 22 entries Occurrences => 46 entries +Synthetics => 7 entries Symbols: example/ValPattern# => class ValPattern extends Object { self: ValPattern => +14 decls } @@ -3325,6 +3408,15 @@ Occurrences: [39:10..39:17): leftVar -> local3 [40:10..40:18): rightVar -> local4 +Synthetics: +[6:4..6:8):Some => *.apply[Int] +[8:6..8:10):List => *.unapplySeq[Nothing] +[8:11..8:15):Some => *.unapply[Nothing] +[12:4..12:8):Some => *.apply[Int] +[25:4..25:11):locally => *[Unit] +[28:8..28:12):Some => *.apply[Int] +[32:8..32:12):Some => *.apply[Int] + expect/Vals.scala ----------------- @@ -3845,6 +3937,7 @@ Text => empty Language => Scala Symbols => 3 entries Occurrences => 6 entries +Synthetics => 1 entries Symbols: example/`local-file`# => class local-file extends Object { self: local-file => +1 decls } @@ -3859,6 +3952,9 @@ Occurrences: [5:4..5:9): local -> local0 [5:10..5:11): + -> scala/Int#`+`(+4). +Synthetics: +[3:2..3:9):locally => *[Int] + expect/nullary.scala -------------------- @@ -3869,6 +3965,7 @@ Text => empty Language => Scala Symbols => 17 entries Occurrences => 29 entries +Synthetics => 1 entries Symbols: _empty_/Concrete# => class Concrete extends NullaryTest[Int, List] { self: Concrete => +3 decls } @@ -3920,6 +4017,9 @@ Occurrences: [18:7..18:15): Concrete -> _empty_/Concrete# [18:17..18:25): nullary3 -> _empty_/Concrete#nullary3(). +Synthetics: +[13:17..13:21):List => *.apply[Int] + expect/recursion.scala ---------------------- @@ -3930,6 +4030,7 @@ Text => empty Language => Scala Symbols => 36 entries Occurrences => 46 entries +Synthetics => 3 entries Symbols: local0 => case val method N$1 <: Nat @@ -4017,6 +4118,11 @@ Occurrences: [23:35..23:39): Zero -> recursion/Nats.Zero. [23:40..23:42): ++ -> recursion/Nats.Nat#`++`(). +Synthetics: +[5:50..5:54):Succ => *.apply[Nat.this.type] +[10:13..10:17):Succ => *.unapply[N$1] +[20:11..20:15):Succ => *.unapply[N$2] + expect/semanticdb-Definitions.scala ----------------------------------- @@ -4059,6 +4165,7 @@ Text => empty Language => Scala Symbols => 50 entries Occurrences => 73 entries +Synthetics => 2 entries Symbols: flags/p/package. => final package object p extends Object { self: p.type => +23 decls } @@ -4187,6 +4294,10 @@ Occurrences: [25:27..25:28): t <- local1 [25:33..25:36): ??? -> scala/Predef.`???`(). +Synthetics: +[23:6..23:10):List => *.unapplySeq[Nothing] +[24:19..24:23):List => *.unapplySeq[Nothing] + expect/semanticdb-Types.scala ----------------------------- @@ -4197,6 +4308,7 @@ Text => empty Language => Scala Symbols => 144 entries Occurrences => 225 entries +Synthetics => 1 entries Symbols: local0 => abstract method k => Int @@ -4571,6 +4683,9 @@ Occurrences: [119:32..119:38): Option -> scala/Option# [119:39..119:42): Int -> scala/Int# +Synthetics: +[68:20..68:24):@ann => *[Int] + expect/semanticdb-extract.scala ------------------------------- @@ -4581,6 +4696,7 @@ Text => empty Language => Scala Symbols => 18 entries Occurrences => 20 entries +Synthetics => 3 entries Symbols: _empty_/AnObject. => final object AnObject extends Object { self: AnObject.type => +6 decls } @@ -4624,6 +4740,11 @@ Occurrences: [16:17..16:18): x <- _empty_/AnObject.Foo#x. [16:20..16:23): Int -> scala/Int# +Synthetics: +[11:2..11:6):List => *.apply[Int] +[12:2..12:12):List.apply => *[Nothing] +[13:2..13:14):List.`apply` => *[Nothing] + expect/toplevel.scala --------------------- @@ -4634,7 +4755,7 @@ Text => empty Language => Scala Symbols => 18 entries Occurrences => 43 entries -Synthetics => 1 entries +Synthetics => 2 entries Symbols: _empty_/MyProgram# => final class MyProgram extends Object { self: MyProgram => +2 decls } @@ -4702,5 +4823,6 @@ Occurrences: [7:30..7:33): foo -> _empty_/toplevel$package.foo(). Synthetics: +[5:40..5:60):(1 to times) foreach => *[Unit] [5:41..5:42):1 => intWrapper(*) From b23c9ac667d9020d764a9305c8cfdc516d965439 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 22 Nov 2021 10:33:23 +0100 Subject: [PATCH 0847/1244] Use `inline val` for inlined `final val`s These `val`s are already inlined and do not generate a field, but they still generate a getter that is never used. My marking these as `inline` we can remove the getter and save a few bytes at runtime. By making these fields `inline` we can also check that the RHS constant folds to a value at compile time. --- .../tools/backend/ScalaPrimitivesOps.scala | 262 ++++---- .../dotty/tools/backend/jvm/AsmUtils.scala | 8 +- .../tools/backend/jvm/BCodeSkelBuilder.scala | 2 +- .../dotty/tools/backend/sjs/JSCodeGen.scala | 2 +- .../tools/backend/sjs/JSPrimitives.scala | 50 +- .../src/dotty/tools/dotc/core/Constants.scala | 26 +- .../dotty/tools/dotc/core/Decorators.scala | 2 +- .../src/dotty/tools/dotc/core/Hashable.scala | 8 +- .../src/dotty/tools/dotc/core/NameOps.scala | 2 +- .../src/dotty/tools/dotc/core/NameTags.scala | 22 +- .../src/dotty/tools/dotc/core/Periods.scala | 18 +- .../src/dotty/tools/dotc/core/Scopes.scala | 6 +- .../src/dotty/tools/dotc/core/StdNames.scala | 54 +- .../core/classfile/ClassfileConstants.scala | 570 +++++++++--------- .../tools/dotc/core/tasty/TreeBuffer.scala | 2 +- .../tools/dotc/core/tasty/TreeUnpickler.scala | 6 +- .../core/unpickleScala2/PickleBuffer.scala | 6 +- .../core/unpickleScala2/PickleFormat.scala | 190 +++--- .../core/unpickleScala2/Scala2Flags.scala | 140 ++--- .../dotty/tools/dotc/parsing/JavaTokens.scala | 130 ++-- .../src/dotty/tools/dotc/parsing/Tokens.scala | 252 ++++---- .../dotc/printing/SyntaxHighlighting.scala | 2 +- .../tools/dotc/transform/PatternMatcher.scala | 4 +- .../dotc/transform/sjs/JSExportUtils.scala | 6 +- .../dotty/tools/dotc/typer/Implicits.scala | 8 +- .../src/dotty/tools/dotc/util/Chars.scala | 8 +- .../tools/dotc/util/ReusableInstance.scala | 2 +- .../tools/dotc/util/SixteenNibbles.scala | 4 +- .../src/dotty/tools/dotc/util/Spans.scala | 6 +- .../src/dotty/tools/dotc/util/Stats.scala | 4 +- 30 files changed, 901 insertions(+), 901 deletions(-) diff --git a/compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala b/compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala index 40b567b640b8..6b5bfbc3e00e 100644 --- a/compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala +++ b/compiler/src/dotty/tools/backend/ScalaPrimitivesOps.scala @@ -5,161 +5,161 @@ object ScalaPrimitivesOps extends ScalaPrimitivesOps class ScalaPrimitivesOps { // Arithmetic unary operations - final val POS = 1 // +x - final val NEG = 2 // -x - final val NOT = 3 // ~x + inline val POS = 1 // +x + inline val NEG = 2 // -x + inline val NOT = 3 // ~x // Arithmetic binary operations - final val ADD = 10 // x + y - final val SUB = 11 // x - y - final val MUL = 12 // x * y - final val DIV = 13 // x / y - final val MOD = 14 // x % y + inline val ADD = 10 // x + y + inline val SUB = 11 // x - y + inline val MUL = 12 // x * y + inline val DIV = 13 // x / y + inline val MOD = 14 // x % y // Bitwise operations - final val OR = 20 // x | y - final val XOR = 21 // x ^ y - final val AND = 22 // x & y + inline val OR = 20 // x | y + inline val XOR = 21 // x ^ y + inline val AND = 22 // x & y // Shift operations - final val LSL = 30 // x << y - final val LSR = 31 // x >>> y - final val ASR = 32 // x >> y + inline val LSL = 30 // x << y + inline val LSR = 31 // x >>> y + inline val ASR = 32 // x >> y // Comparison operations - final val ID = 40 // x eq y - final val NI = 41 // x ne y - final val EQ = 42 // x == y - final val NE = 43 // x != y - final val LT = 44 // x < y - final val LE = 45 // x <= y - final val GT = 46 // x > y - final val GE = 47 // x >= y + inline val ID = 40 // x eq y + inline val NI = 41 // x ne y + inline val EQ = 42 // x == y + inline val NE = 43 // x != y + inline val LT = 44 // x < y + inline val LE = 45 // x <= y + inline val GT = 46 // x > y + inline val GE = 47 // x >= y // Boolean unary operations - final val ZNOT = 50 // !x + inline val ZNOT = 50 // !x // Boolean binary operations - final val ZOR = 60 // x || y - final val ZAND = 61 // x && y + inline val ZOR = 60 // x || y + inline val ZAND = 61 // x && y // Array operations - final val LENGTH = 70 // x.length - final val APPLY = 71 // x(y) - final val UPDATE = 72 // x(y) = z + inline val LENGTH = 70 // x.length + inline val APPLY = 71 // x(y) + inline val UPDATE = 72 // x(y) = z // Any operations - final val IS = 80 // x.is[y] - final val AS = 81 // x.as[y] - final val HASH = 87 // x.## + inline val IS = 80 // x.is[y] + inline val AS = 81 // x.as[y] + inline val HASH = 87 // x.## // AnyRef operations - final val SYNCHRONIZED = 90 // x.synchronized(y) + inline val SYNCHRONIZED = 90 // x.synchronized(y) // String operations - final val CONCAT = 100 // String.valueOf(x)+String.valueOf(y) + inline val CONCAT = 100 // String.valueOf(x)+String.valueOf(y) // coercions - final val COERCE = 101 + inline val COERCE = 101 // RunTime operations - final val BOX = 110 // RunTime.box_(x) - final val UNBOX = 111 // RunTime.unbox_(x) - final val NEW_ZARRAY = 112 // RunTime.zarray(x) - final val NEW_BARRAY = 113 // RunTime.barray(x) - final val NEW_SARRAY = 114 // RunTime.sarray(x) - final val NEW_CARRAY = 115 // RunTime.carray(x) - final val NEW_IARRAY = 116 // RunTime.iarray(x) - final val NEW_LARRAY = 117 // RunTime.larray(x) - final val NEW_FARRAY = 118 // RunTime.farray(x) - final val NEW_DARRAY = 119 // RunTime.darray(x) - final val NEW_OARRAY = 120 // RunTime.oarray(x) - - final val ZARRAY_LENGTH = 131 // RunTime.zarray_length(x) - final val BARRAY_LENGTH = 132 // RunTime.barray_length(x) - final val SARRAY_LENGTH = 133 // RunTime.sarray_length(x) - final val CARRAY_LENGTH = 134 // RunTime.carray_length(x) - final val IARRAY_LENGTH = 135 // RunTime.iarray_length(x) - final val LARRAY_LENGTH = 136 // RunTime.larray_length(x) - final val FARRAY_LENGTH = 137 // RunTime.farray_length(x) - final val DARRAY_LENGTH = 138 // RunTime.darray_length(x) - final val OARRAY_LENGTH = 139 // RunTime.oarray_length(x) - - final val ZARRAY_GET = 140 // RunTime.zarray_get(x,y) - final val BARRAY_GET = 141 // RunTime.barray_get(x,y) - final val SARRAY_GET = 142 // RunTime.sarray_get(x,y) - final val CARRAY_GET = 143 // RunTime.carray_get(x,y) - final val IARRAY_GET = 144 // RunTime.iarray_get(x,y) - final val LARRAY_GET = 145 // RunTime.larray_get(x,y) - final val FARRAY_GET = 146 // RunTime.farray_get(x,y) - final val DARRAY_GET = 147 // RunTime.darray_get(x,y) - final val OARRAY_GET = 148 // RunTime.oarray_get(x,y) - - final val ZARRAY_SET = 150 // RunTime.zarray(x,y,z) - final val BARRAY_SET = 151 // RunTime.barray(x,y,z) - final val SARRAY_SET = 152 // RunTime.sarray(x,y,z) - final val CARRAY_SET = 153 // RunTime.carray(x,y,z) - final val IARRAY_SET = 154 // RunTime.iarray(x,y,z) - final val LARRAY_SET = 155 // RunTime.larray(x,y,z) - final val FARRAY_SET = 156 // RunTime.farray(x,y,z) - final val DARRAY_SET = 157 // RunTime.darray(x,y,z) - final val OARRAY_SET = 158 // RunTime.oarray(x,y,z) - - final val B2B = 200 // RunTime.b2b(x) - final val B2S = 201 // RunTime.b2s(x) - final val B2C = 202 // RunTime.b2c(x) - final val B2I = 203 // RunTime.b2i(x) - final val B2L = 204 // RunTime.b2l(x) - final val B2F = 205 // RunTime.b2f(x) - final val B2D = 206 // RunTime.b2d(x) - - final val S2B = 210 // RunTime.s2b(x) - final val S2S = 211 // RunTime.s2s(x) - final val S2C = 212 // RunTime.s2c(x) - final val S2I = 213 // RunTime.s2i(x) - final val S2L = 214 // RunTime.s2l(x) - final val S2F = 215 // RunTime.s2f(x) - final val S2D = 216 // RunTime.s2d(x) - - final val C2B = 220 // RunTime.c2b(x) - final val C2S = 221 // RunTime.c2s(x) - final val C2C = 222 // RunTime.c2c(x) - final val C2I = 223 // RunTime.c2i(x) - final val C2L = 224 // RunTime.c2l(x) - final val C2F = 225 // RunTime.c2f(x) - final val C2D = 226 // RunTime.c2d(x) - - final val I2B = 230 // RunTime.i2b(x) - final val I2S = 231 // RunTime.i2s(x) - final val I2C = 232 // RunTime.i2c(x) - final val I2I = 233 // RunTime.i2i(x) - final val I2L = 234 // RunTime.i2l(x) - final val I2F = 235 // RunTime.i2f(x) - final val I2D = 236 // RunTime.i2d(x) - - final val L2B = 240 // RunTime.l2b(x) - final val L2S = 241 // RunTime.l2s(x) - final val L2C = 242 // RunTime.l2c(x) - final val L2I = 243 // RunTime.l2i(x) - final val L2L = 244 // RunTime.l2l(x) - final val L2F = 245 // RunTime.l2f(x) - final val L2D = 246 // RunTime.l2d(x) - - final val F2B = 250 // RunTime.f2b(x) - final val F2S = 251 // RunTime.f2s(x) - final val F2C = 252 // RunTime.f2c(x) - final val F2I = 253 // RunTime.f2i(x) - final val F2L = 254 // RunTime.f2l(x) - final val F2F = 255 // RunTime.f2f(x) - final val F2D = 256 // RunTime.f2d(x) - - final val D2B = 260 // RunTime.d2b(x) - final val D2S = 261 // RunTime.d2s(x) - final val D2C = 262 // RunTime.d2c(x) - final val D2I = 263 // RunTime.d2i(x) - final val D2L = 264 // RunTime.d2l(x) - final val D2F = 265 // RunTime.d2f(x) - final val D2D = 266 // RunTime.d2d(x) + inline val BOX = 110 // RunTime.box_(x) + inline val UNBOX = 111 // RunTime.unbox_(x) + inline val NEW_ZARRAY = 112 // RunTime.zarray(x) + inline val NEW_BARRAY = 113 // RunTime.barray(x) + inline val NEW_SARRAY = 114 // RunTime.sarray(x) + inline val NEW_CARRAY = 115 // RunTime.carray(x) + inline val NEW_IARRAY = 116 // RunTime.iarray(x) + inline val NEW_LARRAY = 117 // RunTime.larray(x) + inline val NEW_FARRAY = 118 // RunTime.farray(x) + inline val NEW_DARRAY = 119 // RunTime.darray(x) + inline val NEW_OARRAY = 120 // RunTime.oarray(x) + + inline val ZARRAY_LENGTH = 131 // RunTime.zarray_length(x) + inline val BARRAY_LENGTH = 132 // RunTime.barray_length(x) + inline val SARRAY_LENGTH = 133 // RunTime.sarray_length(x) + inline val CARRAY_LENGTH = 134 // RunTime.carray_length(x) + inline val IARRAY_LENGTH = 135 // RunTime.iarray_length(x) + inline val LARRAY_LENGTH = 136 // RunTime.larray_length(x) + inline val FARRAY_LENGTH = 137 // RunTime.farray_length(x) + inline val DARRAY_LENGTH = 138 // RunTime.darray_length(x) + inline val OARRAY_LENGTH = 139 // RunTime.oarray_length(x) + + inline val ZARRAY_GET = 140 // RunTime.zarray_get(x,y) + inline val BARRAY_GET = 141 // RunTime.barray_get(x,y) + inline val SARRAY_GET = 142 // RunTime.sarray_get(x,y) + inline val CARRAY_GET = 143 // RunTime.carray_get(x,y) + inline val IARRAY_GET = 144 // RunTime.iarray_get(x,y) + inline val LARRAY_GET = 145 // RunTime.larray_get(x,y) + inline val FARRAY_GET = 146 // RunTime.farray_get(x,y) + inline val DARRAY_GET = 147 // RunTime.darray_get(x,y) + inline val OARRAY_GET = 148 // RunTime.oarray_get(x,y) + + inline val ZARRAY_SET = 150 // RunTime.zarray(x,y,z) + inline val BARRAY_SET = 151 // RunTime.barray(x,y,z) + inline val SARRAY_SET = 152 // RunTime.sarray(x,y,z) + inline val CARRAY_SET = 153 // RunTime.carray(x,y,z) + inline val IARRAY_SET = 154 // RunTime.iarray(x,y,z) + inline val LARRAY_SET = 155 // RunTime.larray(x,y,z) + inline val FARRAY_SET = 156 // RunTime.farray(x,y,z) + inline val DARRAY_SET = 157 // RunTime.darray(x,y,z) + inline val OARRAY_SET = 158 // RunTime.oarray(x,y,z) + + inline val B2B = 200 // RunTime.b2b(x) + inline val B2S = 201 // RunTime.b2s(x) + inline val B2C = 202 // RunTime.b2c(x) + inline val B2I = 203 // RunTime.b2i(x) + inline val B2L = 204 // RunTime.b2l(x) + inline val B2F = 205 // RunTime.b2f(x) + inline val B2D = 206 // RunTime.b2d(x) + + inline val S2B = 210 // RunTime.s2b(x) + inline val S2S = 211 // RunTime.s2s(x) + inline val S2C = 212 // RunTime.s2c(x) + inline val S2I = 213 // RunTime.s2i(x) + inline val S2L = 214 // RunTime.s2l(x) + inline val S2F = 215 // RunTime.s2f(x) + inline val S2D = 216 // RunTime.s2d(x) + + inline val C2B = 220 // RunTime.c2b(x) + inline val C2S = 221 // RunTime.c2s(x) + inline val C2C = 222 // RunTime.c2c(x) + inline val C2I = 223 // RunTime.c2i(x) + inline val C2L = 224 // RunTime.c2l(x) + inline val C2F = 225 // RunTime.c2f(x) + inline val C2D = 226 // RunTime.c2d(x) + + inline val I2B = 230 // RunTime.i2b(x) + inline val I2S = 231 // RunTime.i2s(x) + inline val I2C = 232 // RunTime.i2c(x) + inline val I2I = 233 // RunTime.i2i(x) + inline val I2L = 234 // RunTime.i2l(x) + inline val I2F = 235 // RunTime.i2f(x) + inline val I2D = 236 // RunTime.i2d(x) + + inline val L2B = 240 // RunTime.l2b(x) + inline val L2S = 241 // RunTime.l2s(x) + inline val L2C = 242 // RunTime.l2c(x) + inline val L2I = 243 // RunTime.l2i(x) + inline val L2L = 244 // RunTime.l2l(x) + inline val L2F = 245 // RunTime.l2f(x) + inline val L2D = 246 // RunTime.l2d(x) + + inline val F2B = 250 // RunTime.f2b(x) + inline val F2S = 251 // RunTime.f2s(x) + inline val F2C = 252 // RunTime.f2c(x) + inline val F2I = 253 // RunTime.f2i(x) + inline val F2L = 254 // RunTime.f2l(x) + inline val F2F = 255 // RunTime.f2f(x) + inline val F2D = 256 // RunTime.f2d(x) + + inline val D2B = 260 // RunTime.d2b(x) + inline val D2S = 261 // RunTime.d2s(x) + inline val D2C = 262 // RunTime.d2c(x) + inline val D2I = 263 // RunTime.d2i(x) + inline val D2L = 264 // RunTime.d2l(x) + inline val D2F = 265 // RunTime.d2f(x) + inline val D2D = 266 // RunTime.d2d(x) /** Check whether the given operation code is an array operation. */ def isArrayOp(code: Int): Boolean = diff --git a/compiler/src/dotty/tools/backend/jvm/AsmUtils.scala b/compiler/src/dotty/tools/backend/jvm/AsmUtils.scala index 7f5887d99a7f..8a71a09aa7ab 100644 --- a/compiler/src/dotty/tools/backend/jvm/AsmUtils.scala +++ b/compiler/src/dotty/tools/backend/jvm/AsmUtils.scala @@ -19,8 +19,8 @@ object AsmUtils { /** * Print the bytecode of classes generated by GenBCode to the standard output. */ - final val traceClassEnabled = false - final val traceClassPattern = "" + inline val traceClassEnabled = false + inline val traceClassPattern = "" /** * Print the bytedcode of classes as they are serialized by the ASM library. The serialization @@ -28,8 +28,8 @@ object AsmUtils { * introduces stack map frames, it computes the maximal stack sizes, and it replaces dead * code by NOPs (see also https://github.com/scala/scala/pull/3726#issuecomment-42861780). */ - final val traceSerializedClassEnabled = false - final val traceSerializedClassPattern = "" + inline val traceSerializedClassEnabled = false + inline val traceSerializedClassPattern = "" def traceMethod(mnode: MethodNode1): Unit = { println(s"Bytecode for method ${mnode.name}") diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala index 95ebf439fa6d..86150f114d2c 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala @@ -70,7 +70,7 @@ trait BCodeSkelBuilder extends BCodeHelpers { with BCJGenSigGen { // Strangely I can't find this in the asm code 255, but reserving 1 for "this" - final val MaximumJvmParameters = 254 + inline val MaximumJvmParameters = 254 // current class var cnode: ClassNode1 = null diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala index e30ddd9a55da..56e16647d080 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala @@ -4369,7 +4369,7 @@ class JSCodeGen()(using genCtx: Context) { js.LoadJSConstructor(encodeClassName(sym)) } - private final val GenericGlobalObjectInformationMsg = { + private inline val GenericGlobalObjectInformationMsg = { "\n " + "See https://www.scala-js.org/doc/interoperability/global-scope.html " + "for further information." diff --git a/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala b/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala index 372393733051..ac7b492e3e1f 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala @@ -16,42 +16,42 @@ import scala.collection.mutable object JSPrimitives { - final val FirstJSPrimitiveCode = 300 + inline val FirstJSPrimitiveCode = 300 - final val DYNNEW = FirstJSPrimitiveCode + 1 // Instantiate a new JavaScript object + inline val DYNNEW = FirstJSPrimitiveCode + 1 // Instantiate a new JavaScript object - final val ARR_CREATE = DYNNEW + 1 // js.Array.apply (array literal syntax) + inline val ARR_CREATE = DYNNEW + 1 // js.Array.apply (array literal syntax) - final val TYPEOF = ARR_CREATE + 1 // typeof x - final val JS_NATIVE = TYPEOF + 1 // js.native. Marker method. Fails if tried to be emitted. + inline val TYPEOF = ARR_CREATE + 1 // typeof x + inline val JS_NATIVE = TYPEOF + 1 // js.native. Marker method. Fails if tried to be emitted. - final val UNITVAL = JS_NATIVE + 1 // () value, which is undefined + inline val UNITVAL = JS_NATIVE + 1 // () value, which is undefined - final val JS_IMPORT = UNITVAL + 1 // js.import.apply(specifier) - final val JS_IMPORT_META = JS_IMPORT + 1 // js.import.meta + inline val JS_IMPORT = UNITVAL + 1 // js.import.apply(specifier) + inline val JS_IMPORT_META = JS_IMPORT + 1 // js.import.meta - final val CONSTRUCTOROF = JS_IMPORT_META + 1 // runtime.constructorOf(clazz) - final val CREATE_INNER_JS_CLASS = CONSTRUCTOROF + 1 // runtime.createInnerJSClass - final val CREATE_LOCAL_JS_CLASS = CREATE_INNER_JS_CLASS + 1 // runtime.createLocalJSClass - final val WITH_CONTEXTUAL_JS_CLASS_VALUE = CREATE_LOCAL_JS_CLASS + 1 // runtime.withContextualJSClassValue - final val LINKING_INFO = WITH_CONTEXTUAL_JS_CLASS_VALUE + 1 // runtime.linkingInfo + inline val CONSTRUCTOROF = JS_IMPORT_META + 1 // runtime.constructorOf(clazz) + inline val CREATE_INNER_JS_CLASS = CONSTRUCTOROF + 1 // runtime.createInnerJSClass + inline val CREATE_LOCAL_JS_CLASS = CREATE_INNER_JS_CLASS + 1 // runtime.createLocalJSClass + inline val WITH_CONTEXTUAL_JS_CLASS_VALUE = CREATE_LOCAL_JS_CLASS + 1 // runtime.withContextualJSClassValue + inline val LINKING_INFO = WITH_CONTEXTUAL_JS_CLASS_VALUE + 1 // runtime.linkingInfo - final val STRICT_EQ = LINKING_INFO + 1 // js.special.strictEquals - final val IN = STRICT_EQ + 1 // js.special.in - final val INSTANCEOF = IN + 1 // js.special.instanceof - final val DELETE = INSTANCEOF + 1 // js.special.delete - final val FORIN = DELETE + 1 // js.special.forin - final val DEBUGGER = FORIN + 1 // js.special.debugger + inline val STRICT_EQ = LINKING_INFO + 1 // js.special.strictEquals + inline val IN = STRICT_EQ + 1 // js.special.in + inline val INSTANCEOF = IN + 1 // js.special.instanceof + inline val DELETE = INSTANCEOF + 1 // js.special.delete + inline val FORIN = DELETE + 1 // js.special.forin + inline val DEBUGGER = FORIN + 1 // js.special.debugger - final val THROW = DEBUGGER + 1 + inline val THROW = DEBUGGER + 1 - final val UNION_FROM = THROW + 1 // js.|.from - final val UNION_FROM_TYPE_CONSTRUCTOR = UNION_FROM + 1 // js.|.fromTypeConstructor + inline val UNION_FROM = THROW + 1 // js.|.from + inline val UNION_FROM_TYPE_CONSTRUCTOR = UNION_FROM + 1 // js.|.fromTypeConstructor - final val REFLECT_SELECTABLE_SELECTDYN = UNION_FROM_TYPE_CONSTRUCTOR + 1 // scala.reflect.Selectable.selectDynamic - final val REFLECT_SELECTABLE_APPLYDYN = REFLECT_SELECTABLE_SELECTDYN + 1 // scala.reflect.Selectable.applyDynamic + inline val REFLECT_SELECTABLE_SELECTDYN = UNION_FROM_TYPE_CONSTRUCTOR + 1 // scala.reflect.Selectable.selectDynamic + inline val REFLECT_SELECTABLE_APPLYDYN = REFLECT_SELECTABLE_SELECTDYN + 1 // scala.reflect.Selectable.applyDynamic - final val LastJSPrimitiveCode = REFLECT_SELECTABLE_APPLYDYN + inline val LastJSPrimitiveCode = REFLECT_SELECTABLE_APPLYDYN def isJSPrimitive(code: Int): Boolean = code >= FirstJSPrimitiveCode && code <= LastJSPrimitiveCode diff --git a/compiler/src/dotty/tools/dotc/core/Constants.scala b/compiler/src/dotty/tools/dotc/core/Constants.scala index c3f749a4b607..f2e6f6fc489a 100644 --- a/compiler/src/dotty/tools/dotc/core/Constants.scala +++ b/compiler/src/dotty/tools/dotc/core/Constants.scala @@ -9,19 +9,19 @@ import Decorators._ object Constants { - final val NoTag = 0 - final val UnitTag = 1 - final val BooleanTag = 2 - final val ByteTag = 3 - final val ShortTag = 4 - final val CharTag = 5 - final val IntTag = 6 - final val LongTag = 7 - final val FloatTag = 8 - final val DoubleTag = 9 - final val StringTag = 10 - final val NullTag = 11 - final val ClazzTag = 12 + inline val NoTag = 0 + inline val UnitTag = 1 + inline val BooleanTag = 2 + inline val ByteTag = 3 + inline val ShortTag = 4 + inline val CharTag = 5 + inline val IntTag = 6 + inline val LongTag = 7 + inline val FloatTag = 8 + inline val DoubleTag = 9 + inline val StringTag = 10 + inline val NullTag = 11 + inline val ClazzTag = 12 class Constant(val value: Any, val tag: Int) extends printing.Showable with Product1[Any] { import java.lang.Double.doubleToRawLongBits diff --git a/compiler/src/dotty/tools/dotc/core/Decorators.scala b/compiler/src/dotty/tools/dotc/core/Decorators.scala index 49897a7bb275..3ea05af0292a 100644 --- a/compiler/src/dotty/tools/dotc/core/Decorators.scala +++ b/compiler/src/dotty/tools/dotc/core/Decorators.scala @@ -74,7 +74,7 @@ object Decorators { NoSymbol } - final val MaxFilterRecursions = 10 + inline val MaxFilterRecursions = 10 /** Implements filterConserve, zipWithConserve methods * on lists that avoid duplication of list nodes where feasible. diff --git a/compiler/src/dotty/tools/dotc/core/Hashable.scala b/compiler/src/dotty/tools/dotc/core/Hashable.scala index 1a1550183f93..713555bed517 100644 --- a/compiler/src/dotty/tools/dotc/core/Hashable.scala +++ b/compiler/src/dotty/tools/dotc/core/Hashable.scala @@ -19,20 +19,20 @@ object Hashable { /** A hash value indicating that the underlying type is not * cached in uniques. */ - final val NotCached = 0 + inline val NotCached = 0 /** An alternative value returned from `hash` if the * computed hashCode would be `NotCached`. */ - private[core] final val NotCachedAlt = Int.MinValue + private[core] inline val NotCachedAlt = Int.MinValue /** A value that indicates that the hash code is unknown */ - private[core] final val HashUnknown = 1234 + private[core] inline val HashUnknown = 1234 /** An alternative value if computeHash would otherwise yield HashUnknown */ - private[core] final val HashUnknownAlt = 4321 + private[core] inline val HashUnknownAlt = 4321 } trait Hashable { diff --git a/compiler/src/dotty/tools/dotc/core/NameOps.scala b/compiler/src/dotty/tools/dotc/core/NameOps.scala index d0b7e811eb4b..fb35ac0ac91f 100644 --- a/compiler/src/dotty/tools/dotc/core/NameOps.scala +++ b/compiler/src/dotty/tools/dotc/core/NameOps.scala @@ -17,7 +17,7 @@ object NameOps { object compactify { lazy val md5: MessageDigest = MessageDigest.getInstance("MD5") - final val CLASSFILE_NAME_CHAR_LIMIT = 240 + inline val CLASSFILE_NAME_CHAR_LIMIT = 240 /** COMPACTIFY * diff --git a/compiler/src/dotty/tools/dotc/core/NameTags.scala b/compiler/src/dotty/tools/dotc/core/NameTags.scala index 67dfcec73c53..7ee7758a506b 100644 --- a/compiler/src/dotty/tools/dotc/core/NameTags.scala +++ b/compiler/src/dotty/tools/dotc/core/NameTags.scala @@ -5,32 +5,32 @@ import dotty.tools.tasty.TastyFormat /** The possible tags of a NameKind */ object NameTags extends TastyFormat.NameTags { - final val FLATTENED = 5 // A flat name, generated by Flatten + inline val FLATTENED = 5 // A flat name, generated by Flatten - final val TRAITSETTER = 6 // A Scala-2 trait setter, generated by AugmentScala2Traits + inline val TRAITSETTER = 6 // A Scala-2 trait setter, generated by AugmentScala2Traits - final val OUTERSELECT = 13 // A name `_outer`, used by the inliner to indicate an + inline val OUTERSELECT = 13 // A name `_outer`, used by the inliner to indicate an // outer accessor that will be filled in by ExplicitOuter. // indicates the number of hops needed to select the outer field. - final val PROTECTEDACCESSOR = 24 // The name of a protected accesor `protected$` created by ProtectedAccessors. + inline val PROTECTEDACCESSOR = 24 // The name of a protected accesor `protected$` created by ProtectedAccessors. - final val INITIALIZER = 26 // A mixin initializer method + inline val INITIALIZER = 26 // A mixin initializer method - final val FIELD = 29 // Used by Memoize to tag the name of a class member field. + inline val FIELD = 29 // Used by Memoize to tag the name of a class member field. - final val EXTMETH = 30 // Used by ExtensionMethods for the name of an extension method + inline val EXTMETH = 30 // Used by ExtensionMethods for the name of an extension method // implementing a value class method. - final val ADAPTEDCLOSURE = 31 // Used in Erasure to adapt closures over primitive types. + inline val ADAPTEDCLOSURE = 31 // Used in Erasure to adapt closures over primitive types. - final val DIRECT = 32 // Used to define implementations of methods with + inline val DIRECT = 32 // Used to define implementations of methods with // erased context function results that can override some // other method. - final val PARAMACC = 33 // Used for a private parameter alias + inline val PARAMACC = 33 // Used for a private parameter alias - final val SETTER = 34 // A synthesized += suffix. + inline val SETTER = 34 // A synthesized += suffix. def nameTagToString(tag: Int): String = tag match { case UTF8 => "UTF8" diff --git a/compiler/src/dotty/tools/dotc/core/Periods.scala b/compiler/src/dotty/tools/dotc/core/Periods.scala index d5944beedc2a..44d83dcb5278 100644 --- a/compiler/src/dotty/tools/dotc/core/Periods.scala +++ b/compiler/src/dotty/tools/dotc/core/Periods.scala @@ -126,18 +126,18 @@ object Periods { /** An ordinal number for compiler runs. First run has number 1. */ type RunId = Int - final val NoRunId = 0 - final val InitialRunId = 1 - final val RunWidth = java.lang.Integer.SIZE - PhaseWidth * 2 - 1/* sign */ - final val MaxPossibleRunId = (1 << RunWidth) - 1 + inline val NoRunId = 0 + inline val InitialRunId = 1 + inline val RunWidth = java.lang.Integer.SIZE - PhaseWidth * 2 - 1/* sign */ + inline val MaxPossibleRunId = (1 << RunWidth) - 1 /** An ordinal number for phases. First phase has number 1. */ type PhaseId = Int - final val NoPhaseId = 0 - final val FirstPhaseId = 1 + inline val NoPhaseId = 0 + inline val FirstPhaseId = 1 /** The number of bits needed to encode a phase identifier. */ - final val PhaseWidth = 7 - final val PhaseMask = (1 << PhaseWidth) - 1 - final val MaxPossiblePhaseId = PhaseMask + inline val PhaseWidth = 7 + inline val PhaseMask = (1 << PhaseWidth) - 1 + inline val MaxPossiblePhaseId = PhaseMask } diff --git a/compiler/src/dotty/tools/dotc/core/Scopes.scala b/compiler/src/dotty/tools/dotc/core/Scopes.scala index 5dc7ce168c24..1553093a2b87 100644 --- a/compiler/src/dotty/tools/dotc/core/Scopes.scala +++ b/compiler/src/dotty/tools/dotc/core/Scopes.scala @@ -24,19 +24,19 @@ import collection.mutable object Scopes { /** Maximal fill factor of hash table */ - private final val FillFactor = 2.0/3.0 + private inline val FillFactor = 2.0/3.0 /** A hashtable is created once current size exceeds MinHash * FillFactor * The initial hash table has twice that size (i.e 16). * This value must be a power of two, so that the index of an element can * be computed as element.hashCode & (hashTable.length - 1) */ - final val MinHashedScopeSize = 8 + inline val MinHashedScopeSize = 8 /** The maximal permissible number of recursions when creating * a hashtable */ - private final val MaxRecursions = 1000 + private inline val MaxRecursions = 1000 /** A function that optionally produces synthesized symbols with * the given name in the given context. Returns `NoSymbol` if the diff --git a/compiler/src/dotty/tools/dotc/core/StdNames.scala b/compiler/src/dotty/tools/dotc/core/StdNames.scala index 2e0b229ca42c..349f80d11d8a 100644 --- a/compiler/src/dotty/tools/dotc/core/StdNames.scala +++ b/compiler/src/dotty/tools/dotc/core/StdNames.scala @@ -13,33 +13,33 @@ object StdNames { /** Base strings from which synthetic names are derived. */ object str { - final val SETTER_SUFFIX = "_=" - final val EXPAND_SEPARATOR = "$$" - final val TRAIT_SETTER_SEPARATOR = "$_setter_$" - final val SUPER_PREFIX = "super$" - final val INITIALIZER_PREFIX = "initial$" - final val AVOID_CLASH_SUFFIX = "$_avoid_name_clash_$" - final val MODULE_SUFFIX = "$" - final val TOPLEVEL_SUFFIX = "$package" - final val NAME_JOIN = "$" - final val DEFAULT_GETTER = "$default$" - final val LOCALDUMMY_PREFIX = "]""", """\$""") } diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala index 93603e8a9d37..3b05ee351b86 100644 --- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala +++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileConstants.scala @@ -6,11 +6,11 @@ import scala.annotation.switch object ClassfileConstants { - final val JAVA_MAGIC = 0xCAFEBABE - final val JAVA_MAJOR_VERSION = 45 - final val JAVA_MINOR_VERSION = 3 + inline val JAVA_MAGIC = 0xCAFEBABE + inline val JAVA_MAJOR_VERSION = 45 + inline val JAVA_MINOR_VERSION = 3 - final val JAVA8_MAJOR_VERSION = 52 + inline val JAVA8_MAJOR_VERSION = 52 /** (see http://java.sun.com/docs/books/jvms/second_edition/jvms-clarify.html) * @@ -38,298 +38,298 @@ object ClassfileConstants { * https://groups.google.com/forum/?hl=en#!topic/jvm-languages/jVhzvq8-ZIk * */ // Class Field Method - final val JAVA_ACC_PUBLIC = 0x0001 // X X X - final val JAVA_ACC_PRIVATE = 0x0002 // X X - final val JAVA_ACC_PROTECTED = 0x0004 // X X - final val JAVA_ACC_STATIC = 0x0008 // X X - final val JAVA_ACC_FINAL = 0x0010 // X X X - final val JAVA_ACC_SUPER = 0x0020 // X - final val JAVA_ACC_SYNCHRONIZED = 0x0020 // X - final val JAVA_ACC_VOLATILE = 0x0040 // X - final val JAVA_ACC_BRIDGE = 0x0040 // X - final val JAVA_ACC_TRANSIENT = 0x0080 // X - final val JAVA_ACC_VARARGS = 0x0080 // X - final val JAVA_ACC_NATIVE = 0x0100 // X - final val JAVA_ACC_INTERFACE = 0x0200 // X - final val JAVA_ACC_ABSTRACT = 0x0400 // X X - final val JAVA_ACC_STRICT = 0x0800 // X - final val JAVA_ACC_SYNTHETIC = 0x1000 // X X X - final val JAVA_ACC_ANNOTATION = 0x2000 // X - final val JAVA_ACC_ENUM = 0x4000 // X X + inline val JAVA_ACC_PUBLIC = 0x0001 // X X X + inline val JAVA_ACC_PRIVATE = 0x0002 // X X + inline val JAVA_ACC_PROTECTED = 0x0004 // X X + inline val JAVA_ACC_STATIC = 0x0008 // X X + inline val JAVA_ACC_FINAL = 0x0010 // X X X + inline val JAVA_ACC_SUPER = 0x0020 // X + inline val JAVA_ACC_SYNCHRONIZED = 0x0020 // X + inline val JAVA_ACC_VOLATILE = 0x0040 // X + inline val JAVA_ACC_BRIDGE = 0x0040 // X + inline val JAVA_ACC_TRANSIENT = 0x0080 // X + inline val JAVA_ACC_VARARGS = 0x0080 // X + inline val JAVA_ACC_NATIVE = 0x0100 // X + inline val JAVA_ACC_INTERFACE = 0x0200 // X + inline val JAVA_ACC_ABSTRACT = 0x0400 // X X + inline val JAVA_ACC_STRICT = 0x0800 // X + inline val JAVA_ACC_SYNTHETIC = 0x1000 // X X X + inline val JAVA_ACC_ANNOTATION = 0x2000 // X + inline val JAVA_ACC_ENUM = 0x4000 // X X // tags describing the type of a literal in the constant pool - final val CONSTANT_UTF8 = 1 - final val CONSTANT_UNICODE = 2 - final val CONSTANT_INTEGER = 3 - final val CONSTANT_FLOAT = 4 - final val CONSTANT_LONG = 5 - final val CONSTANT_DOUBLE = 6 - final val CONSTANT_CLASS = 7 - final val CONSTANT_STRING = 8 - final val CONSTANT_FIELDREF = 9 - final val CONSTANT_METHODREF = 10 - final val CONSTANT_INTFMETHODREF = 11 - final val CONSTANT_NAMEANDTYPE = 12 - - final val CONSTANT_METHODHANDLE = 15 - final val CONSTANT_METHODTYPE = 16 - final val CONSTANT_INVOKEDYNAMIC = 18 + inline val CONSTANT_UTF8 = 1 + inline val CONSTANT_UNICODE = 2 + inline val CONSTANT_INTEGER = 3 + inline val CONSTANT_FLOAT = 4 + inline val CONSTANT_LONG = 5 + inline val CONSTANT_DOUBLE = 6 + inline val CONSTANT_CLASS = 7 + inline val CONSTANT_STRING = 8 + inline val CONSTANT_FIELDREF = 9 + inline val CONSTANT_METHODREF = 10 + inline val CONSTANT_INTFMETHODREF = 11 + inline val CONSTANT_NAMEANDTYPE = 12 + + inline val CONSTANT_METHODHANDLE = 15 + inline val CONSTANT_METHODTYPE = 16 + inline val CONSTANT_INVOKEDYNAMIC = 18 // tags describing the type of a literal in attribute values - final val BYTE_TAG = 'B' - final val CHAR_TAG = 'C' - final val DOUBLE_TAG = 'D' - final val FLOAT_TAG = 'F' - final val INT_TAG = 'I' - final val LONG_TAG = 'J' - final val SHORT_TAG = 'S' - final val BOOL_TAG = 'Z' - final val STRING_TAG = 's' - final val ENUM_TAG = 'e' - final val CLASS_TAG = 'c' - final val ARRAY_TAG = '[' - final val VOID_TAG = 'V' - final val TVAR_TAG = 'T' - final val OBJECT_TAG = 'L' - final val ANNOTATION_TAG = '@' - final val SCALA_NOTHING = "scala.runtime.Nothing$" - final val SCALA_NULL = "scala.runtime.Null$" + inline val BYTE_TAG = 'B' + inline val CHAR_TAG = 'C' + inline val DOUBLE_TAG = 'D' + inline val FLOAT_TAG = 'F' + inline val INT_TAG = 'I' + inline val LONG_TAG = 'J' + inline val SHORT_TAG = 'S' + inline val BOOL_TAG = 'Z' + inline val STRING_TAG = 's' + inline val ENUM_TAG = 'e' + inline val CLASS_TAG = 'c' + inline val ARRAY_TAG = '[' + inline val VOID_TAG = 'V' + inline val TVAR_TAG = 'T' + inline val OBJECT_TAG = 'L' + inline val ANNOTATION_TAG = '@' + inline val SCALA_NOTHING = "scala.runtime.Nothing$" + inline val SCALA_NULL = "scala.runtime.Null$" // tags describing the type of newarray - final val T_BOOLEAN = 4 - final val T_CHAR = 5 - final val T_FLOAT = 6 - final val T_DOUBLE = 7 - final val T_BYTE = 8 - final val T_SHORT = 9 - final val T_INT = 10 - final val T_LONG = 11 + inline val T_BOOLEAN = 4 + inline val T_CHAR = 5 + inline val T_FLOAT = 6 + inline val T_DOUBLE = 7 + inline val T_BYTE = 8 + inline val T_SHORT = 9 + inline val T_INT = 10 + inline val T_LONG = 11 // JVM mnemonics - final val nop = 0x00 - final val aconst_null = 0x01 - final val iconst_m1 = 0x02 - - final val iconst_0 = 0x03 - final val iconst_1 = 0x04 - final val iconst_2 = 0x05 - final val iconst_3 = 0x06 - final val iconst_4 = 0x07 - final val iconst_5 = 0x08 - - final val lconst_0 = 0x09 - final val lconst_1 = 0x0a - final val fconst_0 = 0x0b - final val fconst_1 = 0x0c - final val fconst_2 = 0x0d - final val dconst_0 = 0x0e - final val dconst_1 = 0x0f - - final val bipush = 0x10 - final val sipush = 0x11 - final val ldc = 0x12 - final val ldc_w = 0x13 - final val ldc2_w = 0x14 - - final val iload = 0x15 - final val lload = 0x16 - final val fload = 0x17 - final val dload = 0x18 - final val aload = 0x19 - - final val iload_0 = 0x1a - final val iload_1 = 0x1b - final val iload_2 = 0x1c - final val iload_3 = 0x1d - final val lload_0 = 0x1e - final val lload_1 = 0x1f - final val lload_2 = 0x20 - final val lload_3 = 0x21 - final val fload_0 = 0x22 - final val fload_1 = 0x23 - final val fload_2 = 0x24 - final val fload_3 = 0x25 - final val dload_0 = 0x26 - final val dload_1 = 0x27 - final val dload_2 = 0x28 - final val dload_3 = 0x29 - final val aload_0 = 0x2a - final val aload_1 = 0x2b - final val aload_2 = 0x2c - final val aload_3 = 0x2d - final val iaload = 0x2e - final val laload = 0x2f - final val faload = 0x30 - final val daload = 0x31 - final val aaload = 0x32 - final val baload = 0x33 - final val caload = 0x34 - final val saload = 0x35 - - final val istore = 0x36 - final val lstore = 0x37 - final val fstore = 0x38 - final val dstore = 0x39 - final val astore = 0x3a - final val istore_0 = 0x3b - final val istore_1 = 0x3c - final val istore_2 = 0x3d - final val istore_3 = 0x3e - final val lstore_0 = 0x3f - final val lstore_1 = 0x40 - final val lstore_2 = 0x41 - final val lstore_3 = 0x42 - final val fstore_0 = 0x43 - final val fstore_1 = 0x44 - final val fstore_2 = 0x45 - final val fstore_3 = 0x46 - final val dstore_0 = 0x47 - final val dstore_1 = 0x48 - final val dstore_2 = 0x49 - final val dstore_3 = 0x4a - final val astore_0 = 0x4b - final val astore_1 = 0x4c - final val astore_2 = 0x4d - final val astore_3 = 0x4e - final val iastore = 0x4f - final val lastore = 0x50 - final val fastore = 0x51 - final val dastore = 0x52 - final val aastore = 0x53 - final val bastore = 0x54 - final val castore = 0x55 - final val sastore = 0x56 - - final val pop = 0x57 - final val pop2 = 0x58 - final val dup = 0x59 - final val dup_x1 = 0x5a - final val dup_x2 = 0x5b - final val dup2 = 0x5c - final val dup2_x1 = 0x5d - final val dup2_x2 = 0x5e - final val swap = 0x5f - - final val iadd = 0x60 - final val ladd = 0x61 - final val fadd = 0x62 - final val dadd = 0x63 - final val isub = 0x64 - final val lsub = 0x65 - final val fsub = 0x66 - final val dsub = 0x67 - final val imul = 0x68 - final val lmul = 0x69 - final val fmul = 0x6a - final val dmul = 0x6b - final val idiv = 0x6c - final val ldiv = 0x6d - final val fdiv = 0x6e - final val ddiv = 0x6f - final val irem = 0x70 - final val lrem = 0x71 - final val frem = 0x72 - final val drem = 0x73 - - final val ineg = 0x74 - final val lneg = 0x75 - final val fneg = 0x76 - final val dneg = 0x77 - - final val ishl = 0x78 - final val lshl = 0x79 - final val ishr = 0x7a - final val lshr = 0x7b - final val iushr = 0x7c - final val lushr = 0x7d - final val iand = 0x7e - final val land = 0x7f - final val ior = 0x80 - final val lor = 0x81 - final val ixor = 0x82 - final val lxor = 0x83 - final val iinc = 0x84 - - final val i2l = 0x85 - final val i2f = 0x86 - final val i2d = 0x87 - final val l2i = 0x88 - final val l2f = 0x89 - final val l2d = 0x8a - final val f2i = 0x8b - final val f2l = 0x8c - final val f2d = 0x8d - final val d2i = 0x8e - final val d2l = 0x8f - final val d2f = 0x90 - final val i2b = 0x91 - final val i2c = 0x92 - final val i2s = 0x93 - - final val lcmp = 0x94 - final val fcmpl = 0x95 - final val fcmpg = 0x96 - final val dcmpl = 0x97 - final val dcmpg = 0x98 - - final val ifeq = 0x99 - final val ifne = 0x9a - final val iflt = 0x9b - final val ifge = 0x9c - final val ifgt = 0x9d - final val ifle = 0x9e - final val if_icmpeq = 0x9f - final val if_icmpne = 0xa0 - final val if_icmplt = 0xa1 - final val if_icmpge = 0xa2 - final val if_icmpgt = 0xa3 - final val if_icmple = 0xa4 - final val if_acmpeq = 0xa5 - final val if_acmpne = 0xa6 - final val goto = 0xa7 - final val jsr = 0xa8 - final val ret = 0xa9 - final val tableswitch = 0xaa - final val lookupswitch = 0xab - final val ireturn = 0xac - final val lreturn = 0xad - final val freturn = 0xae - final val dreturn = 0xaf - final val areturn = 0xb0 - final val return_ = 0xb1 - - final val getstatic = 0xb2 - final val putstatic = 0xb3 - final val getfield = 0xb4 - final val putfield = 0xb5 - - final val invokevirtual = 0xb6 - final val invokespecial = 0xb7 - final val invokestatic = 0xb8 - final val invokeinterface = 0xb9 - final val xxxunusedxxxx = 0xba - - final val new_ = 0xbb - final val newarray = 0xbc - final val anewarray = 0xbd - final val arraylength = 0xbe - final val athrow = 0xbf - final val checkcast = 0xc0 - final val instanceof = 0xc1 - final val monitorenter = 0xc2 - final val monitorexit = 0xc3 - final val wide = 0xc4 - final val multianewarray = 0xc5 - final val ifnull = 0xc6 - final val ifnonnull = 0xc7 - final val goto_w = 0xc8 - final val jsr_w = 0xc9 + inline val nop = 0x00 + inline val aconst_null = 0x01 + inline val iconst_m1 = 0x02 + + inline val iconst_0 = 0x03 + inline val iconst_1 = 0x04 + inline val iconst_2 = 0x05 + inline val iconst_3 = 0x06 + inline val iconst_4 = 0x07 + inline val iconst_5 = 0x08 + + inline val lconst_0 = 0x09 + inline val lconst_1 = 0x0a + inline val fconst_0 = 0x0b + inline val fconst_1 = 0x0c + inline val fconst_2 = 0x0d + inline val dconst_0 = 0x0e + inline val dconst_1 = 0x0f + + inline val bipush = 0x10 + inline val sipush = 0x11 + inline val ldc = 0x12 + inline val ldc_w = 0x13 + inline val ldc2_w = 0x14 + + inline val iload = 0x15 + inline val lload = 0x16 + inline val fload = 0x17 + inline val dload = 0x18 + inline val aload = 0x19 + + inline val iload_0 = 0x1a + inline val iload_1 = 0x1b + inline val iload_2 = 0x1c + inline val iload_3 = 0x1d + inline val lload_0 = 0x1e + inline val lload_1 = 0x1f + inline val lload_2 = 0x20 + inline val lload_3 = 0x21 + inline val fload_0 = 0x22 + inline val fload_1 = 0x23 + inline val fload_2 = 0x24 + inline val fload_3 = 0x25 + inline val dload_0 = 0x26 + inline val dload_1 = 0x27 + inline val dload_2 = 0x28 + inline val dload_3 = 0x29 + inline val aload_0 = 0x2a + inline val aload_1 = 0x2b + inline val aload_2 = 0x2c + inline val aload_3 = 0x2d + inline val iaload = 0x2e + inline val laload = 0x2f + inline val faload = 0x30 + inline val daload = 0x31 + inline val aaload = 0x32 + inline val baload = 0x33 + inline val caload = 0x34 + inline val saload = 0x35 + + inline val istore = 0x36 + inline val lstore = 0x37 + inline val fstore = 0x38 + inline val dstore = 0x39 + inline val astore = 0x3a + inline val istore_0 = 0x3b + inline val istore_1 = 0x3c + inline val istore_2 = 0x3d + inline val istore_3 = 0x3e + inline val lstore_0 = 0x3f + inline val lstore_1 = 0x40 + inline val lstore_2 = 0x41 + inline val lstore_3 = 0x42 + inline val fstore_0 = 0x43 + inline val fstore_1 = 0x44 + inline val fstore_2 = 0x45 + inline val fstore_3 = 0x46 + inline val dstore_0 = 0x47 + inline val dstore_1 = 0x48 + inline val dstore_2 = 0x49 + inline val dstore_3 = 0x4a + inline val astore_0 = 0x4b + inline val astore_1 = 0x4c + inline val astore_2 = 0x4d + inline val astore_3 = 0x4e + inline val iastore = 0x4f + inline val lastore = 0x50 + inline val fastore = 0x51 + inline val dastore = 0x52 + inline val aastore = 0x53 + inline val bastore = 0x54 + inline val castore = 0x55 + inline val sastore = 0x56 + + inline val pop = 0x57 + inline val pop2 = 0x58 + inline val dup = 0x59 + inline val dup_x1 = 0x5a + inline val dup_x2 = 0x5b + inline val dup2 = 0x5c + inline val dup2_x1 = 0x5d + inline val dup2_x2 = 0x5e + inline val swap = 0x5f + + inline val iadd = 0x60 + inline val ladd = 0x61 + inline val fadd = 0x62 + inline val dadd = 0x63 + inline val isub = 0x64 + inline val lsub = 0x65 + inline val fsub = 0x66 + inline val dsub = 0x67 + inline val imul = 0x68 + inline val lmul = 0x69 + inline val fmul = 0x6a + inline val dmul = 0x6b + inline val idiv = 0x6c + inline val ldiv = 0x6d + inline val fdiv = 0x6e + inline val ddiv = 0x6f + inline val irem = 0x70 + inline val lrem = 0x71 + inline val frem = 0x72 + inline val drem = 0x73 + + inline val ineg = 0x74 + inline val lneg = 0x75 + inline val fneg = 0x76 + inline val dneg = 0x77 + + inline val ishl = 0x78 + inline val lshl = 0x79 + inline val ishr = 0x7a + inline val lshr = 0x7b + inline val iushr = 0x7c + inline val lushr = 0x7d + inline val iand = 0x7e + inline val land = 0x7f + inline val ior = 0x80 + inline val lor = 0x81 + inline val ixor = 0x82 + inline val lxor = 0x83 + inline val iinc = 0x84 + + inline val i2l = 0x85 + inline val i2f = 0x86 + inline val i2d = 0x87 + inline val l2i = 0x88 + inline val l2f = 0x89 + inline val l2d = 0x8a + inline val f2i = 0x8b + inline val f2l = 0x8c + inline val f2d = 0x8d + inline val d2i = 0x8e + inline val d2l = 0x8f + inline val d2f = 0x90 + inline val i2b = 0x91 + inline val i2c = 0x92 + inline val i2s = 0x93 + + inline val lcmp = 0x94 + inline val fcmpl = 0x95 + inline val fcmpg = 0x96 + inline val dcmpl = 0x97 + inline val dcmpg = 0x98 + + inline val ifeq = 0x99 + inline val ifne = 0x9a + inline val iflt = 0x9b + inline val ifge = 0x9c + inline val ifgt = 0x9d + inline val ifle = 0x9e + inline val if_icmpeq = 0x9f + inline val if_icmpne = 0xa0 + inline val if_icmplt = 0xa1 + inline val if_icmpge = 0xa2 + inline val if_icmpgt = 0xa3 + inline val if_icmple = 0xa4 + inline val if_acmpeq = 0xa5 + inline val if_acmpne = 0xa6 + inline val goto = 0xa7 + inline val jsr = 0xa8 + inline val ret = 0xa9 + inline val tableswitch = 0xaa + inline val lookupswitch = 0xab + inline val ireturn = 0xac + inline val lreturn = 0xad + inline val freturn = 0xae + inline val dreturn = 0xaf + inline val areturn = 0xb0 + inline val return_ = 0xb1 + + inline val getstatic = 0xb2 + inline val putstatic = 0xb3 + inline val getfield = 0xb4 + inline val putfield = 0xb5 + + inline val invokevirtual = 0xb6 + inline val invokespecial = 0xb7 + inline val invokestatic = 0xb8 + inline val invokeinterface = 0xb9 + inline val xxxunusedxxxx = 0xba + + inline val new_ = 0xbb + inline val newarray = 0xbc + inline val anewarray = 0xbd + inline val arraylength = 0xbe + inline val athrow = 0xbf + inline val checkcast = 0xc0 + inline val instanceof = 0xc1 + inline val monitorenter = 0xc2 + inline val monitorexit = 0xc3 + inline val wide = 0xc4 + inline val multianewarray = 0xc5 + inline val ifnull = 0xc6 + inline val ifnonnull = 0xc7 + inline val goto_w = 0xc8 + inline val jsr_w = 0xc9 // reserved opcodes - final val breakpoint = 0xca - final val impdep1 = 0xfe - final val impdep2 = 0xff + inline val breakpoint = 0xca + inline val impdep1 = 0xfe + inline val impdep2 = 0xff import Flags._ abstract class FlagTranslation { diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala index 268b02b4389f..a3dedaaec685 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala @@ -13,7 +13,7 @@ import ast.untpd.Tree class TreeBuffer extends TastyBuffer(50000) { - private final val ItemsOverOffsets = 2 + private inline val ItemsOverOffsets = 2 private val initialOffsetSize = bytes.length / (AddrWidth * ItemsOverOffsets) private var offsets = new Array[Int](initialOffsetSize) private var isRelative = new Array[Boolean](initialOffsetSize) diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index e4a5c0ae8c6d..af186e825591 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -1522,9 +1522,9 @@ object TreeUnpickler { /** An enumeration indicating which subtrees should be added to an OwnerTree. */ type MemberDefMode = Int - final val MemberDefsOnly = 0 // add only member defs; skip other statements - final val NoMemberDefs = 1 // add only statements that are not member defs - final val AllDefs = 2 // add everything + inline val MemberDefsOnly = 0 // add only member defs; skip other statements + inline val NoMemberDefs = 1 // add only statements that are not member defs + inline val AllDefs = 2 // add everything class TreeWithoutOwner extends Exception } diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala index fc06ce4da8a3..2aeb1bdeefcc 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleBuffer.scala @@ -189,9 +189,9 @@ class PickleBuffer(data: Array[Byte], from: Int, to: Int) { object PickleBuffer { - private final val ScalaFlagEnd = 48 - private final val ChunkBits = 8 - private final val ChunkSize = 1 << ChunkBits + private inline val ScalaFlagEnd = 48 + private inline val ChunkBits = 8 + private inline val ChunkSize = 1 << ChunkBits private type FlagMap = Array[Array[Long]] private val (scalaTermFlagMap, scalaTypeFlagMap) = { diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleFormat.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleFormat.scala index a9a64a9bb7ee..f135de7e43e9 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleFormat.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/PickleFormat.scala @@ -119,109 +119,109 @@ object PickleFormat { val MajorVersion: Int = 5 val MinorVersion: Int = 2 - final val TERMname = 1 - final val TYPEname = 2 - final val NONEsym = 3 - final val TYPEsym = 4 - final val ALIASsym = 5 - final val CLASSsym = 6 - final val MODULEsym = 7 - final val VALsym = 8 - final val EXTref = 9 - final val EXTMODCLASSref = 10 - final val NOtpe = 11 - final val NOPREFIXtpe = 12 - final val THIStpe = 13 - final val SINGLEtpe = 14 - final val CONSTANTtpe = 15 - final val TYPEREFtpe = 16 - final val TYPEBOUNDStpe = 17 - final val REFINEDtpe = 18 - final val CLASSINFOtpe = 19 - final val METHODtpe = 20 - final val POLYtpe = 21 - final val IMPLICITMETHODtpe = 22 // no longer generated + inline val TERMname = 1 + inline val TYPEname = 2 + inline val NONEsym = 3 + inline val TYPEsym = 4 + inline val ALIASsym = 5 + inline val CLASSsym = 6 + inline val MODULEsym = 7 + inline val VALsym = 8 + inline val EXTref = 9 + inline val EXTMODCLASSref = 10 + inline val NOtpe = 11 + inline val NOPREFIXtpe = 12 + inline val THIStpe = 13 + inline val SINGLEtpe = 14 + inline val CONSTANTtpe = 15 + inline val TYPEREFtpe = 16 + inline val TYPEBOUNDStpe = 17 + inline val REFINEDtpe = 18 + inline val CLASSINFOtpe = 19 + inline val METHODtpe = 20 + inline val POLYtpe = 21 + inline val IMPLICITMETHODtpe = 22 // no longer generated - final val LITERAL = 23 // base line for literals - final val LITERALunit = 24 - final val LITERALboolean = 25 - final val LITERALbyte = 26 - final val LITERALshort = 27 - final val LITERALchar = 28 - final val LITERALint = 29 - final val LITERALlong = 30 - final val LITERALfloat = 31 - final val LITERALdouble = 32 - final val LITERALstring = 33 - final val LITERALnull = 34 - final val LITERALclass = 35 - final val LITERALenum = 36 - final val SYMANNOT = 40 - final val CHILDREN = 41 - final val ANNOTATEDtpe = 42 - final val ANNOTINFO = 43 - final val ANNOTARGARRAY = 44 + inline val LITERAL = 23 // base line for literals + inline val LITERALunit = 24 + inline val LITERALboolean = 25 + inline val LITERALbyte = 26 + inline val LITERALshort = 27 + inline val LITERALchar = 28 + inline val LITERALint = 29 + inline val LITERALlong = 30 + inline val LITERALfloat = 31 + inline val LITERALdouble = 32 + inline val LITERALstring = 33 + inline val LITERALnull = 34 + inline val LITERALclass = 35 + inline val LITERALenum = 36 + inline val SYMANNOT = 40 + inline val CHILDREN = 41 + inline val ANNOTATEDtpe = 42 + inline val ANNOTINFO = 43 + inline val ANNOTARGARRAY = 44 - final val SUPERtpe = 46 - final val DEBRUIJNINDEXtpe = 47 // no longer generated - final val EXISTENTIALtpe = 48 + inline val SUPERtpe = 46 + inline val DEBRUIJNINDEXtpe = 47 // no longer generated + inline val EXISTENTIALtpe = 48 - final val TREE = 49 // prefix code that means a tree is coming - final val EMPTYtree = 1 - final val PACKAGEtree = 2 - final val CLASStree = 3 - final val MODULEtree = 4 - final val VALDEFtree = 5 - final val DEFDEFtree = 6 - final val TYPEDEFtree = 7 - final val LABELtree = 8 - final val IMPORTtree = 9 - final val DOCDEFtree = 11 - final val TEMPLATEtree = 12 - final val BLOCKtree = 13 - final val CASEtree = 14 + inline val TREE = 49 // prefix code that means a tree is coming + inline val EMPTYtree = 1 + inline val PACKAGEtree = 2 + inline val CLASStree = 3 + inline val MODULEtree = 4 + inline val VALDEFtree = 5 + inline val DEFDEFtree = 6 + inline val TYPEDEFtree = 7 + inline val LABELtree = 8 + inline val IMPORTtree = 9 + inline val DOCDEFtree = 11 + inline val TEMPLATEtree = 12 + inline val BLOCKtree = 13 + inline val CASEtree = 14 // This node type has been removed. - // final val SEQUENCEtree = 15 - final val ALTERNATIVEtree = 16 - final val STARtree = 17 - final val BINDtree = 18 - final val UNAPPLYtree = 19 - final val ARRAYVALUEtree = 20 - final val FUNCTIONtree = 21 - final val ASSIGNtree = 22 - final val IFtree = 23 - final val MATCHtree = 24 - final val RETURNtree = 25 - final val TREtree = 26 - final val THROWtree = 27 - final val NEWtree = 28 - final val TYPEDtree = 29 - final val TYPEAPPLYtree = 30 - final val APPLYtree = 31 - final val APPLYDYNAMICtree = 32 - final val SUPERtree = 33 - final val THIStree = 34 - final val SELECTtree = 35 - final val IDENTtree = 36 - final val LITERALtree = 37 - final val TYPEtree = 38 - final val ANNOTATEDtree = 39 - final val SINGLETONTYPEtree = 40 - final val SELECTFROMTYPEtree = 41 - final val COMPOUNDTYPEtree = 42 - final val APPLIEDTYPEtree = 43 - final val TYPEBOUNDStree = 44 - final val EXISTENTIALTYPEtree = 45 + // inline val SEQUENCEtree = 15 + inline val ALTERNATIVEtree = 16 + inline val STARtree = 17 + inline val BINDtree = 18 + inline val UNAPPLYtree = 19 + inline val ARRAYVALUEtree = 20 + inline val FUNCTIONtree = 21 + inline val ASSIGNtree = 22 + inline val IFtree = 23 + inline val MATCHtree = 24 + inline val RETURNtree = 25 + inline val TREtree = 26 + inline val THROWtree = 27 + inline val NEWtree = 28 + inline val TYPEDtree = 29 + inline val TYPEAPPLYtree = 30 + inline val APPLYtree = 31 + inline val APPLYDYNAMICtree = 32 + inline val SUPERtree = 33 + inline val THIStree = 34 + inline val SELECTtree = 35 + inline val IDENTtree = 36 + inline val LITERALtree = 37 + inline val TYPEtree = 38 + inline val ANNOTATEDtree = 39 + inline val SINGLETONTYPEtree = 40 + inline val SELECTFROMTYPEtree = 41 + inline val COMPOUNDTYPEtree = 42 + inline val APPLIEDTYPEtree = 43 + inline val TYPEBOUNDStree = 44 + inline val EXISTENTIALTYPEtree = 45 - final val MODIFIERS = 50 + inline val MODIFIERS = 50 - final val firstSymTag = NONEsym - final val lastSymTag = VALsym - final val lastExtSymTag = EXTMODCLASSref + inline val firstSymTag = NONEsym + inline val lastSymTag = VALsym + inline val lastExtSymTag = EXTMODCLASSref } //The following two are no longer accurate, because ANNOTATEDtpe, //SUPERtpe, ... are not in the same range as the other types - //final val firstTypeTag = NOtpe - //final val lastTypeTag = POLYtpe + //inline val firstTypeTag = NOtpe + //inline val lastTypeTag = POLYtpe diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Flags.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Flags.scala index 5749706270c9..6cf08b3384d9 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Flags.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Flags.scala @@ -12,96 +12,96 @@ package unpickleScala2 /** Scala2 flags, adapted from https://github.com/scala/scala/blob/2.11.x/src/reflect/scala/reflect/internal/Flags.scala */ object Scala2Flags { - final val IMPLICIT = 1 << 9 - final val FINAL = 1 << 5 // May not be overridden. Note that java final implies much more than scala final. - final val PRIVATE = 1 << 2 - final val PROTECTED = 1 << 0 + inline val IMPLICIT = 1 << 9 + inline val FINAL = 1 << 5 // May not be overridden. Note that java final implies much more than scala final. + inline val PRIVATE = 1 << 2 + inline val PROTECTED = 1 << 0 - final val SEALED = 1 << 10 - final val OVERRIDE = 1 << 1 - final val CASE = 1 << 11 - final val ABSTRACT = 1 << 3 // abstract class, or used in conjunction with abstract override. + inline val SEALED = 1 << 10 + inline val OVERRIDE = 1 << 1 + inline val CASE = 1 << 11 + inline val ABSTRACT = 1 << 3 // abstract class, or used in conjunction with abstract override. // Note difference to DEFERRED! - final val DEFERRED = 1 << 4 // was `abstract' for members | trait is virtual - final val INTERFACE = 1 << 7 // symbol is an interface (i.e. a trait which defines only abstract methods) - final val MUTABLE = 1 << 12 // symbol is a mutable variable. - final val PARAM = 1 << 13 // symbol is a (value or type) parameter to a method - final val MACRO = 1 << 15 // symbol is a macro definition + inline val DEFERRED = 1 << 4 // was `abstract' for members | trait is virtual + inline val INTERFACE = 1 << 7 // symbol is an interface (i.e. a trait which defines only abstract methods) + inline val MUTABLE = 1 << 12 // symbol is a mutable variable. + inline val PARAM = 1 << 13 // symbol is a (value or type) parameter to a method + inline val MACRO = 1 << 15 // symbol is a macro definition - final val COVARIANT = 1 << 16 // symbol is a covariant type variable - final val BYNAMEPARAM = 1 << 16 // parameter is by name - final val CONTRAVARIANT = 1 << 17 // symbol is a contravariant type variable - final val ABSOVERRIDE = 1 << 18 // combination of abstract & override - final val LOCAL = 1 << 19 // symbol is local to current class (i.e. private[this] or protected + inline val COVARIANT = 1 << 16 // symbol is a covariant type variable + inline val BYNAMEPARAM = 1 << 16 // parameter is by name + inline val CONTRAVARIANT = 1 << 17 // symbol is a contravariant type variable + inline val ABSOVERRIDE = 1 << 18 // combination of abstract & override + inline val LOCAL = 1 << 19 // symbol is local to current class (i.e. private[this] or protected // pre: PRIVATE or PROTECTED are also set - final val JAVA = 1 << 20 // symbol was defined by a Java class - final val STATIC = 1 << 23 // static field, method or class - final val CASEACCESSOR = 1 << 24 // symbol is a case parameter (or its accessor, or a GADT skolem) - final val TRAIT = 1 << 25 // symbol is a trait - final val DEFAULTPARAM = 1 << 25 // the parameter has a default value - final val PARAMACCESSOR = 1 << 29 // for field definitions generated for primary constructor + inline val JAVA = 1 << 20 // symbol was defined by a Java class + inline val STATIC = 1 << 23 // static field, method or class + inline val CASEACCESSOR = 1 << 24 // symbol is a case parameter (or its accessor, or a GADT skolem) + inline val TRAIT = 1 << 25 // symbol is a trait + inline val DEFAULTPARAM = 1 << 25 // the parameter has a default value + inline val PARAMACCESSOR = 1 << 29 // for field definitions generated for primary constructor // parameters (no matter if it's a 'val' parameter or not) // for parameters of a primary constructor ('val' or not) // for the accessor methods generated for 'val' or 'var' parameters - final val LAZY = 1L << 31 // symbol is a lazy val. can't have MUTABLE unless transformed by typer - final val PRESUPER = 1L << 37 // value is evaluated before super call - final val DEFAULTINIT = 1L << 41 // symbol is initialized to the default value: used by -Xcheckinit - final val ARTIFACT = 1L << 46 // symbol should be ignored when typechecking; will be marked ACC_SYNTHETIC in bytecode + inline val LAZY = 1L << 31 // symbol is a lazy val. can't have MUTABLE unless transformed by typer + inline val PRESUPER = 1L << 37 // value is evaluated before super call + inline val DEFAULTINIT = 1L << 41 // symbol is initialized to the default value: used by -Xcheckinit + inline val ARTIFACT = 1L << 46 // symbol should be ignored when typechecking; will be marked ACC_SYNTHETIC in bytecode // to see which symbols are marked as ARTIFACT, see scaladocs for FlagValues.ARTIFACT - final val DEFAULTMETHOD = 1L << 47 // symbol is a java default method - final val ENUM = 1L << 48 // symbol is an enum + inline val DEFAULTMETHOD = 1L << 47 // symbol is a java default method + inline val ENUM = 1L << 48 // symbol is an enum - final val PrivateLocal = PRIVATE | LOCAL - final val ProtectedLocal = PROTECTED | LOCAL - final val AccessFlags = PRIVATE | PROTECTED | LOCAL + inline val PrivateLocal = PRIVATE | LOCAL + inline val ProtectedLocal = PROTECTED | LOCAL + inline val AccessFlags = PRIVATE | PROTECTED | LOCAL - final val METHOD = 1 << 6 // a method - final val MODULE = 1 << 8 // symbol is module or class implementing a module - final val PACKAGE = 1 << 14 // symbol is a java package + inline val METHOD = 1 << 6 // a method + inline val MODULE = 1 << 8 // symbol is module or class implementing a module + inline val PACKAGE = 1 << 14 // symbol is a java package - final val CAPTURED = 1 << 16 // variable is accessed from nested function. Set by LambdaLift. - final val LABEL = 1 << 17 // method symbol is a label. Set by TailCall - final val INCONSTRUCTOR = 1 << 17 // class symbol is defined in this/superclass constructor. - final val SYNTHETIC = 1 << 21 // symbol is compiler-generated (compare with ARTIFACT) - final val STABLE = 1 << 22 // functions that are assumed to be stable + inline val CAPTURED = 1 << 16 // variable is accessed from nested function. Set by LambdaLift. + inline val LABEL = 1 << 17 // method symbol is a label. Set by TailCall + inline val INCONSTRUCTOR = 1 << 17 // class symbol is defined in this/superclass constructor. + inline val SYNTHETIC = 1 << 21 // symbol is compiler-generated (compare with ARTIFACT) + inline val STABLE = 1 << 22 // functions that are assumed to be stable // (typically, access methods for valdefs) // or classes that do not contain abstract types. - final val BRIDGE = 1 << 26 // function is a bridge method. Set by Erasure - final val ACCESSOR = 1 << 27 // a value or variable accessor (getter or setter) + inline val BRIDGE = 1 << 26 // function is a bridge method. Set by Erasure + inline val ACCESSOR = 1 << 27 // a value or variable accessor (getter or setter) - final val SUPERACCESSOR = 1 << 28 // a super accessor - final val MODULEVAR = 1 << 30 // for variables: is the variable caching a module value + inline val SUPERACCESSOR = 1 << 28 // a super accessor + inline val MODULEVAR = 1 << 30 // for variables: is the variable caching a module value - final val IS_ERROR = 1L << 32 // symbol is an error symbol - final val OVERLOADED = 1L << 33 // symbol is overloaded - final val LIFTED = 1L << 34 // class has been lifted out to package level + inline val IS_ERROR = 1L << 32 // symbol is an error symbol + inline val OVERLOADED = 1L << 33 // symbol is overloaded + inline val LIFTED = 1L << 34 // class has been lifted out to package level // local value has been lifted out to class level // todo: make LIFTED = latePRIVATE? - final val MIXEDIN = 1L << 35 // term member has been mixed in - final val EXISTENTIAL = 1L << 35 // type is an existential parameter or skolem - final val EXPANDEDNAME = 1L << 36 // name has been expanded with class suffix - final val TRANS_FLAG = 1L << 38 // transient flag guaranteed to be reset after each phase. + inline val MIXEDIN = 1L << 35 // term member has been mixed in + inline val EXISTENTIAL = 1L << 35 // type is an existential parameter or skolem + inline val EXPANDEDNAME = 1L << 36 // name has been expanded with class suffix + inline val TRANS_FLAG = 1L << 38 // transient flag guaranteed to be reset after each phase. - final val LOCKED = 1L << 39 // temporary flag to catch cyclic dependencies - final val SPECIALIZED = 1L << 40 // symbol is a generated specialized member - final val VBRIDGE = 1L << 42 // symbol is a varargs bridge + inline val LOCKED = 1L << 39 // temporary flag to catch cyclic dependencies + inline val SPECIALIZED = 1L << 40 // symbol is a generated specialized member + inline val VBRIDGE = 1L << 42 // symbol is a varargs bridge - final val VARARGS = 1L << 43 // symbol is a Java-style varargs method - final val TRIEDCOOKING = 1L << 44 // `Cooking` has been tried on this symbol + inline val VARARGS = 1L << 43 // symbol is a Java-style varargs method + inline val TRIEDCOOKING = 1L << 44 // `Cooking` has been tried on this symbol // A Java method's type is `cooked` by transforming raw types to existentials - final val SYNCHRONIZED = 1L << 45 // symbol is a method which should be marked ACC_SYNCHRONIZED + inline val SYNCHRONIZED = 1L << 45 // symbol is a method which should be marked ACC_SYNCHRONIZED - final val IMPLICIT_PKL = (1 << 0) - final val FINAL_PKL = (1 << 1) - final val PRIVATE_PKL = (1 << 2) - final val PROTECTED_PKL = (1 << 3) - final val SEALED_PKL = (1 << 4) - final val OVERRIDE_PKL = (1 << 5) - final val CASE_PKL = (1 << 6) - final val ABSTRACT_PKL = (1 << 7) - final val DEFERRED_PKL = (1 << 8) - final val METHOD_PKL = (1 << 9) - final val MODULE_PKL = (1 << 10) - final val INTERFACE_PKL = (1 << 11) + inline val IMPLICIT_PKL = (1 << 0) + inline val FINAL_PKL = (1 << 1) + inline val PRIVATE_PKL = (1 << 2) + inline val PROTECTED_PKL = (1 << 3) + inline val SEALED_PKL = (1 << 4) + inline val OVERRIDE_PKL = (1 << 5) + inline val CASE_PKL = (1 << 6) + inline val ABSTRACT_PKL = (1 << 7) + inline val DEFERRED_PKL = (1 << 8) + inline val METHOD_PKL = (1 << 9) + inline val MODULE_PKL = (1 << 10) + inline val INTERFACE_PKL = (1 << 11) } diff --git a/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala b/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala index 5c333f8646e5..3e73b6d95adb 100644 --- a/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala +++ b/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala @@ -5,7 +5,7 @@ package parsing import collection.immutable.BitSet object JavaTokens extends TokensCommon { - final val minToken = EMPTY + inline val minToken = EMPTY final def maxToken: Int = DOUBLE final val javaOnlyKeywords: TokenSet = tokenRange(INSTANCEOF, ASSERT) @@ -15,78 +15,78 @@ object JavaTokens extends TokensCommon { final val keywords: BitSet = sharedKeywords | javaOnlyKeywords | primTypes /** keywords */ - final val INSTANCEOF = 101; enter(INSTANCEOF, "instanceof") - final val CONST = 102; enter(CONST, "const") + inline val INSTANCEOF = 101; enter(INSTANCEOF, "instanceof") + inline val CONST = 102; enter(CONST, "const") /** templates */ - final val INTERFACE = 105; enter(INTERFACE, "interface") - final val ENUM = 106; enter(ENUM, "enum") - final val IMPLEMENTS = 107; enter(IMPLEMENTS, "implements") + inline val INTERFACE = 105; enter(INTERFACE, "interface") + inline val ENUM = 106; enter(ENUM, "enum") + inline val IMPLEMENTS = 107; enter(IMPLEMENTS, "implements") /** modifiers */ - final val PUBLIC = 110; enter(PUBLIC, "public") - final val DEFAULT = 111; enter(DEFAULT, "default") - final val STATIC = 112; enter(STATIC, "static") - final val TRANSIENT = 113; enter(TRANSIENT, "transient") - final val VOLATILE = 114; enter(VOLATILE, "volatile") - final val SYNCHRONIZED = 115; enter(SYNCHRONIZED, "synchronized") - final val NATIVE = 116; enter(NATIVE, "native") - final val STRICTFP = 117; enter(STRICTFP, "strictfp") - final val THROWS = 118; enter(THROWS, "throws") + inline val PUBLIC = 110; enter(PUBLIC, "public") + inline val DEFAULT = 111; enter(DEFAULT, "default") + inline val STATIC = 112; enter(STATIC, "static") + inline val TRANSIENT = 113; enter(TRANSIENT, "transient") + inline val VOLATILE = 114; enter(VOLATILE, "volatile") + inline val SYNCHRONIZED = 115; enter(SYNCHRONIZED, "synchronized") + inline val NATIVE = 116; enter(NATIVE, "native") + inline val STRICTFP = 117; enter(STRICTFP, "strictfp") + inline val THROWS = 118; enter(THROWS, "throws") /** control structures */ - final val BREAK = 130; enter(BREAK, "break") - final val CONTINUE = 131; enter(CONTINUE, "continue") - final val GOTO = 132; enter(GOTO, "goto") - final val SWITCH = 133; enter(SWITCH, "switch") - final val ASSERT = 134; enter(ASSERT, "assert") + inline val BREAK = 130; enter(BREAK, "break") + inline val CONTINUE = 131; enter(CONTINUE, "continue") + inline val GOTO = 132; enter(GOTO, "goto") + inline val SWITCH = 133; enter(SWITCH, "switch") + inline val ASSERT = 134; enter(ASSERT, "assert") /** special symbols */ - final val EQEQ = 140 - final val BANGEQ = 141 - final val LT = 142 - final val GT = 143 - final val LTEQ = 144 - final val GTEQ = 145 - final val BANG = 146 - final val QMARK = 147 - final val AMP = 148 - final val BAR = 149 - final val PLUS = 150 - final val MINUS = 151 - final val ASTERISK = 152 - final val SLASH = 153 - final val PERCENT = 154 - final val HAT = 155 - final val LTLT = 156 - final val GTGT = 157 - final val GTGTGT = 158 - final val AMPAMP = 159 - final val BARBAR = 160 - final val PLUSPLUS = 161 - final val MINUSMINUS = 162 - final val TILDE = 163 - final val DOTDOTDOT = 164 - final val AMPEQ = 165 - final val BAREQ = 166 - final val PLUSEQ = 167 - final val MINUSEQ = 168 - final val ASTERISKEQ = 169 - final val SLASHEQ = 170 - final val PERCENTEQ = 171 - final val HATEQ = 172 - final val LTLTEQ = 173 - final val GTGTEQ = 174 - final val GTGTGTEQ = 175 + inline val EQEQ = 140 + inline val BANGEQ = 141 + inline val LT = 142 + inline val GT = 143 + inline val LTEQ = 144 + inline val GTEQ = 145 + inline val BANG = 146 + inline val QMARK = 147 + inline val AMP = 148 + inline val BAR = 149 + inline val PLUS = 150 + inline val MINUS = 151 + inline val ASTERISK = 152 + inline val SLASH = 153 + inline val PERCENT = 154 + inline val HAT = 155 + inline val LTLT = 156 + inline val GTGT = 157 + inline val GTGTGT = 158 + inline val AMPAMP = 159 + inline val BARBAR = 160 + inline val PLUSPLUS = 161 + inline val MINUSMINUS = 162 + inline val TILDE = 163 + inline val DOTDOTDOT = 164 + inline val AMPEQ = 165 + inline val BAREQ = 166 + inline val PLUSEQ = 167 + inline val MINUSEQ = 168 + inline val ASTERISKEQ = 169 + inline val SLASHEQ = 170 + inline val PERCENTEQ = 171 + inline val HATEQ = 172 + inline val LTLTEQ = 173 + inline val GTGTEQ = 174 + inline val GTGTGTEQ = 175 /** primitive types */ - final val VOID = 180; enter(VOID, "void") - final val BOOLEAN = 181; enter(BOOLEAN, "boolean") - final val BYTE = 182; enter(BYTE, "byte") - final val SHORT = 183; enter(SHORT, "short") - final val CHAR = 184; enter(CHAR, "char") - final val INT = 185; enter(INT, "int") - final val LONG = 186; enter(LONG, "long") - final val FLOAT = 187; enter(FLOAT, "float") - final val DOUBLE = 188; enter(DOUBLE, "double") + inline val VOID = 180; enter(VOID, "void") + inline val BOOLEAN = 181; enter(BOOLEAN, "boolean") + inline val BYTE = 182; enter(BYTE, "byte") + inline val SHORT = 183; enter(SHORT, "short") + inline val CHAR = 184; enter(CHAR, "char") + inline val INT = 185; enter(INT, "int") + inline val LONG = 186; enter(LONG, "long") + inline val FLOAT = 187; enter(FLOAT, "float") + inline val DOUBLE = 188; enter(DOUBLE, "double") } diff --git a/compiler/src/dotty/tools/dotc/parsing/Tokens.scala b/compiler/src/dotty/tools/dotc/parsing/Tokens.scala index cba07a6e5a34..55f428cef5a4 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Tokens.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Tokens.scala @@ -30,107 +30,107 @@ abstract class TokensCommon { } /** special tokens */ - final val EMPTY = 0; enter(EMPTY, "") // a missing token, used in lookahead - final val ERROR = 1; enter(ERROR, "erroneous token") // an erroneous token - final val EOF = 2; enter(EOF, "eof") + inline val EMPTY = 0; enter(EMPTY, "") // a missing token, used in lookahead + inline val ERROR = 1; enter(ERROR, "erroneous token") // an erroneous token + inline val EOF = 2; enter(EOF, "eof") /** literals */ - final val CHARLIT = 3; enter(CHARLIT, "character literal") - final val INTLIT = 4; enter(INTLIT, "integer literal") - final val DECILIT = 5; enter(DECILIT, "number literal") // with decimal point - final val EXPOLIT = 6; enter(EXPOLIT, "number literal with exponent") - final val LONGLIT = 7; enter(LONGLIT, "long literal") - final val FLOATLIT = 8; enter(FLOATLIT, "float literal") - final val DOUBLELIT = 9; enter(DOUBLELIT, "double literal") - final val STRINGLIT = 10; enter(STRINGLIT, "string literal") - final val STRINGPART = 11; enter(STRINGPART, "string literal", "string literal part") - //final val INTERPOLATIONID = 12; enter(INTERPOLATIONID, "string interpolator") - //final val QUOTEID = 13; enter(QUOTEID, "quoted identifier") // TODO: deprecate + inline val CHARLIT = 3; enter(CHARLIT, "character literal") + inline val INTLIT = 4; enter(INTLIT, "integer literal") + inline val DECILIT = 5; enter(DECILIT, "number literal") // with decimal point + inline val EXPOLIT = 6; enter(EXPOLIT, "number literal with exponent") + inline val LONGLIT = 7; enter(LONGLIT, "long literal") + inline val FLOATLIT = 8; enter(FLOATLIT, "float literal") + inline val DOUBLELIT = 9; enter(DOUBLELIT, "double literal") + inline val STRINGLIT = 10; enter(STRINGLIT, "string literal") + inline val STRINGPART = 11; enter(STRINGPART, "string literal", "string literal part") + //inline val INTERPOLATIONID = 12; enter(INTERPOLATIONID, "string interpolator") + //inline val QUOTEID = 13; enter(QUOTEID, "quoted identifier") // TODO: deprecate /** identifiers */ - final val IDENTIFIER = 14; enter(IDENTIFIER, "identifier") - //final val BACKQUOTED_IDENT = 15; enter(BACKQUOTED_IDENT, "identifier", "backquoted ident") + inline val IDENTIFIER = 14; enter(IDENTIFIER, "identifier") + //inline val BACKQUOTED_IDENT = 15; enter(BACKQUOTED_IDENT, "identifier", "backquoted ident") /** alphabetic keywords */ - final val IF = 20; enter(IF, "if") - final val FOR = 21; enter(FOR, "for") - final val ELSE = 22; enter(ELSE, "else") - final val THIS = 23; enter(THIS, "this") - final val NULL = 24; enter(NULL, "null") - final val NEW = 25; enter(NEW, "new") - //final val WITH = 26; enter(WITH, "with") - final val SUPER = 27; enter(SUPER, "super") - //final val CASE = 28; enter(CASE, "case") - //final val CASECLASS = 29; enter(CASECLASS, "case class") - //final val CASEOBJECT = 30; enter(CASEOBJECT, "case object") - //final val VAL = 31; enter(VAL, "val") - final val ABSTRACT = 32; enter(ABSTRACT, "abstract") - final val FINAL = 33; enter(FINAL, "final") - final val PRIVATE = 34; enter(PRIVATE, "private") - final val PROTECTED = 35; enter(PROTECTED, "protected") - final val OVERRIDE = 36; enter(OVERRIDE, "override") - //final val IMPLICIT = 37; enter(IMPLICIT, "implicit") - //final val VAR = 38; enter(VAR, "var") - //final val DEF = 39; enter(DEF, "def") - //final val TYPE = 40; enter(TYPE, "type") - final val EXTENDS = 41; enter(EXTENDS, "extends") - final val TRUE = 42; enter(TRUE, "true") - final val FALSE = 43; enter(FALSE, "false") - //final val OBJECT = 44; enter(OBJECT, "object") - final val CLASS = 45; enter(CLASS, "class") - final val IMPORT = 46; enter(IMPORT, "import") - final val PACKAGE = 47; enter(PACKAGE, "package") - //final val YIELD = 48; enter(YIELD, "yield") - final val DO = 49; enter(DO, "do") - //final val TRAIT = 50; enter(TRAIT, "trait") - //final val SEALED = 51; enter(SEALED, "sealed") - final val THROW = 52; enter(THROW, "throw") - final val TRY = 53; enter(TRY, "try") - final val CATCH = 54; enter(CATCH, "catch") - final val FINALLY = 55; enter(FINALLY, "finally") - final val WHILE = 56; enter(WHILE, "while") - final val RETURN = 57; enter(RETURN, "return") - //final val MATCH = 58; enter(MATCH, "match") - //final val LAZY = 59; enter(LAZY, "lazy") - //final val THEN = 60; enter(THEN, "then") - //final val FORSOME = 61; enter(FORSOME, "forSome") // TODO: deprecate - //final val ENUM = 62; enter(ENUM, "enum") + inline val IF = 20; enter(IF, "if") + inline val FOR = 21; enter(FOR, "for") + inline val ELSE = 22; enter(ELSE, "else") + inline val THIS = 23; enter(THIS, "this") + inline val NULL = 24; enter(NULL, "null") + inline val NEW = 25; enter(NEW, "new") + //inline val WITH = 26; enter(WITH, "with") + inline val SUPER = 27; enter(SUPER, "super") + //inline val CASE = 28; enter(CASE, "case") + //inline val CASECLASS = 29; enter(CASECLASS, "case class") + //inline val CASEOBJECT = 30; enter(CASEOBJECT, "case object") + //inline val VAL = 31; enter(VAL, "val") + inline val ABSTRACT = 32; enter(ABSTRACT, "abstract") + inline val FINAL = 33; enter(FINAL, "final") + inline val PRIVATE = 34; enter(PRIVATE, "private") + inline val PROTECTED = 35; enter(PROTECTED, "protected") + inline val OVERRIDE = 36; enter(OVERRIDE, "override") + //inline val IMPLICIT = 37; enter(IMPLICIT, "implicit") + //inline val VAR = 38; enter(VAR, "var") + //inline val DEF = 39; enter(DEF, "def") + //inline val TYPE = 40; enter(TYPE, "type") + inline val EXTENDS = 41; enter(EXTENDS, "extends") + inline val TRUE = 42; enter(TRUE, "true") + inline val FALSE = 43; enter(FALSE, "false") + //inline val OBJECT = 44; enter(OBJECT, "object") + inline val CLASS = 45; enter(CLASS, "class") + inline val IMPORT = 46; enter(IMPORT, "import") + inline val PACKAGE = 47; enter(PACKAGE, "package") + //inline val YIELD = 48; enter(YIELD, "yield") + inline val DO = 49; enter(DO, "do") + //inline val TRAIT = 50; enter(TRAIT, "trait") + //inline val SEALED = 51; enter(SEALED, "sealed") + inline val THROW = 52; enter(THROW, "throw") + inline val TRY = 53; enter(TRY, "try") + inline val CATCH = 54; enter(CATCH, "catch") + inline val FINALLY = 55; enter(FINALLY, "finally") + inline val WHILE = 56; enter(WHILE, "while") + inline val RETURN = 57; enter(RETURN, "return") + //inline val MATCH = 58; enter(MATCH, "match") + //inline val LAZY = 59; enter(LAZY, "lazy") + //inline val THEN = 60; enter(THEN, "then") + //inline val FORSOME = 61; enter(FORSOME, "forSome") // TODO: deprecate + //inline val ENUM = 62; enter(ENUM, "enum") /** special symbols */ - final val COMMA = 70; enter(COMMA, "','") - final val SEMI = 71; enter(SEMI, "';'") - final val DOT = 72; enter(DOT, "'.'") - //final val NEWLINE = 78; enter(NEWLINE, "end of statement", "new line") - //final val NEWLINES = 79; enter(NEWLINES, "end of statement", "new lines") + inline val COMMA = 70; enter(COMMA, "','") + inline val SEMI = 71; enter(SEMI, "';'") + inline val DOT = 72; enter(DOT, "'.'") + //inline val NEWLINE = 78; enter(NEWLINE, "end of statement", "new line") + //inline val NEWLINES = 79; enter(NEWLINES, "end of statement", "new lines") /** special keywords */ - //final val USCORE = 73; enter(USCORE, "_") - final val COLON = 74; enter(COLON, ":") - final val EQUALS = 75; enter(EQUALS, "=") - //final val LARROW = 76; enter(LARROW, "<-") - //final val ARROW = 77; enter(ARROW, "=>") - //final val SUBTYPE = 80; enter(SUBTYPE, "<:") - //final val SUPERTYPE = 81; enter(SUPERTYPE, ">:") - //final val HASH = 82; enter(HASH, "#") - final val AT = 83; enter(AT, "@") - //final val VIEWBOUND = 84; enter(VIEWBOUND, "<%") + //inline val USCORE = 73; enter(USCORE, "_") + inline val COLON = 74; enter(COLON, ":") + inline val EQUALS = 75; enter(EQUALS, "=") + //inline val LARROW = 76; enter(LARROW, "<-") + //inline val ARROW = 77; enter(ARROW, "=>") + //inline val SUBTYPE = 80; enter(SUBTYPE, "<:") + //inline val SUPERTYPE = 81; enter(SUPERTYPE, ">:") + //inline val HASH = 82; enter(HASH, "#") + inline val AT = 83; enter(AT, "@") + //inline val VIEWBOUND = 84; enter(VIEWBOUND, "<%") val keywords: TokenSet def isKeyword(token: Token): Boolean = keywords contains token /** parentheses */ - final val LPAREN = 91; enter(LPAREN, "'('") - final val RPAREN = 92; enter(RPAREN, "')'") - final val LBRACKET = 93; enter(LBRACKET, "'['") - final val RBRACKET = 94; enter(RBRACKET, "']'") - final val LBRACE = 95; enter(LBRACE, "'{'") - final val RBRACE = 96; enter(RBRACE, "'}'") - final val INDENT = 97; enter(INDENT, "indent") - final val OUTDENT = 98; enter(OUTDENT, "unindent") - - final val firstParen = LPAREN - final val lastParen = OUTDENT + inline val LPAREN = 91; enter(LPAREN, "'('") + inline val RPAREN = 92; enter(RPAREN, "')'") + inline val LBRACKET = 93; enter(LBRACKET, "'['") + inline val RBRACKET = 94; enter(RBRACKET, "']'") + inline val LBRACE = 95; enter(LBRACE, "'{'") + inline val RBRACE = 96; enter(RBRACE, "'}'") + inline val INDENT = 97; enter(INDENT, "indent") + inline val OUTDENT = 98; enter(OUTDENT, "unindent") + + inline val firstParen = LPAREN + inline val lastParen = OUTDENT def buildKeywordArray(keywords: TokenSet): (Int, Array[Int]) = { def start(tok: Token) = tokenString(tok).toTermName.asSimpleName.start @@ -148,13 +148,13 @@ abstract class TokensCommon { } object Tokens extends TokensCommon { - final val minToken = EMPTY + inline val minToken = EMPTY final def maxToken: Int = XMLSTART - final val INTERPOLATIONID = 12; enter(INTERPOLATIONID, "string interpolator") - final val QUOTEID = 13; enter(QUOTEID, "quoted identifier") // TODO: deprecate + inline val INTERPOLATIONID = 12; enter(INTERPOLATIONID, "string interpolator") + inline val QUOTEID = 13; enter(QUOTEID, "quoted identifier") // TODO: deprecate - final val BACKQUOTED_IDENT = 15; enter(BACKQUOTED_IDENT, "identifier", "backquoted ident") + inline val BACKQUOTED_IDENT = 15; enter(BACKQUOTED_IDENT, "identifier", "backquoted ident") final val identifierTokens: TokenSet = BitSet(IDENTIFIER, BACKQUOTED_IDENT) @@ -162,51 +162,51 @@ object Tokens extends TokensCommon { token >= IDENTIFIER && token <= BACKQUOTED_IDENT /** alphabetic keywords */ - final val WITH = 26; enter(WITH, "with") - final val CASE = 28; enter(CASE, "case") - final val CASECLASS = 29; enter(CASECLASS, "case class") - final val CASEOBJECT = 30; enter(CASEOBJECT, "case object") - final val VAL = 31; enter(VAL, "val") - final val IMPLICIT = 37; enter(IMPLICIT, "implicit") - final val VAR = 38; enter(VAR, "var") - final val DEF = 39; enter(DEF, "def") - final val TYPE = 40; enter(TYPE, "type") - final val OBJECT = 44; enter(OBJECT, "object") - final val YIELD = 48; enter(YIELD, "yield") - final val TRAIT = 50; enter(TRAIT, "trait") - final val SEALED = 51; enter(SEALED, "sealed") - final val MATCH = 58; enter(MATCH, "match") - final val LAZY = 59; enter(LAZY, "lazy") - final val THEN = 60; enter(THEN, "then") - final val FORSOME = 61; enter(FORSOME, "forSome") // TODO: deprecate - final val ENUM = 62; enter(ENUM, "enum") - final val GIVEN = 63; enter(GIVEN, "given") - final val EXPORT = 64; enter(EXPORT, "export") - final val MACRO = 65; enter(MACRO, "macro") // TODO: remove - final val END = 66; enter(END, "end") + inline val WITH = 26; enter(WITH, "with") + inline val CASE = 28; enter(CASE, "case") + inline val CASECLASS = 29; enter(CASECLASS, "case class") + inline val CASEOBJECT = 30; enter(CASEOBJECT, "case object") + inline val VAL = 31; enter(VAL, "val") + inline val IMPLICIT = 37; enter(IMPLICIT, "implicit") + inline val VAR = 38; enter(VAR, "var") + inline val DEF = 39; enter(DEF, "def") + inline val TYPE = 40; enter(TYPE, "type") + inline val OBJECT = 44; enter(OBJECT, "object") + inline val YIELD = 48; enter(YIELD, "yield") + inline val TRAIT = 50; enter(TRAIT, "trait") + inline val SEALED = 51; enter(SEALED, "sealed") + inline val MATCH = 58; enter(MATCH, "match") + inline val LAZY = 59; enter(LAZY, "lazy") + inline val THEN = 60; enter(THEN, "then") + inline val FORSOME = 61; enter(FORSOME, "forSome") // TODO: deprecate + inline val ENUM = 62; enter(ENUM, "enum") + inline val GIVEN = 63; enter(GIVEN, "given") + inline val EXPORT = 64; enter(EXPORT, "export") + inline val MACRO = 65; enter(MACRO, "macro") // TODO: remove + inline val END = 66; enter(END, "end") /** special symbols */ - final val NEWLINE = 78; enter(NEWLINE, "end of statement", "new line") - final val NEWLINES = 79; enter(NEWLINES, "end of statement", "new lines") + inline val NEWLINE = 78; enter(NEWLINE, "end of statement", "new line") + inline val NEWLINES = 79; enter(NEWLINES, "end of statement", "new lines") /** special keywords */ - final val USCORE = 73; enter(USCORE, "_") - final val LARROW = 76; enter(LARROW, "<-") - final val ARROW = 77; enter(ARROW, "=>") - final val SUBTYPE = 80; enter(SUBTYPE, "<:") - final val SUPERTYPE = 81; enter(SUPERTYPE, ">:") - final val HASH = 82; enter(HASH, "#") - final val VIEWBOUND = 84; enter(VIEWBOUND, "<%") - final val TLARROW = 85; enter(TLARROW, "=>>") - final val CTXARROW = 86; enter(CTXARROW, "?=>") + inline val USCORE = 73; enter(USCORE, "_") + inline val LARROW = 76; enter(LARROW, "<-") + inline val ARROW = 77; enter(ARROW, "=>") + inline val SUBTYPE = 80; enter(SUBTYPE, "<:") + inline val SUPERTYPE = 81; enter(SUPERTYPE, ">:") + inline val HASH = 82; enter(HASH, "#") + inline val VIEWBOUND = 84; enter(VIEWBOUND, "<%") + inline val TLARROW = 85; enter(TLARROW, "=>>") + inline val CTXARROW = 86; enter(CTXARROW, "?=>") - final val QUOTE = 87; enter(QUOTE, "'") + inline val QUOTE = 87; enter(QUOTE, "'") - final val COLONEOL = 88; enter(COLONEOL, ":", ": at eol") - final val SELFARROW = 89; enter(SELFARROW, "=>") // reclassified ARROW following self-type + inline val COLONEOL = 88; enter(COLONEOL, ":", ": at eol") + inline val SELFARROW = 89; enter(SELFARROW, "=>") // reclassified ARROW following self-type /** XML mode */ - final val XMLSTART = 99; enter(XMLSTART, "$XMLSTART$<") // TODO: deprecate + inline val XMLSTART = 99; enter(XMLSTART, "$XMLSTART$<") // TODO: deprecate final val alphaKeywords: TokenSet = tokenRange(IF, END) final val symbolicKeywords: TokenSet = tokenRange(USCORE, CTXARROW) diff --git a/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala b/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala index cce2c6d00859..623f540bd721 100644 --- a/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala +++ b/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala @@ -17,7 +17,7 @@ import java.util.Arrays object SyntaxHighlighting { /** if true, log erroneous positions being highlighted */ - private final val debug = true + private inline val debug = true // Keep in sync with SyntaxHighlightingTests val NoColor: String = Console.RESET diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala index 5a640c8f1d98..7546c1fd854d 100644 --- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -54,10 +54,10 @@ object PatternMatcher { val name: String = "patternMatcher" - final val selfCheck = false // debug option, if on we check that no case gets generated twice + inline val selfCheck = false // debug option, if on we check that no case gets generated twice /** Minimal number of cases to emit a switch */ - final val MinSwitchCases = 4 + inline val MinSwitchCases = 4 val TrustedTypeTestKey: Key[Unit] = new StickyKey[Unit] diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala b/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala index 6825ddcc1fef..57e5fc636ddc 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala @@ -26,9 +26,9 @@ import dotty.tools.backend.sjs.JSDefinitions.jsdefn /** Utilities for JS exports handling. */ object JSExportUtils { - private final val ExportPrefix = "$js$exported$" - private final val MethodExportPrefix = ExportPrefix + "meth$" - private final val PropExportPrefix = ExportPrefix + "prop$" + private inline val ExportPrefix = "$js$exported$" + private inline val MethodExportPrefix = ExportPrefix + "meth$" + private inline val PropExportPrefix = ExportPrefix + "prop$" /** Creates a name for an export specification. */ def makeExportName(jsName: String, isProp: Boolean): TermName = { diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index a3b0dd02714d..d7bf75f8bf73 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -66,10 +66,10 @@ object Implicits: } object Candidate { type Kind = Int - final val None = 0 - final val Value = 1 - final val Conversion = 2 - final val Extension = 4 + inline val None = 0 + inline val Value = 1 + inline val Conversion = 2 + inline val Extension = 4 } /** If `expected` is a selection prototype, does `tp` have an extension diff --git a/compiler/src/dotty/tools/dotc/util/Chars.scala b/compiler/src/dotty/tools/dotc/util/Chars.scala index 986b1fda58ec..4c54dc73459e 100644 --- a/compiler/src/dotty/tools/dotc/util/Chars.scala +++ b/compiler/src/dotty/tools/dotc/util/Chars.scala @@ -11,10 +11,10 @@ import java.lang.Character.UPPERCASE_LETTER /** Contains constants and classifier methods for characters */ object Chars { - final val LF = '\u000A' - final val FF = '\u000C' - final val CR = '\u000D' - final val SU = '\u001A' + inline val LF = '\u000A' + inline val FF = '\u000C' + inline val CR = '\u000D' + inline val SU = '\u001A' /** Convert a character digit to an Int according to given base, * -1 if no success diff --git a/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala b/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala index 16bd2decd908..4dd897dd082a 100644 --- a/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala +++ b/compiler/src/dotty/tools/dotc/util/ReusableInstance.scala @@ -27,7 +27,7 @@ final class ReusableInstance[T <: AnyRef] private (make: => T) { } object ReusableInstance { - private final val InitialSize = 4 + private inline val InitialSize = 4 def apply[T <: AnyRef](make: => T): ReusableInstance[T] = new ReusableInstance[T](make) } diff --git a/compiler/src/dotty/tools/dotc/util/SixteenNibbles.scala b/compiler/src/dotty/tools/dotc/util/SixteenNibbles.scala index ebeb9f700273..42286aef5d31 100644 --- a/compiler/src/dotty/tools/dotc/util/SixteenNibbles.scala +++ b/compiler/src/dotty/tools/dotc/util/SixteenNibbles.scala @@ -22,7 +22,7 @@ class SixteenNibbles(val bits: Long) extends AnyVal { } object SixteenNibbles { - final val Width = 4 - final val Mask = (1 << Width) - 1 + inline val Width = 4 + inline val Mask = (1 << Width) - 1 final val LongMask: Long = Mask.toLong } diff --git a/compiler/src/dotty/tools/dotc/util/Spans.scala b/compiler/src/dotty/tools/dotc/util/Spans.scala index f73f1da86ce5..0a28c367ff29 100644 --- a/compiler/src/dotty/tools/dotc/util/Spans.scala +++ b/compiler/src/dotty/tools/dotc/util/Spans.scala @@ -15,9 +15,9 @@ import language.implicitConversions */ object Spans { - private final val StartEndBits = 26 - private final val StartEndMask = (1L << StartEndBits) - 1 - private final val SyntheticPointDelta = (1 << (64 - StartEndBits * 2)) - 1 + private inline val StartEndBits = 26 + private inline val StartEndMask = (1L << StartEndBits) - 1 + private inline val SyntheticPointDelta = (1 << (64 - StartEndBits * 2)) - 1 /** The maximal representable offset in a span */ final val MaxOffset = StartEndMask.toInt diff --git a/compiler/src/dotty/tools/dotc/util/Stats.scala b/compiler/src/dotty/tools/dotc/util/Stats.scala index 2de6e6554e15..60465e519452 100644 --- a/compiler/src/dotty/tools/dotc/util/Stats.scala +++ b/compiler/src/dotty/tools/dotc/util/Stats.scala @@ -9,7 +9,7 @@ import collection.mutable @sharable object Stats { - final val enabled = false + inline val enabled = false var monitored: Boolean = false @@ -43,7 +43,7 @@ import collection.mutable else op } - final val GroupChar = '/' + inline val GroupChar = '/' /** Aggregate all counts of all keys with a common prefix, followed by `:` */ private def aggregate(): Unit = { From a50070f4d4e386046bd31a8ca2b6584745224a86 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sat, 6 Nov 2021 18:24:17 +0000 Subject: [PATCH 0848/1244] Fixes and improvements to trace logging The String.valueOf is because I somehow ended up with a null. Then I found some docs in the history of trace, as well as a mistake in a commit revert: using the non-StoreReporter logctx! I also added a "log" variant to "force", which is also default enabled but doesn't force the output to the standard out, meaning I can bootstrap the compiler without it taking forever to output all the trace output it generates while bootstrapping the compiler, bottlenecking on console IO)... Also, remove some dead code in Definitions. --- compiler/src/dotty/tools/dotc/core/Definitions.scala | 7 ------- .../src/dotty/tools/dotc/printing/Formatting.scala | 2 +- compiler/src/dotty/tools/dotc/reporting/trace.scala | 12 +++++++++++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index d6c713039190..c5be301df8d7 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -1370,13 +1370,6 @@ class Definitions { else if arity >= 0 then FunctionType(arity) else NoType - val predefClassNames: Set[Name] = - Set("Predef$", "DeprecatedPredef", "LowPriorityImplicits").map(_.toTypeName.unmangleClassName) - - /** Is `cls` the predef module class, or a class inherited by Predef? */ - def isPredefClass(cls: Symbol): Boolean = - (cls.owner eq ScalaPackageClass) && predefClassNames.contains(cls.name) - private val JavaImportFns: List[RootRef] = List( RootRef(() => JavaLangPackageVal.termRef) ) diff --git a/compiler/src/dotty/tools/dotc/printing/Formatting.scala b/compiler/src/dotty/tools/dotc/printing/Formatting.scala index be25469c549d..845283f69a0f 100644 --- a/compiler/src/dotty/tools/dotc/printing/Formatting.scala +++ b/compiler/src/dotty/tools/dotc/printing/Formatting.scala @@ -36,7 +36,7 @@ object Formatting { case _ => ex.getMessage s"[cannot display due to $msg, raw string = ${arg.toString}]" } - case _ => arg.toString + case _ => String.valueOf(arg) } private def treatArg(arg: Any, suffix: String)(using Context): (Any, String) = arg match { diff --git a/compiler/src/dotty/tools/dotc/reporting/trace.scala b/compiler/src/dotty/tools/dotc/reporting/trace.scala index 8e111950bacc..10179f9d3789 100644 --- a/compiler/src/dotty/tools/dotc/reporting/trace.scala +++ b/compiler/src/dotty/tools/dotc/reporting/trace.scala @@ -7,6 +7,12 @@ import config.Config import config.Printers import core.Mode +/** Exposes the {{{ trace("question") { op } }}} syntax. + * + * Traced operations will print indented messages if enabled. + * Tracing depends on [[Config.tracingEnabled]] and [[dotty.tools.dotc.config.ScalaSettings.Ylog]]. + * Tracing can be forced by replacing [[trace]] with [[trace.force]] or [[trace.log]] (see below). + */ object trace extends TraceSyntax: inline def isEnabled = Config.tracingEnabled protected val isForced = false @@ -14,6 +20,10 @@ object trace extends TraceSyntax: object force extends TraceSyntax: inline def isEnabled: true = true protected val isForced = true + + object log extends TraceSyntax: + inline def isEnabled: true = true + protected val isForced = false end trace /** This module is carefully optimized to give zero overhead if Config.tracingEnabled @@ -73,7 +83,7 @@ trait TraceSyntax: var logctx = ctx while logctx.reporter.isInstanceOf[StoreReporter] do logctx = logctx.outer def margin = ctx.base.indentTab * ctx.base.indent - def doLog(s: String) = if isForced then println(s) else report.log(s) + def doLog(s: String) = if isForced then println(s) else report.log(s)(using logctx) def finalize(msg: String) = if !finalized then ctx.base.indent -= 1 From 06edfc055c46b574d8e792894741aa7d1155fa1f Mon Sep 17 00:00:00 2001 From: soronpo Date: Thu, 26 Aug 2021 13:45:35 -0400 Subject: [PATCH 0849/1244] Adds compiletime.ops.{long, float, double}, adds other ops, and fixes termref type not being considered. fix check file more ops wip Added ops.float and ops.double --- .../dotty/tools/dotc/core/Definitions.scala | 35 ++- .../src/dotty/tools/dotc/core/StdNames.scala | 55 +++-- .../src/dotty/tools/dotc/core/Types.scala | 134 ++++++++++- library/src/scala/compiletime/ops/any.scala | 19 ++ .../src/scala/compiletime/ops/double.scala | 136 +++++++++++ library/src/scala/compiletime/ops/float.scala | 136 +++++++++++ library/src/scala/compiletime/ops/int.scala | 39 +++ library/src/scala/compiletime/ops/long.scala | 222 ++++++++++++++++++ .../src/scala/compiletime/ops/string.scala | 29 +++ tests/neg/singleton-ops-any.check | 14 ++ tests/neg/singleton-ops-any.scala | 20 ++ tests/neg/singleton-ops-double.scala | 77 ++++++ tests/neg/singleton-ops-float.scala | 77 ++++++ tests/neg/singleton-ops-int.scala | 22 +- tests/neg/singleton-ops-long.scala | 113 +++++++++ tests/neg/singleton-ops-string.scala | 10 + 16 files changed, 1099 insertions(+), 39 deletions(-) create mode 100644 library/src/scala/compiletime/ops/double.scala create mode 100644 library/src/scala/compiletime/ops/float.scala create mode 100644 library/src/scala/compiletime/ops/long.scala create mode 100644 tests/neg/singleton-ops-double.scala create mode 100644 tests/neg/singleton-ops-float.scala create mode 100644 tests/neg/singleton-ops-long.scala diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index c5be301df8d7..1ee40f5d1830 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -246,6 +246,9 @@ class Definitions { @tu lazy val CompiletimeOpsPackage: Symbol = requiredPackage("scala.compiletime.ops") @tu lazy val CompiletimeOpsAnyModuleClass: Symbol = requiredModule("scala.compiletime.ops.any").moduleClass @tu lazy val CompiletimeOpsIntModuleClass: Symbol = requiredModule("scala.compiletime.ops.int").moduleClass + @tu lazy val CompiletimeOpsLongModuleClass: Symbol = requiredModule("scala.compiletime.ops.long").moduleClass + @tu lazy val CompiletimeOpsFloatModuleClass: Symbol = requiredModule("scala.compiletime.ops.float").moduleClass + @tu lazy val CompiletimeOpsDoubleModuleClass: Symbol = requiredModule("scala.compiletime.ops.double").moduleClass @tu lazy val CompiletimeOpsStringModuleClass: Symbol = requiredModule("scala.compiletime.ops.string").moduleClass @tu lazy val CompiletimeOpsBooleanModuleClass: Symbol = requiredModule("scala.compiletime.ops.boolean").moduleClass @@ -1078,19 +1081,40 @@ class Definitions { final def isCompiletime_S(sym: Symbol)(using Context): Boolean = sym.name == tpnme.S && sym.owner == CompiletimeOpsIntModuleClass - private val compiletimePackageAnyTypes: Set[Name] = Set(tpnme.Equals, tpnme.NotEquals) - private val compiletimePackageIntTypes: Set[Name] = Set( + private val compiletimePackageAnyTypes: Set[Name] = Set( + tpnme.Equals, tpnme.NotEquals, tpnme.IsConst, tpnme.ToString + ) + private val compiletimePackageNumericTypes: Set[Name] = Set( tpnme.Plus, tpnme.Minus, tpnme.Times, tpnme.Div, tpnme.Mod, tpnme.Lt, tpnme.Gt, tpnme.Ge, tpnme.Le, - tpnme.Abs, tpnme.Negate, tpnme.Min, tpnme.Max, tpnme.ToString, + tpnme.Abs, tpnme.Negate, tpnme.Min, tpnme.Max + ) + private val compiletimePackageIntTypes: Set[Name] = compiletimePackageNumericTypes ++ Set[Name]( + tpnme.ToString, //ToString is moved to ops.any and deprecated for ops.int + tpnme.NumberOfLeadingZeros, tpnme.ToLong, tpnme.ToFloat, tpnme.ToDouble, + tpnme.Xor, tpnme.BitwiseAnd, tpnme.BitwiseOr, tpnme.ASR, tpnme.LSL, tpnme.LSR + ) + private val compiletimePackageLongTypes: Set[Name] = compiletimePackageNumericTypes ++ Set[Name]( + tpnme.NumberOfLeadingZeros, tpnme.ToInt, tpnme.ToFloat, tpnme.ToDouble, tpnme.Xor, tpnme.BitwiseAnd, tpnme.BitwiseOr, tpnme.ASR, tpnme.LSL, tpnme.LSR ) + private val compiletimePackageFloatTypes: Set[Name] = compiletimePackageNumericTypes ++ Set[Name]( + tpnme.ToInt, tpnme.ToLong, tpnme.ToDouble + ) + private val compiletimePackageDoubleTypes: Set[Name] = compiletimePackageNumericTypes ++ Set[Name]( + tpnme.ToInt, tpnme.ToLong, tpnme.ToFloat + ) private val compiletimePackageBooleanTypes: Set[Name] = Set(tpnme.Not, tpnme.Xor, tpnme.And, tpnme.Or) - private val compiletimePackageStringTypes: Set[Name] = Set(tpnme.Plus) + private val compiletimePackageStringTypes: Set[Name] = Set( + tpnme.Plus, tpnme.Length, tpnme.Substring, tpnme.Matches + ) private val compiletimePackageOpTypes: Set[Name] = Set(tpnme.S) ++ compiletimePackageAnyTypes ++ compiletimePackageIntTypes + ++ compiletimePackageLongTypes + ++ compiletimePackageFloatTypes + ++ compiletimePackageDoubleTypes ++ compiletimePackageBooleanTypes ++ compiletimePackageStringTypes @@ -1100,6 +1124,9 @@ class Definitions { isCompiletime_S(sym) || sym.owner == CompiletimeOpsAnyModuleClass && compiletimePackageAnyTypes.contains(sym.name) || sym.owner == CompiletimeOpsIntModuleClass && compiletimePackageIntTypes.contains(sym.name) + || sym.owner == CompiletimeOpsLongModuleClass && compiletimePackageLongTypes.contains(sym.name) + || sym.owner == CompiletimeOpsFloatModuleClass && compiletimePackageFloatTypes.contains(sym.name) + || sym.owner == CompiletimeOpsDoubleModuleClass && compiletimePackageDoubleTypes.contains(sym.name) || sym.owner == CompiletimeOpsBooleanModuleClass && compiletimePackageBooleanTypes.contains(sym.name) || sym.owner == CompiletimeOpsStringModuleClass && compiletimePackageStringTypes.contains(sym.name) ) diff --git a/compiler/src/dotty/tools/dotc/core/StdNames.scala b/compiler/src/dotty/tools/dotc/core/StdNames.scala index 349f80d11d8a..4988b81918df 100644 --- a/compiler/src/dotty/tools/dotc/core/StdNames.scala +++ b/compiler/src/dotty/tools/dotc/core/StdNames.scala @@ -211,29 +211,38 @@ object StdNames { final val IOOBException: N = "IndexOutOfBoundsException" final val FunctionXXL: N = "FunctionXXL" - final val Abs: N = "Abs" - final val And: N = "&&" - final val BitwiseAnd: N = "BitwiseAnd" - final val BitwiseOr: N = "BitwiseOr" - final val Div: N = "/" - final val Equals: N = "==" - final val Ge: N = ">=" - final val Gt: N = ">" - final val Le: N = "<=" - final val Lt: N = "<" - final val Max: N = "Max" - final val Min: N = "Min" - final val Minus: N = "-" - final val Mod: N = "%" - final val Negate: N = "Negate" - final val Not: N = "!" - final val NotEquals: N = "!=" - final val Or: N = "||" - final val Plus: N = "+" - final val S: N = "S" - final val Times: N = "*" - final val ToString: N = "ToString" - final val Xor: N = "^" + final val Abs: N = "Abs" + final val And: N = "&&" + final val BitwiseAnd: N = "BitwiseAnd" + final val BitwiseOr: N = "BitwiseOr" + final val Div: N = "/" + final val Equals: N = "==" + final val Ge: N = ">=" + final val Gt: N = ">" + final val IsConst: N = "IsConst" + final val Le: N = "<=" + final val Length: N = "Length" + final val Lt: N = "<" + final val Matches: N = "Matches" + final val Max: N = "Max" + final val Min: N = "Min" + final val Minus: N = "-" + final val Mod: N = "%" + final val Negate: N = "Negate" + final val Not: N = "!" + final val NotEquals: N = "!=" + final val NumberOfLeadingZeros: N = "NumberOfLeadingZeros" + final val Or: N = "||" + final val Plus: N = "+" + final val S: N = "S" + final val Substring: N = "Substring" + final val Times: N = "*" + final val ToInt: N = "ToInt" + final val ToLong: N = "ToLong" + final val ToFloat: N = "ToFloat" + final val ToDouble: N = "ToDouble" + final val ToString: N = "ToString" + final val Xor: N = "^" final val ClassfileAnnotation: N = "ClassfileAnnotation" final val ClassManifest: N = "ClassManifest" diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index b384cbdcb084..bb48f9c6ebc0 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4206,37 +4206,76 @@ object Types { def tryCompiletimeConstantFold(using Context): Type = tycon match { case tycon: TypeRef if defn.isCompiletimeAppliedType(tycon.symbol) => - def constValue(tp: Type): Option[Any] = tp.dealias match { + extension (tp : Type) def fixForEvaluation : Type = + tp.normalized.dealias match { + case tp : TermRef => tp.underlying + case tp => tp + } + + def constValue(tp: Type): Option[Any] = tp.fixForEvaluation match { case ConstantType(Constant(n)) => Some(n) case _ => None } - def boolValue(tp: Type): Option[Boolean] = tp.dealias match { + def boolValue(tp: Type): Option[Boolean] = tp.fixForEvaluation match { case ConstantType(Constant(n: Boolean)) => Some(n) case _ => None } - def intValue(tp: Type): Option[Int] = tp.dealias match { + def intValue(tp: Type): Option[Int] = tp.fixForEvaluation match { case ConstantType(Constant(n: Int)) => Some(n) case _ => None } - def stringValue(tp: Type): Option[String] = tp.dealias match { - case ConstantType(Constant(n: String)) => Some(n) + def longValue(tp: Type): Option[Long] = tp.fixForEvaluation match { + case ConstantType(Constant(n: Long)) => Some(n) + case _ => None + } + + def floatValue(tp: Type): Option[Float] = tp.fixForEvaluation match { + case ConstantType(Constant(n: Float)) => Some(n) + case _ => None + } + + def doubleValue(tp: Type): Option[Double] = tp.fixForEvaluation match { + case ConstantType(Constant(n: Double)) => Some(n) case _ => None } + def stringValue(tp: Type): Option[String] = tp.fixForEvaluation match { + case ConstantType(Constant(n: String)) => Some(n) + case _ => None + } + def isConst : Option[Type] = args.head.fixForEvaluation match { + case ConstantType(_) => Some(ConstantType(Constant(true))) + case _ => Some(ConstantType(Constant(false))) + } def natValue(tp: Type): Option[Int] = intValue(tp).filter(n => n >= 0 && n < Int.MaxValue) def constantFold1[T](extractor: Type => Option[T], op: T => Any): Option[Type] = - extractor(args.head.normalized).map(a => ConstantType(Constant(op(a)))) + extractor(args.head).map(a => ConstantType(Constant(op(a)))) def constantFold2[T](extractor: Type => Option[T], op: (T, T) => Any): Option[Type] = + constantFold2AB(extractor, extractor, op) + + def constantFold2AB[TA, TB](extractorA: Type => Option[TA], extractorB: Type => Option[TB], op: (TA, TB) => Any): Option[Type] = for { - a <- extractor(args.head.normalized) - b <- extractor(args.tail.head.normalized) + a <- extractorA(args.head) + b <- extractorB(args.last) } yield ConstantType(Constant(op(a, b))) + def constantFold3[TA, TB, TC]( + extractorA: Type => Option[TA], + extractorB: Type => Option[TB], + extractorC: Type => Option[TC], + op: (TA, TB, TC) => Any + ): Option[Type] = + for { + a <- extractorA(args.head) + b <- extractorB(args(1)) + c <- extractorC(args.last) + } yield ConstantType(Constant(op(a, b, c))) + trace(i"compiletime constant fold $this", typr, show = true) { val name = tycon.symbol.name val owner = tycon.symbol.owner @@ -4248,10 +4287,13 @@ object Types { } else if (owner == defn.CompiletimeOpsAnyModuleClass) name match { case tpnme.Equals if nArgs == 2 => constantFold2(constValue, _ == _) case tpnme.NotEquals if nArgs == 2 => constantFold2(constValue, _ != _) + case tpnme.ToString if nArgs == 1 => constantFold1(constValue, _.toString) + case tpnme.IsConst if nArgs == 1 => isConst case _ => None } else if (owner == defn.CompiletimeOpsIntModuleClass) name match { case tpnme.Abs if nArgs == 1 => constantFold1(intValue, _.abs) case tpnme.Negate if nArgs == 1 => constantFold1(intValue, x => -x) + //ToString is deprecated for ops.int, and moved to ops.any case tpnme.ToString if nArgs == 1 => constantFold1(intValue, _.toString) case tpnme.Plus if nArgs == 2 => constantFold2(intValue, _ + _) case tpnme.Minus if nArgs == 2 => constantFold2(intValue, _ - _) @@ -4276,9 +4318,85 @@ object Types { case tpnme.LSR if nArgs == 2 => constantFold2(intValue, _ >>> _) case tpnme.Min if nArgs == 2 => constantFold2(intValue, _ min _) case tpnme.Max if nArgs == 2 => constantFold2(intValue, _ max _) + case tpnme.NumberOfLeadingZeros if nArgs == 1 => constantFold1(intValue, Integer.numberOfLeadingZeros(_)) + case tpnme.ToLong if nArgs == 1 => constantFold1(intValue, _.toLong) + case tpnme.ToFloat if nArgs == 1 => constantFold1(intValue, _.toFloat) + case tpnme.ToDouble if nArgs == 1 => constantFold1(intValue, _.toDouble) + case _ => None + } else if (owner == defn.CompiletimeOpsLongModuleClass) name match { + case tpnme.Abs if nArgs == 1 => constantFold1(longValue, _.abs) + case tpnme.Negate if nArgs == 1 => constantFold1(longValue, x => -x) + case tpnme.Plus if nArgs == 2 => constantFold2(longValue, _ + _) + case tpnme.Minus if nArgs == 2 => constantFold2(longValue, _ - _) + case tpnme.Times if nArgs == 2 => constantFold2(longValue, _ * _) + case tpnme.Div if nArgs == 2 => constantFold2(longValue, { + case (_, 0L) => throw new TypeError("Division by 0") + case (a, b) => a / b + }) + case tpnme.Mod if nArgs == 2 => constantFold2(longValue, { + case (_, 0L) => throw new TypeError("Modulo by 0") + case (a, b) => a % b + }) + case tpnme.Lt if nArgs == 2 => constantFold2(longValue, _ < _) + case tpnme.Gt if nArgs == 2 => constantFold2(longValue, _ > _) + case tpnme.Ge if nArgs == 2 => constantFold2(longValue, _ >= _) + case tpnme.Le if nArgs == 2 => constantFold2(longValue, _ <= _) + case tpnme.Xor if nArgs == 2 => constantFold2(longValue, _ ^ _) + case tpnme.BitwiseAnd if nArgs == 2 => constantFold2(longValue, _ & _) + case tpnme.BitwiseOr if nArgs == 2 => constantFold2(longValue, _ | _) + case tpnme.ASR if nArgs == 2 => constantFold2(longValue, _ >> _) + case tpnme.LSL if nArgs == 2 => constantFold2(longValue, _ << _) + case tpnme.LSR if nArgs == 2 => constantFold2(longValue, _ >>> _) + case tpnme.Min if nArgs == 2 => constantFold2(longValue, _ min _) + case tpnme.Max if nArgs == 2 => constantFold2(longValue, _ max _) + case tpnme.NumberOfLeadingZeros if nArgs == 1 => + constantFold1(longValue, java.lang.Long.numberOfLeadingZeros(_)) + case tpnme.ToInt if nArgs == 1 => constantFold1(longValue, _.toInt) + case tpnme.ToFloat if nArgs == 1 => constantFold1(longValue, _.toFloat) + case tpnme.ToDouble if nArgs == 1 => constantFold1(longValue, _.toDouble) + case _ => None + } else if (owner == defn.CompiletimeOpsFloatModuleClass) name match { + case tpnme.Abs if nArgs == 1 => constantFold1(floatValue, _.abs) + case tpnme.Negate if nArgs == 1 => constantFold1(floatValue, x => -x) + case tpnme.Plus if nArgs == 2 => constantFold2(floatValue, _ + _) + case tpnme.Minus if nArgs == 2 => constantFold2(floatValue, _ - _) + case tpnme.Times if nArgs == 2 => constantFold2(floatValue, _ * _) + case tpnme.Div if nArgs == 2 => constantFold2(floatValue, _ / _) + case tpnme.Mod if nArgs == 2 => constantFold2(floatValue, _ % _) + case tpnme.Lt if nArgs == 2 => constantFold2(floatValue, _ < _) + case tpnme.Gt if nArgs == 2 => constantFold2(floatValue, _ > _) + case tpnme.Ge if nArgs == 2 => constantFold2(floatValue, _ >= _) + case tpnme.Le if nArgs == 2 => constantFold2(floatValue, _ <= _) + case tpnme.Min if nArgs == 2 => constantFold2(floatValue, _ min _) + case tpnme.Max if nArgs == 2 => constantFold2(floatValue, _ max _) + case tpnme.ToInt if nArgs == 1 => constantFold1(floatValue, _.toInt) + case tpnme.ToLong if nArgs == 1 => constantFold1(floatValue, _.toLong) + case tpnme.ToDouble if nArgs == 1 => constantFold1(floatValue, _.toDouble) + case _ => None + } else if (owner == defn.CompiletimeOpsDoubleModuleClass) name match { + case tpnme.Abs if nArgs == 1 => constantFold1(doubleValue, _.abs) + case tpnme.Negate if nArgs == 1 => constantFold1(doubleValue, x => -x) + case tpnme.Plus if nArgs == 2 => constantFold2(doubleValue, _ + _) + case tpnme.Minus if nArgs == 2 => constantFold2(doubleValue, _ - _) + case tpnme.Times if nArgs == 2 => constantFold2(doubleValue, _ * _) + case tpnme.Div if nArgs == 2 => constantFold2(doubleValue, _ / _) + case tpnme.Mod if nArgs == 2 => constantFold2(doubleValue, _ % _) + case tpnme.Lt if nArgs == 2 => constantFold2(doubleValue, _ < _) + case tpnme.Gt if nArgs == 2 => constantFold2(doubleValue, _ > _) + case tpnme.Ge if nArgs == 2 => constantFold2(doubleValue, _ >= _) + case tpnme.Le if nArgs == 2 => constantFold2(doubleValue, _ <= _) + case tpnme.Min if nArgs == 2 => constantFold2(doubleValue, _ min _) + case tpnme.Max if nArgs == 2 => constantFold2(doubleValue, _ max _) + case tpnme.ToInt if nArgs == 1 => constantFold1(doubleValue, _.toInt) + case tpnme.ToLong if nArgs == 1 => constantFold1(doubleValue, _.toLong) + case tpnme.ToFloat if nArgs == 1 => constantFold1(doubleValue, _.toFloat) case _ => None } else if (owner == defn.CompiletimeOpsStringModuleClass) name match { case tpnme.Plus if nArgs == 2 => constantFold2(stringValue, _ + _) + case tpnme.Length if nArgs == 1 => constantFold1(stringValue, _.length) + case tpnme.Matches if nArgs == 2 => constantFold2(stringValue, _ matches _) + case tpnme.Substring if nArgs == 3 => + constantFold3(stringValue, intValue, intValue, (s, b, e) => s.substring(b, e)) case _ => None } else if (owner == defn.CompiletimeOpsBooleanModuleClass) name match { case tpnme.Not if nArgs == 1 => constantFold1(boolValue, x => !x) diff --git a/library/src/scala/compiletime/ops/any.scala b/library/src/scala/compiletime/ops/any.scala index 0cb7e6d06431..0a6ed4c3e3d7 100644 --- a/library/src/scala/compiletime/ops/any.scala +++ b/library/src/scala/compiletime/ops/any.scala @@ -21,3 +21,22 @@ object any: * @syntax markdown */ type !=[X, Y] <: Boolean + + /** Tests if a type is a constant. + * ```scala + * val c1: IsConst[1] = true + * val c2: IsConst["hi"] = true + * val c3: IsConst[false] = true + * ``` + * @syntax markdown + */ + type IsConst[X] <: Boolean + + /** String conversion of a constant singleton type. + * ```scala + * val s1: ToString[1] = "1" + * val sTrue: ToString[true] = "true" + * ``` + * @syntax markdown + */ + type ToString[X] <: String \ No newline at end of file diff --git a/library/src/scala/compiletime/ops/double.scala b/library/src/scala/compiletime/ops/double.scala new file mode 100644 index 000000000000..783b0ac8b287 --- /dev/null +++ b/library/src/scala/compiletime/ops/double.scala @@ -0,0 +1,136 @@ +package scala.compiletime +package ops + +object double: + /** Addition of two `Double` singleton types. + * ```scala + * val sum: 2.0 + 2.0 = 4.0 + * ``` + * @syntax markdown + */ + type +[X <: Double, Y <: Double] <: Double + + /** Subtraction of two `Double` singleton types. + * ```scala + * val sub: 4.0 - 2.0 = 2.0 + * ``` + * @syntax markdown + */ + type -[X <: Double, Y <: Double] <: Double + + /** Multiplication of two `Double` singleton types. + * ```scala + * val mul: 4.0 * 2.0 = 8.0 + * ``` + * @syntax markdown + */ + type *[X <: Double, Y <: Double] <: Double + + /** Integer division of two `Double` singleton types. + * ```scala + * val div: 5.0 / 2.0 = 2.0 + * ``` + * @syntax markdown + */ + type /[X <: Double, Y <: Double] <: Double + + /** Remainder of the division of `X` by `Y`. + * ```scala + * val mod: 5.0 % 2.0 = 1.0 + * ``` + * @syntax markdown + */ + type %[X <: Double, Y <: Double] <: Double + + /** Less-than comparison of two `Double` singleton types. + * ```scala + * val lt1: 4.0 < 2.0 = false + * val lt2: 2.0 < 4.0 = true + * ``` + * @syntax markdown + */ + type <[X <: Double, Y <: Double] <: Boolean + + /** Greater-than comparison of two `Double` singleton types. + * ```scala + * val gt1: 4.0 > 2.0 = true + * val gt2: 2.0 > 2.0 = false + * ``` + * @syntax markdown + */ + type >[X <: Double, Y <: Double] <: Boolean + + /** Greater-or-equal comparison of two `Double` singleton types. + * ```scala + * val ge1: 4.0 >= 2.0 = true + * val ge2: 2.0 >= 3.0 = false + * ``` + * @syntax markdown + */ + type >=[X <: Double, Y <: Double] <: Boolean + + /** Less-or-equal comparison of two `Double` singleton types. + * ```scala + * val lt1: 4.0 <= 2.0 = false + * val lt2: 2.0 <= 2.0 = true + * ``` + * @syntax markdown + */ + type <=[X <: Double, Y <: Double] <: Boolean + + /** Absolute value of an `Double` singleton type. + * ```scala + * val abs: Abs[-1.0] = 1.0 + * ``` + * @syntax markdown + */ + type Abs[X <: Double] <: Double + + /** Negation of an `Double` singleton type. + * ```scala + * val neg1: Neg[-1.0] = 1.0 + * val neg2: Neg[1.0] = -1.0 + * ``` + * @syntax markdown + */ + type Negate[X <: Double] <: Double + + /** Minimum of two `Double` singleton types. + * ```scala + * val min: Min[-1.0, 1.0] = -1.0 + * ``` + * @syntax markdown + */ + type Min[X <: Double, Y <: Double] <: Double + + /** Maximum of two `Double` singleton types. + * ```scala + * val max: Max[-1.0, 1.0] = 1.0 + * ``` + * @syntax markdown + */ + type Max[X <: Double, Y <: Double] <: Double + + /** Int conversion of a `Double` singleton type. + * ```scala + * val x: ToInt[1.0] = 1 + * ``` + * @syntax markdown + */ + type ToInt[X <: Double] <: Int + + /** Long conversion of a `Double` singleton type. + * ```scala + * val x: ToLong[1.0] = 1L + * ``` + * @syntax markdown + */ + type ToLong[X <: Double] <: Long + + /** Float conversion of a `Double` singleton type. + * ```scala + * val x: ToFloat[1.0] = 1.0f + * ``` + * @syntax markdown + */ + type ToFloat[X <: Double] <: Float \ No newline at end of file diff --git a/library/src/scala/compiletime/ops/float.scala b/library/src/scala/compiletime/ops/float.scala new file mode 100644 index 000000000000..7330959f461b --- /dev/null +++ b/library/src/scala/compiletime/ops/float.scala @@ -0,0 +1,136 @@ +package scala.compiletime +package ops + +object float: + /** Addition of two `Float` singleton types. + * ```scala + * val sum: 2.0f + 2.0f = 4.0f + * ``` + * @syntax markdown + */ + type +[X <: Float, Y <: Float] <: Float + + /** Subtraction of two `Float` singleton types. + * ```scala + * val sub: 4.0f - 2.0f = 2.0f + * ``` + * @syntax markdown + */ + type -[X <: Float, Y <: Float] <: Float + + /** Multiplication of two `Float` singleton types. + * ```scala + * val mul: 4.0f * 2.0f = 8.0f + * ``` + * @syntax markdown + */ + type *[X <: Float, Y <: Float] <: Float + + /** Integer division of two `Float` singleton types. + * ```scala + * val div: 5.0f / 2.0f = 2.0f + * ``` + * @syntax markdown + */ + type /[X <: Float, Y <: Float] <: Float + + /** Remainder of the division of `X` by `Y`. + * ```scala + * val mod: 5.0f % 2.0f = 1.0f + * ``` + * @syntax markdown + */ + type %[X <: Float, Y <: Float] <: Float + + /** Less-than comparison of two `Float` singleton types. + * ```scala + * val lt1: 4.0f < 2.0f = false + * val lt2: 2.0f < 4.0f = true + * ``` + * @syntax markdown + */ + type <[X <: Float, Y <: Float] <: Boolean + + /** Greater-than comparison of two `Float` singleton types. + * ```scala + * val gt1: 4.0f > 2.0f = true + * val gt2: 2.0f > 2.0f = false + * ``` + * @syntax markdown + */ + type >[X <: Float, Y <: Float] <: Boolean + + /** Greater-or-equal comparison of two `Float` singleton types. + * ```scala + * val ge1: 4.0f >= 2.0f = true + * val ge2: 2.0f >= 3.0f = false + * ``` + * @syntax markdown + */ + type >=[X <: Float, Y <: Float] <: Boolean + + /** Less-or-equal comparison of two `Float` singleton types. + * ```scala + * val lt1: 4.0f <= 2.0f = false + * val lt2: 2.0f <= 2.0f = true + * ``` + * @syntax markdown + */ + type <=[X <: Float, Y <: Float] <: Boolean + + /** Absolute value of an `Float` singleton type. + * ```scala + * val abs: Abs[-1.0f] = 1.0f + * ``` + * @syntax markdown + */ + type Abs[X <: Float] <: Float + + /** Negation of an `Float` singleton type. + * ```scala + * val neg1: Neg[-1.0f] = 1.0f + * val neg2: Neg[1.0f] = -1.0f + * ``` + * @syntax markdown + */ + type Negate[X <: Float] <: Float + + /** Minimum of two `Float` singleton types. + * ```scala + * val min: Min[-1.0f, 1.0f] = -1.0f + * ``` + * @syntax markdown + */ + type Min[X <: Float, Y <: Float] <: Float + + /** Maximum of two `Float` singleton types. + * ```scala + * val max: Max[-1.0f, 1.0f] = 1.0f + * ``` + * @syntax markdown + */ + type Max[X <: Float, Y <: Float] <: Float + + /** Int conversion of a `Float` singleton type. + * ```scala + * val x: ToInt[1.0f] = 1 + * ``` + * @syntax markdown + */ + type ToInt[X <: Float] <: Int + + /** Long conversion of a `Float` singleton type. + * ```scala + * val x: ToLong[1.0f] = 1L + * ``` + * @syntax markdown + */ + type ToLong[X <: Float] <: Long + + /** Double conversion of a `Float` singleton type. + * ```scala + * val x: ToDouble[1.0f] = 1.0 + * ``` + * @syntax markdown + */ + type ToDouble[X <: Float] <: Double diff --git a/library/src/scala/compiletime/ops/int.scala b/library/src/scala/compiletime/ops/int.scala index 70339eed12e7..890909963b01 100644 --- a/library/src/scala/compiletime/ops/int.scala +++ b/library/src/scala/compiletime/ops/int.scala @@ -181,4 +181,43 @@ object int: * ``` * @syntax markdown */ + @deprecated("Use compiletime.ops.any.ToString instead.","3.1.0") type ToString[X <: Int] <: String + + /** Long conversion of an `Int` singleton type. + * ```scala + * val x: ToLong[1] = 1L + * ``` + * @syntax markdown + */ + type ToLong[X <: Int] <: Long + + /** Float conversion of an `Int` singleton type. + * ```scala + * val x: ToFloat[1] = 1.0f + * ``` + * @syntax markdown + */ + type ToFloat[X <: Int] <: Float + + /** Double conversion of an `Int` singleton type. + * ```scala + * val x: ToDouble[1] = 1.0 + * ``` + * @syntax markdown + */ + type ToDouble[X <: Int] <: Double + + /** Number of zero bits preceding the highest-order ("leftmost") + * one-bit in the two's complement binary representation of the specified `Int` singleton type. + * Returns 32 if the specified singleton type has no one-bits in its two's complement representation, + * in other words if it is equal to zero. + * ```scala + * val zero_lzc: NumberOfLeadingZeros[0] = 32 + * val eight_lzc: NumberOfLeadingZeros[8] = 28 + * type Log2[N <: Int] = 31 - NumberOfLeadingZeros[N] + * val log2of8: Log2[8] = 3 + * ``` + * @syntax markdown + */ + type NumberOfLeadingZeros[X <: Int] <: Int \ No newline at end of file diff --git a/library/src/scala/compiletime/ops/long.scala b/library/src/scala/compiletime/ops/long.scala new file mode 100644 index 000000000000..920d7c81d349 --- /dev/null +++ b/library/src/scala/compiletime/ops/long.scala @@ -0,0 +1,222 @@ +package scala.compiletime +package ops + +object long: + /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was + * + * ```scala + * type S[N <: Long] <: Long = N match { + * case 0L => 1L + * case 1L => 2L + * case 2L => 3L + * ... + * case 9223372036854775806L => 9223372036854775807L + * } + * ``` + * @syntax markdown + */ + type S[N <: Long] <: Long + + /** Addition of two `Long` singleton types. + * ```scala + * val sum: 2L + 2L = 4L + * ``` + * @syntax markdown + */ + type +[X <: Long, Y <: Long] <: Long + + /** Subtraction of two `Long` singleton types. + * ```scala + * val sub: 4L - 2L = 2L + * ``` + * @syntax markdown + */ + type -[X <: Long, Y <: Long] <: Long + + /** Multiplication of two `Long` singleton types. + * ```scala + * val mul: 4L * 2L = 8L + * ``` + * @syntax markdown + */ + type *[X <: Long, Y <: Long] <: Long + + /** Integer division of two `Long` singleton types. + * ```scala + * val div: 5L / 2L = 2L + * ``` + * @syntax markdown + */ + type /[X <: Long, Y <: Long] <: Long + + /** Remainder of the division of `X` by `Y`. + * ```scala + * val mod: 5L % 2L = 1L + * ``` + * @syntax markdown + */ + type %[X <: Long, Y <: Long] <: Long + + /** Binary left shift of `X` by `Y`. + * ```scala + * val lshift: 1L << 2L = 4L + * ``` + * @syntax markdown + */ + type <<[X <: Long, Y <: Long] <: Long + + /** Binary right shift of `X` by `Y`. + * ```scala + * val rshift: 10L >> 1L = 5L + * ``` + * @syntax markdown + */ + type >>[X <: Long, Y <: Long] <: Long + + /** Binary right shift of `X` by `Y`, filling the left with zeros. + * ```scala + * val rshiftzero: 10L >>> 1L = 5L + * ``` + * @syntax markdown + */ + type >>>[X <: Long, Y <: Long] <: Long + + /** Bitwise xor of `X` and `Y`. + * ```scala + * val xor: 10L ^ 30L = 20L + * ``` + * @syntax markdown + */ + type ^[X <: Long, Y <: Long] <: Long + + /** Less-than comparison of two `Long` singleton types. + * ```scala + * val lt1: 4L < 2L = false + * val lt2: 2L < 4L = true + * ``` + * @syntax markdown + */ + type <[X <: Long, Y <: Long] <: Boolean + + /** Greater-than comparison of two `Long` singleton types. + * ```scala + * val gt1: 4L > 2L = true + * val gt2: 2L > 2L = false + * ``` + * @syntax markdown + */ + type >[X <: Long, Y <: Long] <: Boolean + + /** Greater-or-equal comparison of two `Long` singleton types. + * ```scala + * val ge1: 4L >= 2L = true + * val ge2: 2L >= 3L = false + * ``` + * @syntax markdown + */ + type >=[X <: Long, Y <: Long] <: Boolean + + /** Less-or-equal comparison of two `Long` singleton types. + * ```scala + * val lt1: 4L <= 2L = false + * val lt2: 2L <= 2L = true + * ``` + * @syntax markdown + */ + type <=[X <: Long, Y <: Long] <: Boolean + + /** Bitwise and of `X` and `Y`. + * ```scala + * val and1: BitwiseAnd[4L, 4L] = 4L + * val and2: BitwiseAnd[10L, 5L] = 0L + * ``` + * @syntax markdown + */ + type BitwiseAnd[X <: Long, Y <: Long] <: Long + + /** Bitwise or of `X` and `Y`. + * ```scala + * val or: BitwiseOr[10L, 11L] = 11L + * ``` + * @syntax markdown + */ + type BitwiseOr[X <: Long, Y <: Long] <: Long + + /** Absolute value of an `Long` singleton type. + * ```scala + * val abs: Abs[-1L] = 1L + * ``` + * @syntax markdown + */ + type Abs[X <: Long] <: Long + + /** Negation of an `Long` singleton type. + * ```scala + * val neg1: Neg[-1L] = 1L + * val neg2: Neg[1L] = -1L + * ``` + * @syntax markdown + */ + type Negate[X <: Long] <: Long + + /** Minimum of two `Long` singleton types. + * ```scala + * val min: Min[-1L, 1L] = -1L + * ``` + * @syntax markdown + */ + type Min[X <: Long, Y <: Long] <: Long + + /** Maximum of two `Long` singleton types. + * ```scala + * val max: Max[-1L, 1L] = 1L + * ``` + * @syntax markdown + */ + type Max[X <: Long, Y <: Long] <: Long + + /** String conversion of an `Long` singleton type. + * ```scala + * val abs: ToString[1L] = "1" + * ``` + * @syntax markdown + */ + type ToString[X <: Long] <: String + + /** Number of zero bits preceding the highest-order ("leftmost") + * one-bit in the two's complement binary representation of the specified `Long` singleton type. + * Returns 64 if the specified singleton type has no one-bits in its two's complement representation, + * in other words if it is equal to zero. + * ```scala + * val zero_lzc: NumberOfLeadingZeros[0L] = 64 + * val eight_lzc: NumberOfLeadingZeros[8L] = 60 + * type Log2[N <: Long] = int.-[63, NumberOfLeadingZeros[N]] + * val log2of8: Log2[8L] = 3 + * ``` + * @syntax markdown + */ + type NumberOfLeadingZeros[X <: Long] <: Int + + /** Int conversion of a `Long` singleton type. + * ```scala + * val x: ToInt[1L] = 1 + * ``` + * @syntax markdown + */ + type ToInt[X <: Long] <: Int + + /** Float conversion of a `Long` singleton type. + * ```scala + * val x: ToFloat[1L] = 1.0f + * ``` + * @syntax markdown + */ + type ToFloat[X <: Long] <: Float + + /** Double conversion of a `Long` singleton type. + * ```scala + * val x: ToDouble[1L] = 1.0 + * ``` + * @syntax markdown + */ + type ToDouble[X <: Long] <: Double diff --git a/library/src/scala/compiletime/ops/string.scala b/library/src/scala/compiletime/ops/string.scala index 0969ceb60053..d30f03b904c0 100644 --- a/library/src/scala/compiletime/ops/string.scala +++ b/library/src/scala/compiletime/ops/string.scala @@ -9,3 +9,32 @@ object string: * @syntax markdown */ type +[X <: String, Y <: String] <: String + + /** Length of a `String` singleton type. + * ```scala + * val helloSize: Size["hello"] = 5 + * ``` + * @syntax markdown + */ + type Length[X <: String] <: Int + + /** Substring of a `String` singleton type, with a singleton type + * begin inclusive index `IBeg`, and a singleton type exclusive end index `IEnd`. + * The substring begins at the specified IBeg and extends to the character at index IEnd - 1. + * Thus the length of the substring is IEnd-IBeg. + * ```scala + * val x: Substring["hamburger", 4, 8] = "urge" + * val y: Substring["smiles", 1, 5] = "mile" + * ``` + * @syntax markdown + */ + type Substring[S <: String, IBeg <: Int, IEnd <: Int] <: String + + /** Tests if this `String` singleton type matches the given + * regular expression `String` singleton type. + * ```scala + * val x: Matches["unhappy", "un.*"] = true + * ``` + * @syntax markdown + */ + type Matches[S <: String, Regex <: String] <: Boolean diff --git a/tests/neg/singleton-ops-any.check b/tests/neg/singleton-ops-any.check index 6de768fa0b2e..be234d405b4e 100644 --- a/tests/neg/singleton-ops-any.check +++ b/tests/neg/singleton-ops-any.check @@ -26,3 +26,17 @@ longer explanation available when compiling with `-explain` | Required: (false : Boolean) longer explanation available when compiling with `-explain` +-- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:18:27 ------------------------------------------------- +18 | val t04: ToString[Int] = "Int" // error + | ^^^^^ + | Found: ("Int" : String) + | Required: compiletime.ops.any.ToString[Int] + +longer explanation available when compiling with `-explain` +-- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:32:26 ------------------------------------------------- +32 | val t48: IsConst[Any] = true // error + | ^^^^ + | Found: (true : Boolean) + | Required: (false : Boolean) + +longer explanation available when compiling with `-explain` diff --git a/tests/neg/singleton-ops-any.scala b/tests/neg/singleton-ops-any.scala index 0d7c05b55fec..33951f58bcd9 100644 --- a/tests/neg/singleton-ops-any.scala +++ b/tests/neg/singleton-ops-any.scala @@ -11,4 +11,24 @@ object Test { val t37: 0 != 1 = true val t38: false != 5 = false // error val t39: 10 != 10 = true // error + + val t01: ToString[1] = "1" + val t02: ToString[-2L] = "-2" + val t03: ToString[true] = "true" + val t04: ToString[Int] = "Int" // error + val t05: ToString[3.33] = "3.33" + val t06: ToString["123"] = "123" + + val t40: IsConst[1] = true + val t41: IsConst[2L] = true + val t42: IsConst[-1.0] = true + val t43: IsConst[false] = true + val t44: IsConst["hi"] = true + val t45: IsConst[Int] = false + val one : Int = 1 + val t46 : IsConst[one.type] = false + final val two = 2 + val t47 : IsConst[two.type] = true + val t48: IsConst[Any] = true // error + } diff --git a/tests/neg/singleton-ops-double.scala b/tests/neg/singleton-ops-double.scala new file mode 100644 index 000000000000..006b86270657 --- /dev/null +++ b/tests/neg/singleton-ops-double.scala @@ -0,0 +1,77 @@ +import scala.compiletime.ops.double.* + +object Test { + summon[2.0 + 3.0 =:= 6.0 - 1.0] + summon[1763.0 =:= 41.0 * 43.0] + summon[2.0 + 2.0 =:= 3.0] // error + summon[29.0 * 31.0 =:= 900.0] // error + summon[Double <:< Double + 1.0] // error + summon[1.0 + Double <:< Double] + + val t0: 2.0 + 3.0 = 5.0 + val t1: 2.0 + 2.0 = 5.0 // error + val t2: -1.0 + 1.0 = 0.0 + val t3: -5.0 + -5.0 = -11.0 // error + + val t4: 10.0 * 20.0 = 200.0 + val t5: 30.0 * 10.0 = 400.0 // error + val t6: -10.0 * 2.0 = -20.0 + val t7: -2.0 * -2.0 = 4.0 + + val t8: 10.0 / 2.0 = 5.0 + val t9: 11.0 / -2.0 = -5.5 + val t10: 2.0 / 4.0 = 2.0 // error + + val t12: 10.0 % 3.0 = 1.0 + val t13: 12.0 % 2.0 = 1.0 // error + val t14: 1.0 % -3.0 = 1.0 + + val t16: 1.0 < 0.0 = false + val t17: 0.0 < 1.0 = true + val t18: 10.0 < 5.0 = true // error + val t19: 5.0 < 10.0 = false // error + + val t20: 1.0 <= 0.0 = false + val t21: 1.0 <= 1.0 = true + val t22: 10.0 <= 5.0 = true // error + val t23: 5.0 <= 10.0 = false // error + + val t24: 1.0 > 0.0 = true + val t25: 0.0 > 1.0 = false + val t26: 10.0 > 5.0 = false // error + val t27: 5.0 > 10.0 = true // error + + val t28: 1.0 >= 1.0 = true + val t29: 0.0 >= 1.0 = false + val t30: 10.0 >= 5.0 = false // error + val t31: 5.0 >= 10.0 = true // error + + val t32: Abs[0.0] = 0.0 + val t33: Abs[-1.0] = 1.0 + val t34: Abs[-1.0] = -1.0 // error + val t35: Abs[1.0] = -1.0 // error + + val t36: Negate[-10.0] = 10.0 + val t37: Negate[10.0] = -10.0 + val t38: Negate[1.0] = 1.0 // error + val t39: Negate[-1.0] = -1.0 // error + + val t40: Max[-1.0, 10.0] = 10.0 + val t41: Max[4.0, 2.0] = 4.0 + val t42: Max[2.0, 2.0] = 1.0 // error + val t43: Max[-1.0, -1.0] = 0.0 // error + + val t44: Min[-1.0, 10.0] = -1.0 + val t45: Min[4.0, 2.0] = 2.0 + val t46: Min[2.0, 2.0] = 1.0 // error + val t47: Min[-1.0, -1.0] = 0.0 // error + + val t79: ToInt[1.0] = 1 + val t80: ToInt[3.0] = 2 // error + + val t81: ToLong[1.0] = 1L + val t82: ToLong[2.0] = 2 // error + + val t83: ToFloat[1.0] = 1.0f + val t84: ToFloat[2.0] = 2 // error +} diff --git a/tests/neg/singleton-ops-float.scala b/tests/neg/singleton-ops-float.scala new file mode 100644 index 000000000000..f7263fc804a6 --- /dev/null +++ b/tests/neg/singleton-ops-float.scala @@ -0,0 +1,77 @@ +import scala.compiletime.ops.float.* + +object Test { + summon[2.0f + 3.0f =:= 6.0f - 1.0f] + summon[1763.0f =:= 41.0f * 43.0f] + summon[2.0f + 2.0f =:= 3.0f] // error + summon[29.0f * 31.0f =:= 900.0f] // error + summon[Float <:< Float + 1.0f] // error + summon[1.0f + Float <:< Float] + + val t0: 2.0f + 3.0f = 5.0f + val t1: 2.0f + 2.0f = 5.0f // error + val t2: -1.0f + 1.0f = 0.0f + val t3: -5.0f + -5.0f = -11.0f // error + + val t4: 10.0f * 20.0f = 200.0f + val t5: 30.0f * 10.0f = 400.0f // error + val t6: -10.0f * 2.0f = -20.0f + val t7: -2.0f * -2.0f = 4.0f + + val t8: 10.0f / 2.0f = 5.0f + val t9: 11.0f / -2.0f = -5.5f + val t10: 2.0f / 4.0f = 2.0f // error + + val t12: 10.0f % 3.0f = 1.0f + val t13: 12.0f % 2.0f = 1.0f // error + val t14: 1.0f % -3.0f = 1.0f + + val t16: 1.0f < 0.0f = false + val t17: 0.0f < 1.0f = true + val t18: 10.0f < 5.0f = true // error + val t19: 5.0f < 10.0f = false // error + + val t20: 1.0f <= 0.0f = false + val t21: 1.0f <= 1.0f = true + val t22: 10.0f <= 5.0f = true // error + val t23: 5.0f <= 10.0f = false // error + + val t24: 1.0f > 0.0f = true + val t25: 0.0f > 1.0f = false + val t26: 10.0f > 5.0f = false // error + val t27: 5.0f > 10.0f = true // error + + val t28: 1.0f >= 1.0f = true + val t29: 0.0f >= 1.0f = false + val t30: 10.0f >= 5.0f = false // error + val t31: 5.0f >= 10.0f = true // error + + val t32: Abs[0.0f] = 0.0f + val t33: Abs[-1.0f] = 1.0f + val t34: Abs[-1.0f] = -1.0f // error + val t35: Abs[1.0f] = -1.0f // error + + val t36: Negate[-10.0f] = 10.0f + val t37: Negate[10.0f] = -10.0f + val t38: Negate[1.0f] = 1.0f // error + val t39: Negate[-1.0f] = -1.0f // error + + val t40: Max[-1.0f, 10.0f] = 10.0f + val t41: Max[4.0f, 2.0f] = 4.0f + val t42: Max[2.0f, 2.0f] = 1.0f // error + val t43: Max[-1.0f, -1.0f] = 0.0f // error + + val t44: Min[-1.0f, 10.0f] = -1.0f + val t45: Min[4.0f, 2.0f] = 2.0f + val t46: Min[2.0f, 2.0f] = 1.0f // error + val t47: Min[-1.0f, -1.0f] = 0.0f // error + + val t79: ToInt[1.0f] = 1 + val t80: ToInt[3.0f] = 2 // error + + val t81: ToLong[1.0f] = 1L + val t82: ToLong[2.0f] = 2 // error + + val t83: ToDouble[1.0f] = 1.0 + val t84: ToDouble[2.0f] = 2 // error +} diff --git a/tests/neg/singleton-ops-int.scala b/tests/neg/singleton-ops-int.scala index d2fd3a73afcd..ca2d3d6ea107 100644 --- a/tests/neg/singleton-ops-int.scala +++ b/tests/neg/singleton-ops-int.scala @@ -9,6 +9,9 @@ object Test { summon[1 + Int <:< Int] val t0: 2 + 3 = 5 + final val two = 2 + final val three = 3 + val t0_b : two.type + three.type = 5 val t1: 2 + 2 = 5 // error val t2: -1 + 1 = 0 val t3: -5 + -5 = -11 // error @@ -68,10 +71,8 @@ object Test { val t46: Min[2, 2] = 1 // error val t47: Min[-1, -1] = 0 // error - val t48: ToString[213] = "213" - val t49: ToString[-1] = "-1" - val t50: ToString[0] = "-0" // error - val t51: ToString[200] = "100" // error + val t48: ToString[213] = "213" // warning (deprecation) + val t49: ToString[-1] = "-1" // warning (deprecation) val t52: 1 ^ 2 = 3 val t53: 1 ^ 3 = 3 // error @@ -102,4 +103,17 @@ object Test { val t73: -7 >>> 3 = 536870911 val t74: -7 >>> 3 = -1 // error + val t75: NumberOfLeadingZeros[0] = 32 + val t76: NumberOfLeadingZeros[8] = 28 + val t77: NumberOfLeadingZeros[-1] = 0 + val t78: NumberOfLeadingZeros[-1] = 1 // error + + val t79: ToLong[1] = 1L + val t80: ToLong[2] = 2 // error + + val t81: ToFloat[1] = 1.0f + val t82: ToFloat[2] = 2 // error + + val t83: ToDouble[1] = 1.0 + val t84: ToDouble[2] = 2 // error } diff --git a/tests/neg/singleton-ops-long.scala b/tests/neg/singleton-ops-long.scala new file mode 100644 index 000000000000..5af2069beb27 --- /dev/null +++ b/tests/neg/singleton-ops-long.scala @@ -0,0 +1,113 @@ +import scala.compiletime.ops.long.* + +object Test { + summon[2L + 3L =:= 6L - 1L] + summon[1763L =:= 41L * 43L] + summon[2L + 2L =:= 3L] // error + summon[29L * 31L =:= 900L] // error + summon[Long <:< Long + 1L] // error + summon[1L + Long <:< Long] + + val t0: 2L + 3L = 5L + val t1: 2L + 2L = 5L // error + val t2: -1L + 1L = 0L + val t3: -5L + -5L = -11L // error + + val t4: 10L * 20L = 200L + val t5: 30L * 10L = 400L // error + val t6: -10L * 2L = -20L + val t7: -2L * -2L = 4L + + val t8: 10L / 2L = 5L + val t9: 11L / -2L = -5L // Integer division + val t10: 2L / 4L = 2L // error + val t11: -1L / 0L = 1L // error + + val t12: 10L % 3L = 1L + val t13: 12L % 2L = 1L // error + val t14: 1L % -3L = 1L + val t15: -3L % 0L = 0L // error + + val t16: 1L < 0L = false + val t17: 0L < 1L = true + val t18: 10L < 5L = true // error + val t19: 5L < 10L = false // error + + val t20: 1L <= 0L = false + val t21: 1L <= 1L = true + val t22: 10L <= 5L = true // error + val t23: 5L <= 10L = false // error + + val t24: 1L > 0L = true + val t25: 0L > 1L = false + val t26: 10L > 5L = false // error + val t27: 5L > 10L = true // error + + val t28: 1L >= 1L = true + val t29: 0L >= 1L = false + val t30: 10L >= 5L = false // error + val t31: 5L >= 10L = true // error + + val t32: Abs[0L] = 0L + val t33: Abs[-1L] = 1L + val t34: Abs[-1L] = -1L // error + val t35: Abs[1L] = -1L // error + + val t36: Negate[-10L] = 10L + val t37: Negate[10L] = -10L + val t38: Negate[1L] = 1L // error + val t39: Negate[-1L] = -1L // error + + val t40: Max[-1L, 10L] = 10L + val t41: Max[4L, 2L] = 4L + val t42: Max[2L, 2L] = 1L // error + val t43: Max[-1L, -1L] = 0L // error + + val t44: Min[-1L, 10L] = -1L + val t45: Min[4L, 2L] = 2L + val t46: Min[2L, 2L] = 1L // error + val t47: Min[-1L, -1L] = 0L // error + + val t52: 1L ^ 2L = 3L + val t53: 1L ^ 3L = 3L // error + val t54: -1L ^ -2L = 1L + val t55: -1L ^ -3L = 1L // error + + val t56: BitwiseOr[1L, 2L] = 3L + val t57: BitwiseOr[10L, 12L] = 13L // error + val t58: BitwiseOr[-11L, 12L] = -3L + val t59: BitwiseOr[-111L, -10L] = 0L // error + + val t60: BitwiseAnd[1L, 1L] = 1L + val t61: BitwiseAnd[1L, 2L] = 0L + val t62: BitwiseAnd[-1L, -3L] = 3L // error + val t63: BitwiseAnd[-1L, -1L] = 1L // error + + val t64: 1L << 1L = 2L + val t65: 1L << 2L = 4L + val t66: 1L << 3L = 8L + val t67: 1L << 4L = 0L // error + + val t68: 100L >> 2L = 25L + val t69: 123456789L >> 71L = 964506L + val t70: -7L >> 3L = -1L + val t71: -7L >> 3L = 0L // error + + val t72: -1L >>> 10000L = 281474976710655L + val t73: -7L >>> 3L = 2305843009213693951L + val t74: -7L >>> 3L = -1L // error + + val t75: NumberOfLeadingZeros[0L] = 64 + val t76: NumberOfLeadingZeros[8L] = 60 + val t77: NumberOfLeadingZeros[-1L] = 0 + val t78: NumberOfLeadingZeros[-1L] = 1 // error + + val t79: ToInt[1L] = 1 + val t80: ToInt[3L] = 2 // error + + val t81: ToFloat[1L] = 1.0f + val t82: ToFloat[2L] = 2 // error + + val t83: ToDouble[1L] = 1.0 + val t84: ToDouble[2L] = 2 // error +} diff --git a/tests/neg/singleton-ops-string.scala b/tests/neg/singleton-ops-string.scala index 46093121d3c4..d9cf2377564b 100644 --- a/tests/neg/singleton-ops-string.scala +++ b/tests/neg/singleton-ops-string.scala @@ -5,4 +5,14 @@ object Test { val t1: "" + "" = "" val t2: "3" + "" = "33" // error val t3: "Hello " + "world" = "error" // error + + val t4: Length["Hello"] = 5 + val t5: Length[""] = 0 + val t6: Length["1"] = 7 // error + + val t7: Substring["hamburger", 4, 8] = "urge" + val t8: Substring["hamburger", 4, 8] = "urger" // error + + val t9: Matches["hamburger", "ham.*"] = true + val t10: Matches["hamburger", "ham.*"] = false // error } From 68483141e0931a8e4cfb07168c74ceb2a2f69271 Mon Sep 17 00:00:00 2001 From: oronpo Date: Mon, 25 Oct 2021 18:31:15 -0400 Subject: [PATCH 0850/1244] add experimental annotation to added type operations and update MiMa Update MiMaFilters.scala Update MiMaFilters.scala --- library/src/scala/compiletime/ops/any.scala | 4 +++ .../src/scala/compiletime/ops/double.scala | 3 ++ library/src/scala/compiletime/ops/float.scala | 3 ++ library/src/scala/compiletime/ops/int.scala | 6 ++++ library/src/scala/compiletime/ops/long.scala | 3 ++ .../src/scala/compiletime/ops/string.scala | 5 +++ project/MiMaFilters.scala | 31 ++++++++++++++----- 7 files changed, 47 insertions(+), 8 deletions(-) diff --git a/library/src/scala/compiletime/ops/any.scala b/library/src/scala/compiletime/ops/any.scala index 0a6ed4c3e3d7..60b86414a385 100644 --- a/library/src/scala/compiletime/ops/any.scala +++ b/library/src/scala/compiletime/ops/any.scala @@ -1,6 +1,8 @@ package scala.compiletime package ops +import annotation.experimental + object any: /** Equality comparison of two singleton types. * ```scala @@ -30,6 +32,7 @@ object any: * ``` * @syntax markdown */ + @experimental type IsConst[X] <: Boolean /** String conversion of a constant singleton type. @@ -39,4 +42,5 @@ object any: * ``` * @syntax markdown */ + @experimental type ToString[X] <: String \ No newline at end of file diff --git a/library/src/scala/compiletime/ops/double.scala b/library/src/scala/compiletime/ops/double.scala index 783b0ac8b287..e06ff64c3f05 100644 --- a/library/src/scala/compiletime/ops/double.scala +++ b/library/src/scala/compiletime/ops/double.scala @@ -1,6 +1,9 @@ package scala.compiletime package ops +import scala.annotation.experimental + +@experimental object double: /** Addition of two `Double` singleton types. * ```scala diff --git a/library/src/scala/compiletime/ops/float.scala b/library/src/scala/compiletime/ops/float.scala index 7330959f461b..d5aeb2d5f4f7 100644 --- a/library/src/scala/compiletime/ops/float.scala +++ b/library/src/scala/compiletime/ops/float.scala @@ -1,6 +1,9 @@ package scala.compiletime package ops +import scala.annotation.experimental + +@experimental object float: /** Addition of two `Float` singleton types. * ```scala diff --git a/library/src/scala/compiletime/ops/int.scala b/library/src/scala/compiletime/ops/int.scala index 890909963b01..090e3312421f 100644 --- a/library/src/scala/compiletime/ops/int.scala +++ b/library/src/scala/compiletime/ops/int.scala @@ -1,6 +1,8 @@ package scala.compiletime package ops +import annotation.experimental + object int: /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was * @@ -190,6 +192,7 @@ object int: * ``` * @syntax markdown */ + @experimental type ToLong[X <: Int] <: Long /** Float conversion of an `Int` singleton type. @@ -198,6 +201,7 @@ object int: * ``` * @syntax markdown */ + @experimental type ToFloat[X <: Int] <: Float /** Double conversion of an `Int` singleton type. @@ -206,6 +210,7 @@ object int: * ``` * @syntax markdown */ + @experimental type ToDouble[X <: Int] <: Double /** Number of zero bits preceding the highest-order ("leftmost") @@ -220,4 +225,5 @@ object int: * ``` * @syntax markdown */ + @experimental type NumberOfLeadingZeros[X <: Int] <: Int \ No newline at end of file diff --git a/library/src/scala/compiletime/ops/long.scala b/library/src/scala/compiletime/ops/long.scala index 920d7c81d349..f3158e12c2f6 100644 --- a/library/src/scala/compiletime/ops/long.scala +++ b/library/src/scala/compiletime/ops/long.scala @@ -1,6 +1,9 @@ package scala.compiletime package ops +import scala.annotation.experimental + +@experimental object long: /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was * diff --git a/library/src/scala/compiletime/ops/string.scala b/library/src/scala/compiletime/ops/string.scala index d30f03b904c0..51e336ab7adc 100644 --- a/library/src/scala/compiletime/ops/string.scala +++ b/library/src/scala/compiletime/ops/string.scala @@ -1,6 +1,8 @@ package scala.compiletime package ops +import scala.annotation.experimental + object string: /** Concatenation of two `String` singleton types. * ```scala @@ -16,6 +18,7 @@ object string: * ``` * @syntax markdown */ + @experimental type Length[X <: String] <: Int /** Substring of a `String` singleton type, with a singleton type @@ -28,6 +31,7 @@ object string: * ``` * @syntax markdown */ + @experimental type Substring[S <: String, IBeg <: Int, IEnd <: Int] <: String /** Tests if this `String` singleton type matches the given @@ -37,4 +41,5 @@ object string: * ``` * @syntax markdown */ + @experimental type Matches[S <: String, Regex <: String] <: Boolean diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index ae3673016db1..53a23fb8c3f2 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -9,13 +9,28 @@ object MiMaFilters { ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.append"), ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"), ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"), - - // Should have been added in 3.1.0 - // These are only allowed on imports and therefore should not be present in binaries emitted before - // this addition of these members and therefore should not cause any conflicts. - ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1-migration"), - ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1"), - ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$"), - ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$minusmigration$"), + ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.double"), + ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.double$"), + ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.float"), + ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.float$"), + ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.long"), + ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.long$"), + // LazyVals + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.objCAS"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.objCAS"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.evaluating"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.getStaticOffset"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.nullValued"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.objCas"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waiting"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waitingAwaitRelease"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waitingRelease"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Evaluating$"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$NULL$"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Waiting"), + ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.LazyVals.Evaluating"), + ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.LazyVals.NULL"), ) } From 1350d815f2f67a842e508a5e09ac5d05488b242d Mon Sep 17 00:00:00 2001 From: oronpo Date: Mon, 25 Oct 2021 18:35:36 -0400 Subject: [PATCH 0851/1244] Deprecation of `int.ToString` will only start from 3.2.0 --- library/src/scala/compiletime/ops/int.scala | 2 +- tests/neg/singleton-ops-int.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/src/scala/compiletime/ops/int.scala b/library/src/scala/compiletime/ops/int.scala index 090e3312421f..8d62b98a27e4 100644 --- a/library/src/scala/compiletime/ops/int.scala +++ b/library/src/scala/compiletime/ops/int.scala @@ -183,7 +183,7 @@ object int: * ``` * @syntax markdown */ - @deprecated("Use compiletime.ops.any.ToString instead.","3.1.0") + @deprecated("Use compiletime.ops.any.ToString instead.","3.2.0") type ToString[X <: Int] <: String /** Long conversion of an `Int` singleton type. diff --git a/tests/neg/singleton-ops-int.scala b/tests/neg/singleton-ops-int.scala index ca2d3d6ea107..e85b6204d1fa 100644 --- a/tests/neg/singleton-ops-int.scala +++ b/tests/neg/singleton-ops-int.scala @@ -71,8 +71,8 @@ object Test { val t46: Min[2, 2] = 1 // error val t47: Min[-1, -1] = 0 // error - val t48: ToString[213] = "213" // warning (deprecation) - val t49: ToString[-1] = "-1" // warning (deprecation) + val t48: ToString[213] = "213" + val t49: ToString[-1] = "-1" val t52: 1 ^ 2 = 3 val t53: 1 ^ 3 = 3 // error From 1cf7a67e564e7e385ba3c0313d642761d2b99517 Mon Sep 17 00:00:00 2001 From: oronpo Date: Mon, 25 Oct 2021 19:31:49 -0400 Subject: [PATCH 0852/1244] Address review comments. Main changes: * Apply common protection against wrong number of arguments. * Exception in an operation is converted into a type error. --- .../src/dotty/tools/dotc/core/Types.scala | 240 +++++++++--------- 1 file changed, 126 insertions(+), 114 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index bb48f9c6ebc0..aa68f4cacad1 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4208,6 +4208,11 @@ object Types { case tycon: TypeRef if defn.isCompiletimeAppliedType(tycon.symbol) => extension (tp : Type) def fixForEvaluation : Type = tp.normalized.dealias match { + //enable operations for constant singleton terms. E.g.: + //``` + //final val one = 1 + //type Two = one.type + one.type + //``` case tp : TermRef => tp.underlying case tp => tp } @@ -4246,23 +4251,43 @@ object Types { case ConstantType(Constant(n: String)) => Some(n) case _ => None } - def isConst : Option[Type] = args.head.fixForEvaluation match { + + def isConst(tp : Type) : Option[Type] = tp.fixForEvaluation match { case ConstantType(_) => Some(ConstantType(Constant(true))) case _ => Some(ConstantType(Constant(false))) } + + def expectArgsNum(expectedNum : Int) : Unit = + //We can use assert instead of a compiler type error because this error should not + //occur since the type signature of the operation enforces the proper number of args. + assert(args.length == expectedNum, s"Type operation expects $expectedNum arguments but found ${args.length}") + def natValue(tp: Type): Option[Int] = intValue(tp).filter(n => n >= 0 && n < Int.MaxValue) + //Runs the op and returns the result as a constant type. + //If the op throws an exception, then this exception is converted into a type error. + def runConstantOp(op : => Any): Type = + val result = try { + op + } catch { + case e : Throwable => + throw new TypeError(e.getMessage) + } + ConstantType(Constant(result)) + def constantFold1[T](extractor: Type => Option[T], op: T => Any): Option[Type] = - extractor(args.head).map(a => ConstantType(Constant(op(a)))) + expectArgsNum(1) + extractor(args.head).map(a => runConstantOp(op(a))) def constantFold2[T](extractor: Type => Option[T], op: (T, T) => Any): Option[Type] = constantFold2AB(extractor, extractor, op) def constantFold2AB[TA, TB](extractorA: Type => Option[TA], extractorB: Type => Option[TB], op: (TA, TB) => Any): Option[Type] = + expectArgsNum(2) for { - a <- extractorA(args.head) - b <- extractorB(args.last) - } yield ConstantType(Constant(op(a, b))) + a <- extractorA(args(0)) + b <- extractorB(args(1)) + } yield runConstantOp(op(a, b)) def constantFold3[TA, TB, TC]( extractorA: Type => Option[TA], @@ -4270,139 +4295,126 @@ object Types { extractorC: Type => Option[TC], op: (TA, TB, TC) => Any ): Option[Type] = + expectArgsNum(3) for { - a <- extractorA(args.head) + a <- extractorA(args(0)) b <- extractorB(args(1)) - c <- extractorC(args.last) - } yield ConstantType(Constant(op(a, b, c))) + c <- extractorC(args(2)) + } yield runConstantOp(op(a, b, c)) trace(i"compiletime constant fold $this", typr, show = true) { val name = tycon.symbol.name val owner = tycon.symbol.owner - val nArgs = args.length val constantType = if (defn.isCompiletime_S(tycon.symbol)) { - if (nArgs == 1) constantFold1(natValue, _ + 1) - else None + constantFold1(natValue, _ + 1) } else if (owner == defn.CompiletimeOpsAnyModuleClass) name match { - case tpnme.Equals if nArgs == 2 => constantFold2(constValue, _ == _) - case tpnme.NotEquals if nArgs == 2 => constantFold2(constValue, _ != _) - case tpnme.ToString if nArgs == 1 => constantFold1(constValue, _.toString) - case tpnme.IsConst if nArgs == 1 => isConst + case tpnme.Equals => constantFold2(constValue, _ == _) + case tpnme.NotEquals => constantFold2(constValue, _ != _) + case tpnme.ToString => constantFold1(constValue, _.toString) + case tpnme.IsConst => isConst(args.head) case _ => None } else if (owner == defn.CompiletimeOpsIntModuleClass) name match { - case tpnme.Abs if nArgs == 1 => constantFold1(intValue, _.abs) - case tpnme.Negate if nArgs == 1 => constantFold1(intValue, x => -x) + case tpnme.Abs => constantFold1(intValue, _.abs) + case tpnme.Negate => constantFold1(intValue, x => -x) //ToString is deprecated for ops.int, and moved to ops.any - case tpnme.ToString if nArgs == 1 => constantFold1(intValue, _.toString) - case tpnme.Plus if nArgs == 2 => constantFold2(intValue, _ + _) - case tpnme.Minus if nArgs == 2 => constantFold2(intValue, _ - _) - case tpnme.Times if nArgs == 2 => constantFold2(intValue, _ * _) - case tpnme.Div if nArgs == 2 => constantFold2(intValue, { - case (_, 0) => throw new TypeError("Division by 0") - case (a, b) => a / b - }) - case tpnme.Mod if nArgs == 2 => constantFold2(intValue, { - case (_, 0) => throw new TypeError("Modulo by 0") - case (a, b) => a % b - }) - case tpnme.Lt if nArgs == 2 => constantFold2(intValue, _ < _) - case tpnme.Gt if nArgs == 2 => constantFold2(intValue, _ > _) - case tpnme.Ge if nArgs == 2 => constantFold2(intValue, _ >= _) - case tpnme.Le if nArgs == 2 => constantFold2(intValue, _ <= _) - case tpnme.Xor if nArgs == 2 => constantFold2(intValue, _ ^ _) - case tpnme.BitwiseAnd if nArgs == 2 => constantFold2(intValue, _ & _) - case tpnme.BitwiseOr if nArgs == 2 => constantFold2(intValue, _ | _) - case tpnme.ASR if nArgs == 2 => constantFold2(intValue, _ >> _) - case tpnme.LSL if nArgs == 2 => constantFold2(intValue, _ << _) - case tpnme.LSR if nArgs == 2 => constantFold2(intValue, _ >>> _) - case tpnme.Min if nArgs == 2 => constantFold2(intValue, _ min _) - case tpnme.Max if nArgs == 2 => constantFold2(intValue, _ max _) - case tpnme.NumberOfLeadingZeros if nArgs == 1 => constantFold1(intValue, Integer.numberOfLeadingZeros(_)) - case tpnme.ToLong if nArgs == 1 => constantFold1(intValue, _.toLong) - case tpnme.ToFloat if nArgs == 1 => constantFold1(intValue, _.toFloat) - case tpnme.ToDouble if nArgs == 1 => constantFold1(intValue, _.toDouble) + case tpnme.ToString => constantFold1(intValue, _.toString) + case tpnme.Plus => constantFold2(intValue, _ + _) + case tpnme.Minus => constantFold2(intValue, _ - _) + case tpnme.Times => constantFold2(intValue, _ * _) + case tpnme.Div => constantFold2(intValue, _ / _) + case tpnme.Mod => constantFold2(intValue, _ % _) + case tpnme.Lt => constantFold2(intValue, _ < _) + case tpnme.Gt => constantFold2(intValue, _ > _) + case tpnme.Ge => constantFold2(intValue, _ >= _) + case tpnme.Le => constantFold2(intValue, _ <= _) + case tpnme.Xor => constantFold2(intValue, _ ^ _) + case tpnme.BitwiseAnd => constantFold2(intValue, _ & _) + case tpnme.BitwiseOr => constantFold2(intValue, _ | _) + case tpnme.ASR => constantFold2(intValue, _ >> _) + case tpnme.LSL => constantFold2(intValue, _ << _) + case tpnme.LSR => constantFold2(intValue, _ >>> _) + case tpnme.Min => constantFold2(intValue, _ min _) + case tpnme.Max => constantFold2(intValue, _ max _) + case tpnme.NumberOfLeadingZeros => constantFold1(intValue, Integer.numberOfLeadingZeros(_)) + case tpnme.ToLong => constantFold1(intValue, _.toLong) + case tpnme.ToFloat => constantFold1(intValue, _.toFloat) + case tpnme.ToDouble => constantFold1(intValue, _.toDouble) case _ => None } else if (owner == defn.CompiletimeOpsLongModuleClass) name match { - case tpnme.Abs if nArgs == 1 => constantFold1(longValue, _.abs) - case tpnme.Negate if nArgs == 1 => constantFold1(longValue, x => -x) - case tpnme.Plus if nArgs == 2 => constantFold2(longValue, _ + _) - case tpnme.Minus if nArgs == 2 => constantFold2(longValue, _ - _) - case tpnme.Times if nArgs == 2 => constantFold2(longValue, _ * _) - case tpnme.Div if nArgs == 2 => constantFold2(longValue, { - case (_, 0L) => throw new TypeError("Division by 0") - case (a, b) => a / b - }) - case tpnme.Mod if nArgs == 2 => constantFold2(longValue, { - case (_, 0L) => throw new TypeError("Modulo by 0") - case (a, b) => a % b - }) - case tpnme.Lt if nArgs == 2 => constantFold2(longValue, _ < _) - case tpnme.Gt if nArgs == 2 => constantFold2(longValue, _ > _) - case tpnme.Ge if nArgs == 2 => constantFold2(longValue, _ >= _) - case tpnme.Le if nArgs == 2 => constantFold2(longValue, _ <= _) - case tpnme.Xor if nArgs == 2 => constantFold2(longValue, _ ^ _) - case tpnme.BitwiseAnd if nArgs == 2 => constantFold2(longValue, _ & _) - case tpnme.BitwiseOr if nArgs == 2 => constantFold2(longValue, _ | _) - case tpnme.ASR if nArgs == 2 => constantFold2(longValue, _ >> _) - case tpnme.LSL if nArgs == 2 => constantFold2(longValue, _ << _) - case tpnme.LSR if nArgs == 2 => constantFold2(longValue, _ >>> _) - case tpnme.Min if nArgs == 2 => constantFold2(longValue, _ min _) - case tpnme.Max if nArgs == 2 => constantFold2(longValue, _ max _) - case tpnme.NumberOfLeadingZeros if nArgs == 1 => + case tpnme.Abs => constantFold1(longValue, _.abs) + case tpnme.Negate => constantFold1(longValue, x => -x) + case tpnme.Plus => constantFold2(longValue, _ + _) + case tpnme.Minus => constantFold2(longValue, _ - _) + case tpnme.Times => constantFold2(longValue, _ * _) + case tpnme.Div => constantFold2(longValue, _ / _) + case tpnme.Mod => constantFold2(longValue, _ % _) + case tpnme.Lt => constantFold2(longValue, _ < _) + case tpnme.Gt => constantFold2(longValue, _ > _) + case tpnme.Ge => constantFold2(longValue, _ >= _) + case tpnme.Le => constantFold2(longValue, _ <= _) + case tpnme.Xor => constantFold2(longValue, _ ^ _) + case tpnme.BitwiseAnd => constantFold2(longValue, _ & _) + case tpnme.BitwiseOr => constantFold2(longValue, _ | _) + case tpnme.ASR => constantFold2(longValue, _ >> _) + case tpnme.LSL => constantFold2(longValue, _ << _) + case tpnme.LSR => constantFold2(longValue, _ >>> _) + case tpnme.Min => constantFold2(longValue, _ min _) + case tpnme.Max => constantFold2(longValue, _ max _) + case tpnme.NumberOfLeadingZeros => constantFold1(longValue, java.lang.Long.numberOfLeadingZeros(_)) - case tpnme.ToInt if nArgs == 1 => constantFold1(longValue, _.toInt) - case tpnme.ToFloat if nArgs == 1 => constantFold1(longValue, _.toFloat) - case tpnme.ToDouble if nArgs == 1 => constantFold1(longValue, _.toDouble) + case tpnme.ToInt => constantFold1(longValue, _.toInt) + case tpnme.ToFloat => constantFold1(longValue, _.toFloat) + case tpnme.ToDouble => constantFold1(longValue, _.toDouble) case _ => None } else if (owner == defn.CompiletimeOpsFloatModuleClass) name match { - case tpnme.Abs if nArgs == 1 => constantFold1(floatValue, _.abs) - case tpnme.Negate if nArgs == 1 => constantFold1(floatValue, x => -x) - case tpnme.Plus if nArgs == 2 => constantFold2(floatValue, _ + _) - case tpnme.Minus if nArgs == 2 => constantFold2(floatValue, _ - _) - case tpnme.Times if nArgs == 2 => constantFold2(floatValue, _ * _) - case tpnme.Div if nArgs == 2 => constantFold2(floatValue, _ / _) - case tpnme.Mod if nArgs == 2 => constantFold2(floatValue, _ % _) - case tpnme.Lt if nArgs == 2 => constantFold2(floatValue, _ < _) - case tpnme.Gt if nArgs == 2 => constantFold2(floatValue, _ > _) - case tpnme.Ge if nArgs == 2 => constantFold2(floatValue, _ >= _) - case tpnme.Le if nArgs == 2 => constantFold2(floatValue, _ <= _) - case tpnme.Min if nArgs == 2 => constantFold2(floatValue, _ min _) - case tpnme.Max if nArgs == 2 => constantFold2(floatValue, _ max _) - case tpnme.ToInt if nArgs == 1 => constantFold1(floatValue, _.toInt) - case tpnme.ToLong if nArgs == 1 => constantFold1(floatValue, _.toLong) - case tpnme.ToDouble if nArgs == 1 => constantFold1(floatValue, _.toDouble) + case tpnme.Abs => constantFold1(floatValue, _.abs) + case tpnme.Negate => constantFold1(floatValue, x => -x) + case tpnme.Plus => constantFold2(floatValue, _ + _) + case tpnme.Minus => constantFold2(floatValue, _ - _) + case tpnme.Times => constantFold2(floatValue, _ * _) + case tpnme.Div => constantFold2(floatValue, _ / _) + case tpnme.Mod => constantFold2(floatValue, _ % _) + case tpnme.Lt => constantFold2(floatValue, _ < _) + case tpnme.Gt => constantFold2(floatValue, _ > _) + case tpnme.Ge => constantFold2(floatValue, _ >= _) + case tpnme.Le => constantFold2(floatValue, _ <= _) + case tpnme.Min => constantFold2(floatValue, _ min _) + case tpnme.Max => constantFold2(floatValue, _ max _) + case tpnme.ToInt => constantFold1(floatValue, _.toInt) + case tpnme.ToLong => constantFold1(floatValue, _.toLong) + case tpnme.ToDouble => constantFold1(floatValue, _.toDouble) case _ => None } else if (owner == defn.CompiletimeOpsDoubleModuleClass) name match { - case tpnme.Abs if nArgs == 1 => constantFold1(doubleValue, _.abs) - case tpnme.Negate if nArgs == 1 => constantFold1(doubleValue, x => -x) - case tpnme.Plus if nArgs == 2 => constantFold2(doubleValue, _ + _) - case tpnme.Minus if nArgs == 2 => constantFold2(doubleValue, _ - _) - case tpnme.Times if nArgs == 2 => constantFold2(doubleValue, _ * _) - case tpnme.Div if nArgs == 2 => constantFold2(doubleValue, _ / _) - case tpnme.Mod if nArgs == 2 => constantFold2(doubleValue, _ % _) - case tpnme.Lt if nArgs == 2 => constantFold2(doubleValue, _ < _) - case tpnme.Gt if nArgs == 2 => constantFold2(doubleValue, _ > _) - case tpnme.Ge if nArgs == 2 => constantFold2(doubleValue, _ >= _) - case tpnme.Le if nArgs == 2 => constantFold2(doubleValue, _ <= _) - case tpnme.Min if nArgs == 2 => constantFold2(doubleValue, _ min _) - case tpnme.Max if nArgs == 2 => constantFold2(doubleValue, _ max _) - case tpnme.ToInt if nArgs == 1 => constantFold1(doubleValue, _.toInt) - case tpnme.ToLong if nArgs == 1 => constantFold1(doubleValue, _.toLong) - case tpnme.ToFloat if nArgs == 1 => constantFold1(doubleValue, _.toFloat) + case tpnme.Abs => constantFold1(doubleValue, _.abs) + case tpnme.Negate => constantFold1(doubleValue, x => -x) + case tpnme.Plus => constantFold2(doubleValue, _ + _) + case tpnme.Minus => constantFold2(doubleValue, _ - _) + case tpnme.Times => constantFold2(doubleValue, _ * _) + case tpnme.Div => constantFold2(doubleValue, _ / _) + case tpnme.Mod => constantFold2(doubleValue, _ % _) + case tpnme.Lt => constantFold2(doubleValue, _ < _) + case tpnme.Gt => constantFold2(doubleValue, _ > _) + case tpnme.Ge => constantFold2(doubleValue, _ >= _) + case tpnme.Le => constantFold2(doubleValue, _ <= _) + case tpnme.Min => constantFold2(doubleValue, _ min _) + case tpnme.Max => constantFold2(doubleValue, _ max _) + case tpnme.ToInt => constantFold1(doubleValue, _.toInt) + case tpnme.ToLong => constantFold1(doubleValue, _.toLong) + case tpnme.ToFloat => constantFold1(doubleValue, _.toFloat) case _ => None } else if (owner == defn.CompiletimeOpsStringModuleClass) name match { - case tpnme.Plus if nArgs == 2 => constantFold2(stringValue, _ + _) - case tpnme.Length if nArgs == 1 => constantFold1(stringValue, _.length) - case tpnme.Matches if nArgs == 2 => constantFold2(stringValue, _ matches _) - case tpnme.Substring if nArgs == 3 => + case tpnme.Plus => constantFold2(stringValue, _ + _) + case tpnme.Length => constantFold1(stringValue, _.length) + case tpnme.Matches => constantFold2(stringValue, _ matches _) + case tpnme.Substring => constantFold3(stringValue, intValue, intValue, (s, b, e) => s.substring(b, e)) case _ => None } else if (owner == defn.CompiletimeOpsBooleanModuleClass) name match { - case tpnme.Not if nArgs == 1 => constantFold1(boolValue, x => !x) - case tpnme.And if nArgs == 2 => constantFold2(boolValue, _ && _) - case tpnme.Or if nArgs == 2 => constantFold2(boolValue, _ || _) - case tpnme.Xor if nArgs == 2 => constantFold2(boolValue, _ ^ _) + case tpnme.Not => constantFold1(boolValue, x => !x) + case tpnme.And => constantFold2(boolValue, _ && _) + case tpnme.Or => constantFold2(boolValue, _ || _) + case tpnme.Xor => constantFold2(boolValue, _ ^ _) case _ => None } else None From 23de5cdb0661dcfa89fd133f22c3d93515264eeb Mon Sep 17 00:00:00 2001 From: oronpo Date: Mon, 25 Oct 2021 21:10:02 -0400 Subject: [PATCH 0853/1244] improve `any.IsConst` to be evaluated only if its argument is concrete and known --- .../src/dotty/tools/dotc/core/Types.scala | 35 ++++++++++++++++--- library/src/scala/compiletime/ops/any.scala | 9 +++++ tests/neg/singleton-ops-any.scala | 8 ++++- 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index aa68f4cacad1..287030136b00 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4252,9 +4252,36 @@ object Types { case _ => None } - def isConst(tp : Type) : Option[Type] = tp.fixForEvaluation match { - case ConstantType(_) => Some(ConstantType(Constant(true))) - case _ => Some(ConstantType(Constant(false))) + val opsSet = Set( + defn.CompiletimeOpsAnyModuleClass, + defn.CompiletimeOpsIntModuleClass, + defn.CompiletimeOpsLongModuleClass, + defn.CompiletimeOpsFloatModuleClass, + defn.CompiletimeOpsBooleanModuleClass, + defn.CompiletimeOpsStringModuleClass + ) + + //Returns Some(true) if the type is a constant. + //Returns Some(false) if the type is not a constant. + //Returns None if there is not enough information to determine if the type is a constant. + //The type is a constant if it is a constant type or a type operation composition of constant types. + //If we get a type reference for an argument, then the result is not yet known. + def isConst(tp : Type) : Option[Boolean] = tp.dealias match { + //known to be constant + case ConstantType(_) => Some(true) + //currently not a concrete known type + case TypeRef(NoPrefix,_) => None + //currently not a concrete known type + case _ : TypeParamRef => None + //constant if the term is constant + case t : TermRef => isConst(t.underlying) + //an operation type => recursively check all argument compositions + case applied : AppliedType if opsSet.contains(applied.typeSymbol.owner) => + val argsConst = applied.args.map(isConst) + if (argsConst.exists(_.isEmpty)) None + else Some(argsConst.forall(_.get)) + //all other types are considered not to be constant + case _ => Some(false) } def expectArgsNum(expectedNum : Int) : Unit = @@ -4312,7 +4339,7 @@ object Types { case tpnme.Equals => constantFold2(constValue, _ == _) case tpnme.NotEquals => constantFold2(constValue, _ != _) case tpnme.ToString => constantFold1(constValue, _.toString) - case tpnme.IsConst => isConst(args.head) + case tpnme.IsConst => isConst(args.head).map(b => ConstantType(Constant(b))) case _ => None } else if (owner == defn.CompiletimeOpsIntModuleClass) name match { case tpnme.Abs => constantFold1(intValue, _.abs) diff --git a/library/src/scala/compiletime/ops/any.scala b/library/src/scala/compiletime/ops/any.scala index 60b86414a385..56605979474d 100644 --- a/library/src/scala/compiletime/ops/any.scala +++ b/library/src/scala/compiletime/ops/any.scala @@ -29,6 +29,15 @@ object any: * val c1: IsConst[1] = true * val c2: IsConst["hi"] = true * val c3: IsConst[false] = true + * val c4: IsConst[Any] = false + * ``` + * If the type is not yet known, then `IsConst` remains unevaluated, and + * will be evaluated only at its concrete type application. E.g.: + * ```scala + * //def `isConst`` returns the type `IsConst[X]`, since `X` is not yet known. + * def isConst[X] : IsConst[X] = ??? + * val c5 : true = isConst[1] //now the type is known to be a constant + * val c6 : false = isConst[Any] //now the type is known to be not a constant * ``` * @syntax markdown */ diff --git a/tests/neg/singleton-ops-any.scala b/tests/neg/singleton-ops-any.scala index 33951f58bcd9..45f63cf68ff1 100644 --- a/tests/neg/singleton-ops-any.scala +++ b/tests/neg/singleton-ops-any.scala @@ -30,5 +30,11 @@ object Test { final val two = 2 val t47 : IsConst[two.type] = true val t48: IsConst[Any] = true // error - + def isConst[X] : IsConst[X] = ??? + val t49 : true = isConst[1] + val t50 : false = isConst[one.type] + def isConst2[X <: Int, Y <: Int] : IsConst[X == Y] = ??? + val t51 : true = isConst2[1, 1] + val t52 : false = isConst2[1, one.type] + val t53 : true = isConst2[1, two.type] } From 621adef983486b363f9dac856fda37cfd104fb99 Mon Sep 17 00:00:00 2001 From: oronpo Date: Mon, 25 Oct 2021 21:44:16 -0400 Subject: [PATCH 0854/1244] Fix documentation errors. Remove redundant `long.ToString` --- library/src/scala/compiletime/ops/double.scala | 6 +++--- library/src/scala/compiletime/ops/float.scala | 6 +++--- library/src/scala/compiletime/ops/long.scala | 14 +++----------- library/src/scala/compiletime/ops/string.scala | 2 +- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/library/src/scala/compiletime/ops/double.scala b/library/src/scala/compiletime/ops/double.scala index e06ff64c3f05..e9b13ab9dcd6 100644 --- a/library/src/scala/compiletime/ops/double.scala +++ b/library/src/scala/compiletime/ops/double.scala @@ -31,7 +31,7 @@ object double: /** Integer division of two `Double` singleton types. * ```scala - * val div: 5.0 / 2.0 = 2.0 + * val div: 5.0 / 2.0 = 2.5 * ``` * @syntax markdown */ @@ -91,8 +91,8 @@ object double: /** Negation of an `Double` singleton type. * ```scala - * val neg1: Neg[-1.0] = 1.0 - * val neg2: Neg[1.0] = -1.0 + * val neg1: Negate[-1.0] = 1.0 + * val neg2: Negate[1.0] = -1.0 * ``` * @syntax markdown */ diff --git a/library/src/scala/compiletime/ops/float.scala b/library/src/scala/compiletime/ops/float.scala index d5aeb2d5f4f7..27a1a19c17c1 100644 --- a/library/src/scala/compiletime/ops/float.scala +++ b/library/src/scala/compiletime/ops/float.scala @@ -31,7 +31,7 @@ object float: /** Integer division of two `Float` singleton types. * ```scala - * val div: 5.0f / 2.0f = 2.0f + * val div: 5.0f / 2.0f = 2.5f * ``` * @syntax markdown */ @@ -91,8 +91,8 @@ object float: /** Negation of an `Float` singleton type. * ```scala - * val neg1: Neg[-1.0f] = 1.0f - * val neg2: Neg[1.0f] = -1.0f + * val neg1: Negate[-1.0f] = 1.0f + * val neg2: Negate[1.0f] = -1.0f * ``` * @syntax markdown */ diff --git a/library/src/scala/compiletime/ops/long.scala b/library/src/scala/compiletime/ops/long.scala index f3158e12c2f6..92e6bd370f5b 100644 --- a/library/src/scala/compiletime/ops/long.scala +++ b/library/src/scala/compiletime/ops/long.scala @@ -12,7 +12,7 @@ object long: * case 0L => 1L * case 1L => 2L * case 2L => 3L - * ... + * // ... * case 9223372036854775806L => 9223372036854775807L * } * ``` @@ -155,8 +155,8 @@ object long: /** Negation of an `Long` singleton type. * ```scala - * val neg1: Neg[-1L] = 1L - * val neg2: Neg[1L] = -1L + * val neg1: Negate[-1L] = 1L + * val neg2: Negate[1L] = -1L * ``` * @syntax markdown */ @@ -178,14 +178,6 @@ object long: */ type Max[X <: Long, Y <: Long] <: Long - /** String conversion of an `Long` singleton type. - * ```scala - * val abs: ToString[1L] = "1" - * ``` - * @syntax markdown - */ - type ToString[X <: Long] <: String - /** Number of zero bits preceding the highest-order ("leftmost") * one-bit in the two's complement binary representation of the specified `Long` singleton type. * Returns 64 if the specified singleton type has no one-bits in its two's complement representation, diff --git a/library/src/scala/compiletime/ops/string.scala b/library/src/scala/compiletime/ops/string.scala index 51e336ab7adc..6214f983db32 100644 --- a/library/src/scala/compiletime/ops/string.scala +++ b/library/src/scala/compiletime/ops/string.scala @@ -14,7 +14,7 @@ object string: /** Length of a `String` singleton type. * ```scala - * val helloSize: Size["hello"] = 5 + * val helloSize: Length["hello"] = 5 * ``` * @syntax markdown */ From b2b12a69d660abf2bd92bcc6e7a9d1c22fb207b0 Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Wed, 17 Nov 2021 17:43:36 +0100 Subject: [PATCH 0855/1244] Fix code formatting --- .../dotty/tools/dotc/core/Definitions.scala | 2 +- .../src/dotty/tools/dotc/core/Types.scala | 60 +++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 1ee40f5d1830..19ddcf7b16fe 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -1090,7 +1090,7 @@ class Definitions { tpnme.Abs, tpnme.Negate, tpnme.Min, tpnme.Max ) private val compiletimePackageIntTypes: Set[Name] = compiletimePackageNumericTypes ++ Set[Name]( - tpnme.ToString, //ToString is moved to ops.any and deprecated for ops.int + tpnme.ToString, // ToString is moved to ops.any and deprecated for ops.int tpnme.NumberOfLeadingZeros, tpnme.ToLong, tpnme.ToFloat, tpnme.ToDouble, tpnme.Xor, tpnme.BitwiseAnd, tpnme.BitwiseOr, tpnme.ASR, tpnme.LSL, tpnme.LSR ) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 287030136b00..b1007a32f5c4 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4206,14 +4206,14 @@ object Types { def tryCompiletimeConstantFold(using Context): Type = tycon match { case tycon: TypeRef if defn.isCompiletimeAppliedType(tycon.symbol) => - extension (tp : Type) def fixForEvaluation : Type = + extension (tp: Type) def fixForEvaluation: Type = tp.normalized.dealias match { - //enable operations for constant singleton terms. E.g.: - //``` - //final val one = 1 - //type Two = one.type + one.type - //``` - case tp : TermRef => tp.underlying + // enable operations for constant singleton terms. E.g.: + // ``` + // final val one = 1 + // type Two = one.type + one.type + // ``` + case tp: TermRef => tp.underlying case tp => tp } @@ -4261,43 +4261,43 @@ object Types { defn.CompiletimeOpsStringModuleClass ) - //Returns Some(true) if the type is a constant. - //Returns Some(false) if the type is not a constant. - //Returns None if there is not enough information to determine if the type is a constant. - //The type is a constant if it is a constant type or a type operation composition of constant types. - //If we get a type reference for an argument, then the result is not yet known. - def isConst(tp : Type) : Option[Boolean] = tp.dealias match { - //known to be constant + // Returns Some(true) if the type is a constant. + // Returns Some(false) if the type is not a constant. + // Returns None if there is not enough information to determine if the type is a constant. + // The type is a constant if it is a constant type or a type operation composition of constant types. + // If we get a type reference for an argument, then the result is not yet known. + def isConst(tp: Type): Option[Boolean] = tp.dealias match { + // known to be constant case ConstantType(_) => Some(true) - //currently not a concrete known type + // currently not a concrete known type case TypeRef(NoPrefix,_) => None - //currently not a concrete known type - case _ : TypeParamRef => None - //constant if the term is constant - case t : TermRef => isConst(t.underlying) - //an operation type => recursively check all argument compositions - case applied : AppliedType if opsSet.contains(applied.typeSymbol.owner) => + // currently not a concrete known type + case _: TypeParamRef => None + // constant if the term is constant + case t: TermRef => isConst(t.underlying) + // an operation type => recursively check all argument compositions + case applied: AppliedType if opsSet.contains(applied.typeSymbol.owner) => val argsConst = applied.args.map(isConst) if (argsConst.exists(_.isEmpty)) None else Some(argsConst.forall(_.get)) - //all other types are considered not to be constant + // all other types are considered not to be constant case _ => Some(false) } - def expectArgsNum(expectedNum : Int) : Unit = - //We can use assert instead of a compiler type error because this error should not - //occur since the type signature of the operation enforces the proper number of args. + def expectArgsNum(expectedNum: Int): Unit = + // We can use assert instead of a compiler type error because this error should not + // occur since the type signature of the operation enforces the proper number of args. assert(args.length == expectedNum, s"Type operation expects $expectedNum arguments but found ${args.length}") def natValue(tp: Type): Option[Int] = intValue(tp).filter(n => n >= 0 && n < Int.MaxValue) - //Runs the op and returns the result as a constant type. - //If the op throws an exception, then this exception is converted into a type error. - def runConstantOp(op : => Any): Type = + // Runs the op and returns the result as a constant type. + // If the op throws an exception, then this exception is converted into a type error. + def runConstantOp(op: => Any): Type = val result = try { op } catch { - case e : Throwable => + case e: Throwable => throw new TypeError(e.getMessage) } ConstantType(Constant(result)) @@ -4344,7 +4344,7 @@ object Types { } else if (owner == defn.CompiletimeOpsIntModuleClass) name match { case tpnme.Abs => constantFold1(intValue, _.abs) case tpnme.Negate => constantFold1(intValue, x => -x) - //ToString is deprecated for ops.int, and moved to ops.any + // ToString is deprecated for ops.int, and moved to ops.any case tpnme.ToString => constantFold1(intValue, _.toString) case tpnme.Plus => constantFold2(intValue, _ + _) case tpnme.Minus => constantFold2(intValue, _ - _) From 77784819e638dae12a85db8be72f3c06c328ef07 Mon Sep 17 00:00:00 2001 From: Oron Port Date: Mon, 22 Nov 2021 12:04:50 +0200 Subject: [PATCH 0856/1244] Add missing colon --- library/src/scala/compiletime/ops/long.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/scala/compiletime/ops/long.scala b/library/src/scala/compiletime/ops/long.scala index 92e6bd370f5b..718dec710068 100644 --- a/library/src/scala/compiletime/ops/long.scala +++ b/library/src/scala/compiletime/ops/long.scala @@ -5,7 +5,7 @@ import scala.annotation.experimental @experimental object long: - /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was + /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was: * * ```scala * type S[N <: Long] <: Long = N match { From 5f7a97be39dcdc048d60762515a37cccd3d61966 Mon Sep 17 00:00:00 2001 From: Oron Port Date: Mon, 22 Nov 2021 12:05:27 +0200 Subject: [PATCH 0857/1244] Add missing colon --- library/src/scala/compiletime/ops/int.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/scala/compiletime/ops/int.scala b/library/src/scala/compiletime/ops/int.scala index 8d62b98a27e4..3776e9e0d0d0 100644 --- a/library/src/scala/compiletime/ops/int.scala +++ b/library/src/scala/compiletime/ops/int.scala @@ -4,7 +4,7 @@ package ops import annotation.experimental object int: - /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was + /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was: * * ```scala * type S[N <: Int] <: Int = N match { @@ -226,4 +226,4 @@ object int: * @syntax markdown */ @experimental - type NumberOfLeadingZeros[X <: Int] <: Int \ No newline at end of file + type NumberOfLeadingZeros[X <: Int] <: Int From 5985dd1e71fe641f3459a525d32322b3f54072d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Wed, 10 Nov 2021 12:11:32 +0100 Subject: [PATCH 0858/1244] Fix links to unexisting types sites --- project/Build.scala | 20 +++++++++------- .../scaladoc/tasty/ClassLikeSupport.scala | 24 ++++++++++--------- .../tools/scaladoc/tasty/TypesSupport.scala | 4 +++- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index adbedca984dd..6d5bef45aff4 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -319,10 +319,11 @@ object Build { private lazy val currentYear: String = java.util.Calendar.getInstance().get(java.util.Calendar.YEAR).toString - lazy val scalacOptionsDocSettings = Seq( - "-external-mappings:" + - ".*scala/.*::scaladoc3::https://dotty.epfl.ch/api/," + - ".*java/.*::javadoc::https://docs.oracle.com/javase/8/docs/api/", + def scalacOptionsDocSettings(includeExternalMappings: Boolean = true) = { + val extMap = Seq("-external-mappings:" + + (if (includeExternalMappings) ".*scala/.*::scaladoc3::https://dotty.epfl.ch/api/," else "") + + ".*java/.*::javadoc::https://docs.oracle.com/javase/8/docs/api/") + Seq( "-skip-by-regex:.+\\.internal($|\\..+)", "-skip-by-regex:.+\\.impl($|\\..+)", "-project-logo", "docs/logo.svg", @@ -340,7 +341,8 @@ object Build { "-project-footer", s"Copyright (c) 2002-$currentYear, LAMP/EPFL", "-author", "-groups" - ) + ) ++ extMap + } // Settings used when compiling dotty with a non-bootstrapped dotty lazy val commonBootstrappedSettings = commonDottySettings ++ NoBloopExport.settings ++ Seq( @@ -423,7 +425,7 @@ object Build { assert(docScalaInstance.loaderCompilerOnly == base.loaderCompilerOnly) docScalaInstance }, - Compile / doc / scalacOptions ++= scalacOptionsDocSettings + Compile / doc / scalacOptions ++= scalacOptionsDocSettings() ) lazy val commonBenchmarkSettings = Seq( @@ -1266,7 +1268,7 @@ object Build { libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13) ) - def generateDocumentation(targets: Seq[String], name: String, outDir: String, ref: String, params: Seq[String] = Nil) = + def generateDocumentation(targets: Seq[String], name: String, outDir: String, ref: String, params: Seq[String] = Nil, includeExternalMappings: Boolean = true) = Def.taskDyn { val distLocation = (dist / pack).value val projectVersion = version.value @@ -1294,7 +1296,7 @@ object Build { dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "dotty") + "=", "#library/src"), dottySrcLink(referenceVersion), "-Ygenerate-inkuire", - ) ++ scalacOptionsDocSettings ++ revision ++ params ++ targets + ) ++ scalacOptionsDocSettings(includeExternalMappings) ++ revision ++ params ++ targets import _root_.scala.sys.process._ val escapedCmd = cmd.map(arg => if(arg.contains(" ")) s""""$arg"""" else arg) Def.task { @@ -1424,7 +1426,7 @@ object Build { "https://scala-lang.org/api/versions.json", "-Ydocument-synthetic-types", s"-snippet-compiler:${dottyLibRoot}/scala/quoted=compile,${dottyLibRoot}/scala/compiletime=compile" - ) ++ (if (justAPI) Nil else Seq("-siteroot", "docs-for-dotty-page", "-Yapi-subdirectory"))) + ) ++ (if (justAPI) Nil else Seq("-siteroot", "docs-for-dotty-page", "-Yapi-subdirectory")), includeExternalMappings = false) if (dottyJars.isEmpty) Def.task { streams.value.log.error("Dotty lib wasn't found") } else if (justAPI) generateDocTask diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala index d64aa8d67874..0ff21cda60c1 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala @@ -70,19 +70,21 @@ trait ClassLikeSupport: case tree: ClassDef => tree case tt: TypeTree => unpackTreeToClassDef(tt.tpe.typeSymbol.tree) - def getSupertypesGraph(classDef: Tree, link: LinkToType): Seq[(LinkToType, LinkToType)] = - val smbl = classDef.symbol - val parents = unpackTreeToClassDef(classDef).parents - parents.flatMap { case tree => + def getSupertypesGraph(link: LinkToType, to: Seq[Tree]): Seq[(LinkToType, LinkToType)] = + to.flatMap { case tree => val symbol = if tree.symbol.isClassConstructor then tree.symbol.owner else tree.symbol val superLink = LinkToType(tree.asSignature, symbol.dri, bareClasslikeKind(symbol)) - Seq(link -> superLink) ++ getSupertypesGraph(tree, superLink) + val nextTo = unpackTreeToClassDef(tree).parents + if symbol.isHiddenByVisibility then getSupertypesGraph(link, nextTo) + else Seq(link -> superLink) ++ getSupertypesGraph(superLink, nextTo) } - val supertypes = getSupertypes(using qctx)(classDef).map { - case (symbol, tpe) => - LinkToType(tpe.asSignature, symbol.dri, bareClasslikeKind(symbol)) - } + val supertypes = getSupertypes(using qctx)(classDef) + .filterNot((s, t) => s.isHiddenByVisibility) + .map { + case (symbol, tpe) => + LinkToType(tpe.asSignature, symbol.dri, bareClasslikeKind(symbol)) + } val selfType = classDef.self.map { (valdef: ValDef) => val symbol = valdef.symbol val tpe = valdef.tpt.tpe @@ -91,7 +93,7 @@ trait ClassLikeSupport: val selfSignature: DSignature = typeForClass(classDef).asSignature val graph = HierarchyGraph.withEdges( - getSupertypesGraph(classDef, LinkToType(selfSignature, classDef.symbol.dri, bareClasslikeKind(classDef.symbol))) + getSupertypesGraph(LinkToType(selfSignature, classDef.symbol.dri, bareClasslikeKind(classDef.symbol)), unpackTreeToClassDef(classDef).parents) ) val baseMember = mkMember(classDef.symbol, kindForClasslike(classDef), selfSignature)( @@ -255,7 +257,7 @@ trait ClassLikeSupport: case t: TypeTree => t.tpe.typeSymbol case tree if tree.symbol.isClassConstructor => tree.symbol.owner case tree => tree.symbol - if parentSymbol != defn.ObjectClass && parentSymbol != defn.AnyClass + if parentSymbol != defn.ObjectClass && parentSymbol != defn.AnyClass && !parentSymbol.isHiddenByVisibility yield (parentTree, parentSymbol) def getConstructors: List[Symbol] = c.membersToDocument.collect { diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala index 147b5c40d21b..d825b7ab6c31 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala @@ -61,8 +61,10 @@ trait TypesSupport: extension (on: SignaturePart) def l: List[SignaturePart] = List(on) private def tpe(using Quotes)(symbol: reflect.Symbol): SSignature = + import SymOps._ val suffix = if symbol.isValDef || symbol.flags.is(reflect.Flags.Module) then plain(".type").l else Nil - dotty.tools.scaladoc.Type(symbol.normalizedName, Some(symbol.dri)) :: suffix + val dri: Option[DRI] = Option(symbol).filterNot(_.isHiddenByVisibility).map(_.dri) + dotty.tools.scaladoc.Type(symbol.normalizedName, dri) :: suffix private def commas(lists: List[SSignature]) = lists match case List(single) => single From afbd0f8beed5967758fb5e7f78139098e6d6f13b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wro=C5=84ski?= <46607934+lwronski@users.noreply.github.com> Date: Tue, 30 Nov 2021 10:13:14 +0100 Subject: [PATCH 0859/1244] Automate releases to SDKMAN (#13885) --- .github/workflows/releases.yml | 24 ++++++++++ .github/workflows/scripts/publish-sdkman.sh | 50 +++++++++++++++++++++ docs/docs/contributing/checklist.sh | 1 + 3 files changed, 75 insertions(+) create mode 100644 .github/workflows/releases.yml create mode 100755 .github/workflows/scripts/publish-sdkman.sh diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml new file mode 100644 index 000000000000..2bb6d3e49282 --- /dev/null +++ b/.github/workflows/releases.yml @@ -0,0 +1,24 @@ +name: Releases +on: + workflow_dispatch: + +jobs: + publish_release: + runs-on: [self-hosted, Linux] + container: + image: lampepfl/dotty:2021-03-22 + options: --cpu-shares 4096 + + env: + SDKMAN_KEY: ${{ secrets.SDKMAN_KEY }} + SDKMAN_TOKEN: ${{ secrets.SDKMAN_TOKEN }} + + steps: + - name: Reset existing repo + run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + + - name: Cleanup + run: .github/workflows/cleanup.sh + + - name: Publish to SDKMAN + run: .github/workflows/scripts/publish-sdkman.sh diff --git a/.github/workflows/scripts/publish-sdkman.sh b/.github/workflows/scripts/publish-sdkman.sh new file mode 100755 index 000000000000..07d35a72a65e --- /dev/null +++ b/.github/workflows/scripts/publish-sdkman.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +# This is script for publishing scala on SDKMAN. +# Script resolves the latest stable version of scala and then send REST request to SDKMAN Vendor API. +# It's releasing and announcing the release of scala on SDKMAN. +# +# Requirement: +# - the latest stable version of scala should be available in github artifacts + +set -u + +# latest stable dotty version +DOTTY_VERSION=$(curl -s https://api.github.com/repos/lampepfl/dotty/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') +DOTTY_URL="https://github.com/lampepfl/dotty/releases/download/$DOTTY_VERSION/scala3-$DOTTY_VERSION.zip" + +# checking if dotty version is available +if ! curl --output /dev/null --silent --head --fail "$DOTTY_URL"; then + echo "URL doesn't exist: $DOTTY_URL" + exit 1 +fi + +# Release a new Candidate Version +curl --silent --show-error --fail \ + -X POST \ + -H "Consumer-Key: $SDKMAN_KEY" \ + -H "Consumer-Token: $SDKMAN_TOKEN" \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -d '{"candidate": "scala", "version": "'"$DOTTY_VERSION"'", "url": "'"$DOTTY_URL"'"}' \ + https://vendors.sdkman.io/release + +if [[ $? -ne 0 ]]; then + echo "Fail sending POST request to releasing scala on SDKMAN." + exit 1 +fi + +# Set DOTTY_VERSION as Default for Candidate +curl --silent --show-error --fail \ + -X PUT \ + -H "Consumer-Key: $SDKMAN_KEY" \ + -H "Consumer-Token: $SDKMAN_TOKEN" \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -d '{"candidate": "scala", "version": "'"$DOTTY_VERSION"'"}' \ + https://vendors.sdkman.io/default + +if [[ $? -ne 0 ]]; then + echo "Fail sending PUT request to announcing the release of scala on SDKMAN." + exit 1 +fi diff --git a/docs/docs/contributing/checklist.sh b/docs/docs/contributing/checklist.sh index 827f0911d84d..d3cfe70b4e21 100755 --- a/docs/docs/contributing/checklist.sh +++ b/docs/docs/contributing/checklist.sh @@ -48,6 +48,7 @@ LIST='- [ ] Publish artifacts to Maven via CI - [ ] Publish Blog Post on dotty.epfl.ch - [ ] Make an announcement thread on https://contributors.scala-lang.org - [ ] Tweet the announcement blog post on https://twitter.com/scala_lang + - [ ] Run workflow releases CI to publish scala on SDKMAN - https://github.com/lampepfl/dotty/actions/workflows/releases.yml [Instructions on how to release](https://dotty.epfl.ch/docs/contributing/release.html)' From f9aa3be865d51b48ec2a3399755965e47578687f Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak <32793002+BarkingBad@users.noreply.github.com> Date: Tue, 30 Nov 2021 16:43:37 +0100 Subject: [PATCH 0860/1244] Scaladoc features parity with old scaladoc/docs.scala-lang (#13954) * POC * Walk in order and collect previous/next * Add `Edit on Github` button and `Contriubuted` sections * Polish gathering the contributors. CSSes fixes. * Fix tooltipping snippets * Fix handling relative links for static site * Add redirects mechanism for scaladoc * Fix leftover * Fix tests * Fix gathering index html for sections without explicit index * Apply requested changes to scaladoc * Decouple Scala.js jses. Move contributors to be independent asset/ * Add support for multiple redirects * Apply requested changes. Add static site for testcases. Fix minor bugs in scaladoc. * Fix tests --- .github/workflows/scaladoc.yaml | 2 +- build.sbt | 5 +- docs/_layouts/blog-page.html | 4 +- docs/_layouts/doc-page.html | 25 +++-- docs/_layouts/main.html | 11 +- docs/_layouts/redirect.html | 14 +++ docs/_layouts/static-site-main.html | 49 +++++++++ docs/blog/index.html | 2 +- docs/css/dottydoc.css | 6 +- .../reference/experimental/named-typeargs.md | 1 + .../other-new-features/named-typeargs.md | 7 -- project/Build.scala | 102 ++++++++---------- project/CopyDocs.scala | 46 ++++---- project/DocumentationWebsite.scala | 85 +++++++++++++++ project/scripts/cmdScaladocTests | 1 + .../css}/code-snippets.css | 10 +- .../{resources => common/css}/searchbar.css | 0 .../css}/social-links.css | 0 scaladoc-js/{resources => common/css}/ux.css | 0 .../css}/versions-dropdown.css | 0 .../src/code-snippets/CodeSnippets.scala | 0 .../code-snippets/CodeSnippetsGlobals.scala | 0 .../src/code-snippets/Scastie.scala | 0 .../contributors/css/content-contributors.css | 24 +++++ scaladoc-js/contributors/src/Globals.scala | 11 ++ scaladoc-js/contributors/src/Main.scala | 5 + .../ContentContributors.scala | 78 ++++++++++++++ scaladoc-js/{ => main}/src/Globals.scala | 0 scaladoc-js/main/src/Main.scala | 10 ++ .../{ => main}/src/searchbar/PageEntry.scala | 0 .../{ => main}/src/searchbar/Searchbar.scala | 0 .../src/searchbar/SearchbarComponent.scala | 0 .../src/searchbar/SearchbarGlobals.scala | 0 .../engine/InkuireJSSearchEngine.scala | 0 .../src/searchbar/engine/Matchers.scala | 0 .../src/searchbar/engine/QueryParser.scala | 0 .../searchbar/engine/SearchbarEngine.scala | 0 .../src/social-links/SocialLinks.scala | 0 .../TooltipNormalizer.scala | 25 +++++ scaladoc-js/{ => main}/src/ux/Ux.scala | 0 .../versions-dropdown/DropdownHandler.scala | 0 .../dotty/tools/scaladoc}/MatchersTest.scala | 0 .../tools/scaladoc}/QueryParserTest.scala | 2 +- scaladoc-js/markdown/src/Main.scala | 5 + scaladoc-js/src/Main.scala | 22 ---- .../docs/_layouts/redirect.html | 14 +++ .../docs/_layouts/static-site-main.html | 22 ++++ scaladoc-testcases/docs/css/bootstrap.min.css | 1 + scaladoc-testcases/docs/docs/docs/f1.md | 7 ++ scaladoc-testcases/docs/docs/docs/f2.md | 4 + scaladoc-testcases/docs/docs/docs/f3.md | 4 + scaladoc-testcases/docs/docs/docs/f4.md | 4 + scaladoc-testcases/docs/sidebar.yml | 7 ++ .../resources/dotty_res/styles/scalastyle.css | 86 +++++++++++++-- .../src/dotty/tools/scaladoc/Scaladoc.scala | 2 + .../tools/scaladoc/ScaladocSettings.scala | 10 ++ .../dotty/tools/scaladoc/SourceLinks.scala | 22 +++- .../scaladoc/renderers/HtmlRenderer.scala | 14 ++- .../tools/scaladoc/renderers/Renderer.scala | 48 ++++++++- .../scaladoc/renderers/SiteRenderer.scala | 2 +- .../tools/scaladoc/site/LoadedTemplate.scala | 9 +- .../scaladoc/site/StaticSiteContext.scala | 73 +++++++++---- .../dotty/tools/scaladoc/site/templates.scala | 10 +- .../comments/markdown/SnippetRenderer.scala | 2 +- .../dotty/tools/scaladoc/ReportingTest.scala | 2 +- 65 files changed, 718 insertions(+), 177 deletions(-) create mode 100644 docs/_layouts/redirect.html create mode 100644 docs/_layouts/static-site-main.html delete mode 100644 docs/docs/reference/other-new-features/named-typeargs.md create mode 100644 project/DocumentationWebsite.scala rename scaladoc-js/{resources => common/css}/code-snippets.css (97%) rename scaladoc-js/{resources => common/css}/searchbar.css (100%) rename scaladoc-js/{resources => common/css}/social-links.css (100%) rename scaladoc-js/{resources => common/css}/ux.css (100%) rename scaladoc-js/{resources => common/css}/versions-dropdown.css (100%) rename scaladoc-js/{ => common}/src/code-snippets/CodeSnippets.scala (100%) rename scaladoc-js/{ => common}/src/code-snippets/CodeSnippetsGlobals.scala (100%) rename scaladoc-js/{ => common}/src/code-snippets/Scastie.scala (100%) create mode 100644 scaladoc-js/contributors/css/content-contributors.css create mode 100644 scaladoc-js/contributors/src/Globals.scala create mode 100644 scaladoc-js/contributors/src/Main.scala create mode 100644 scaladoc-js/contributors/src/content-contributors/ContentContributors.scala rename scaladoc-js/{ => main}/src/Globals.scala (100%) create mode 100644 scaladoc-js/main/src/Main.scala rename scaladoc-js/{ => main}/src/searchbar/PageEntry.scala (100%) rename scaladoc-js/{ => main}/src/searchbar/Searchbar.scala (100%) rename scaladoc-js/{ => main}/src/searchbar/SearchbarComponent.scala (100%) rename scaladoc-js/{ => main}/src/searchbar/SearchbarGlobals.scala (100%) rename scaladoc-js/{ => main}/src/searchbar/engine/InkuireJSSearchEngine.scala (100%) rename scaladoc-js/{ => main}/src/searchbar/engine/Matchers.scala (100%) rename scaladoc-js/{ => main}/src/searchbar/engine/QueryParser.scala (100%) rename scaladoc-js/{ => main}/src/searchbar/engine/SearchbarEngine.scala (100%) rename scaladoc-js/{ => main}/src/social-links/SocialLinks.scala (100%) create mode 100644 scaladoc-js/main/src/tooltip-normalizer/TooltipNormalizer.scala rename scaladoc-js/{ => main}/src/ux/Ux.scala (100%) rename scaladoc-js/{ => main}/src/versions-dropdown/DropdownHandler.scala (100%) rename scaladoc-js/{test/dotty/dokka => main/test/dotty/tools/scaladoc}/MatchersTest.scala (100%) rename scaladoc-js/{test/dotty/dokka => main/test/dotty/tools/scaladoc}/QueryParserTest.scala (99%) create mode 100644 scaladoc-js/markdown/src/Main.scala delete mode 100644 scaladoc-js/src/Main.scala create mode 100644 scaladoc-testcases/docs/_layouts/redirect.html create mode 100644 scaladoc-testcases/docs/_layouts/static-site-main.html create mode 100644 scaladoc-testcases/docs/css/bootstrap.min.css create mode 100644 scaladoc-testcases/docs/docs/docs/f1.md create mode 100644 scaladoc-testcases/docs/docs/docs/f2.md create mode 100644 scaladoc-testcases/docs/docs/docs/f3.md create mode 100644 scaladoc-testcases/docs/docs/docs/f4.md create mode 100644 scaladoc-testcases/docs/sidebar.yml diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml index dbe0628751c1..080b77fcb054 100644 --- a/.github/workflows/scaladoc.yaml +++ b/.github/workflows/scaladoc.yaml @@ -36,7 +36,7 @@ jobs: java-version: 11 - name: Compile and test scala3doc-js - run: ./project/scripts/sbt scaladoc-js/test + run: ./project/scripts/sbt scaladoc-js-main/test - name: Compile and test run: | diff --git a/build.sbt b/build.sbt index 81494a996bda..5add443e0a64 100644 --- a/build.sbt +++ b/build.sbt @@ -20,7 +20,10 @@ val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped` val `tasty-core-scala2` = Build.`tasty-core-scala2` val scaladoc = Build.scaladoc val `scaladoc-testcases` = Build.`scaladoc-testcases` -val `scaladoc-js` = Build.`scaladoc-js` +val `scaladoc-js-common` = Build.`scaladoc-js-common` +val `scaladoc-js-main` = Build.`scaladoc-js-main` +val `scaladoc-js-markdown` = Build.`scaladoc-js-markdown` +val `scaladoc-js-contributors` = Build.`scaladoc-js-contributors` val `scala3-bench-run` = Build.`scala3-bench-run` val dist = Build.dist val `community-build` = Build.`community-build` diff --git a/docs/_layouts/blog-page.html b/docs/_layouts/blog-page.html index 6baad3d40ed8..c5d0fe8875e7 100644 --- a/docs/_layouts/blog-page.html +++ b/docs/_layouts/blog-page.html @@ -1,7 +1,7 @@ --- -layout: main +layout: static-site-main --- -
+

{{ page.title }}

diff --git a/docs/_layouts/doc-page.html b/docs/_layouts/doc-page.html index 24e69741da00..57980aac0d3d 100644 --- a/docs/_layouts/doc-page.html +++ b/docs/_layouts/doc-page.html @@ -1,9 +1,22 @@ --- -layout: main +layout: static-site-main --- -
-
-

{{ page.title }}

-
- {{ content }} +
+
+

{{ page.title }}

+ {% if urls.editSource %} +
+ + + Edit this page on GitHub + +
+ {% endif %} +
+ {{ content }} +
+ diff --git a/docs/_layouts/main.html b/docs/_layouts/main.html index e265ac1bed16..5a9a2c1f2254 100644 --- a/docs/_layouts/main.html +++ b/docs/_layouts/main.html @@ -1,13 +1,12 @@ --- layout: base +extraJS: + - js/contributors.js +extraCSS: + - css/content-contributors.css ---
- {% if page.movedTo %} - - {% endif %} - {{ content }} + {{ content }}
+ + +

Redirecting…

+ Click here if you were not redirected. + diff --git a/docs/_layouts/static-site-main.html b/docs/_layouts/static-site-main.html new file mode 100644 index 000000000000..b3e635a09bfb --- /dev/null +++ b/docs/_layouts/static-site-main.html @@ -0,0 +1,49 @@ +--- +layout: main +--- +
+ + {% if page.movedTo %} + + {% endif %} + {{ content }} + +
diff --git a/docs/blog/index.html b/docs/blog/index.html index bda44590edac..b1ad4787b41b 100644 --- a/docs/blog/index.html +++ b/docs/blog/index.html @@ -1,5 +1,5 @@ --- -layout: main +layout: static-site-main title: Blog ---
diff --git a/docs/css/dottydoc.css b/docs/css/dottydoc.css index 18b3dbf9072d..3dd8b13bfaa2 100644 --- a/docs/css/dottydoc.css +++ b/docs/css/dottydoc.css @@ -25,6 +25,10 @@ main > h1 { margin-bottom: 20px; } +.byline { + font-size: 14px; +} + .byline, .byline a { color: grey; } @@ -265,4 +269,4 @@ aside.success { header { position: static !important; width: 100% !important; -} \ No newline at end of file +} diff --git a/docs/docs/reference/experimental/named-typeargs.md b/docs/docs/reference/experimental/named-typeargs.md index 0abdd9d40e29..5e80a755293c 100644 --- a/docs/docs/reference/experimental/named-typeargs.md +++ b/docs/docs/reference/experimental/named-typeargs.md @@ -2,6 +2,7 @@ layout: singlepage-overview scala3: true title: "Named Type Arguments" +redirectFrom: reference/other-new-features/named-typeargs.html --- **Note:** This feature is implemented in Scala 3, but is not expected to be part of Scala 3.0. diff --git a/docs/docs/reference/other-new-features/named-typeargs.md b/docs/docs/reference/other-new-features/named-typeargs.md deleted file mode 100644 index 98009d4f3b7d..000000000000 --- a/docs/docs/reference/other-new-features/named-typeargs.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -layout: singlepage-overview -scala3: true -title: "Named Type Arguments" ---- - -[Document was moved](../experimental/named-typeargs.md) diff --git a/project/Build.scala b/project/Build.scala index 6d5bef45aff4..fa9079362a50 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -340,7 +340,8 @@ object Build { "-skip-by-id:scala.runtime.MatchCase", "-project-footer", s"Copyright (c) 2002-$currentYear, LAMP/EPFL", "-author", - "-groups" + "-groups", + "-default-template", "static-site-main" ) ++ extMap } @@ -1255,16 +1256,43 @@ object Build { lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")). dependsOn(`scala3-compiler-bootstrapped`). settings(commonBootstrappedSettings) - lazy val `scaladoc-js` = project.in(file("scaladoc-js")). + + + /** + * Collection of projects building targets for scaladoc, these are: + * - common - common module for javascript shared among html and markdown outpu + * - main - main target for default scaladoc producing html webpage + * - markdown - companion js for preprocessing features. Can be later used with some templating engine + * - contributors - not related project to any of forementioned modules. Used for presenting contributors for static site. + * Made as an indepented project to be scaladoc-agnostic. + */ + lazy val `scaladoc-js-common` = project.in(file("scaladoc-js/common")). + enablePlugins(DottyJSPlugin). + dependsOn(`scala3-library-bootstrappedJS`). + settings(libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13)) + + lazy val `scaladoc-js-main` = project.in(file("scaladoc-js/main")). + enablePlugins(DottyJSPlugin). + dependsOn(`scaladoc-js-common`). + settings( + scalaJSUseMainModuleInitializer := true, + Test / fork := false + ) + + lazy val `scaladoc-js-markdown` = project.in(file("scaladoc-js/markdown")). + enablePlugins(DottyJSPlugin). + dependsOn(`scaladoc-js-common`). + settings( + scalaJSUseMainModuleInitializer := true, + Test / fork := false + ) + + lazy val `scaladoc-js-contributors` = project.in(file("scaladoc-js/contributors")). enablePlugins(DottyJSPlugin). dependsOn(`scala3-library-bootstrappedJS`). settings( - Compile / scalaJSMainModuleInitializer := (sys.env.get("scaladoc.projectFormat") match { - case Some("md") => Some(ModuleInitializer.mainMethod("dotty.tools.scaladoc.Main", "markdownMain")) - case _ => Some(ModuleInitializer.mainMethod("dotty.tools.scaladoc.Main", "main")) - }), Test / fork := false, - Compile / scalaJSUseMainModuleInitializer := true, + scalaJSUseMainModuleInitializer := true, libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13) ) @@ -1294,6 +1322,7 @@ object Build { name, scalaSrcLink(stdLibVersion, srcManaged(dottyNonBootstrappedVersion, "scala") + "="), dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "dotty") + "=", "#library/src"), + dottySrcLink(referenceVersion, "docs-for-dotty-page=", "#docs"), dottySrcLink(referenceVersion), "-Ygenerate-inkuire", ) ++ scalacOptionsDocSettings(includeExternalMappings) ++ revision ++ params ++ targets @@ -1318,54 +1347,13 @@ object Build { ). settings( Compile / resourceGenerators += Def.task { - val jsDestinationFile = (Compile / resourceManaged).value / "dotty_res" / "scripts" / "scaladoc-scalajs.js" - sbt.IO.copyFile((`scaladoc-js` / Compile / fullOptJS).value.data, jsDestinationFile) - Seq(jsDestinationFile) - }.taskValue, - Compile / resourceGenerators += Def.task { - Seq("code-snippets.css", "searchbar.css", "social-links.css", "ux.css", "versions-dropdown.css").map { file => - val cssDesitnationFile = (Compile / resourceManaged).value / "dotty_res" / "styles" / file - val cssSourceFile = (`scaladoc-js` / Compile / resourceDirectory).value / file - sbt.IO.copyFile(cssSourceFile, cssDesitnationFile) - cssDesitnationFile - } - }.taskValue, - Compile / resourceGenerators += Def.task { - import _root_.scala.sys.process._ - import _root_.scala.concurrent._ - import _root_.scala.concurrent.duration.Duration - import ExecutionContext.Implicits.global - val inkuireVersion = "1.0.0-M3" - val inkuireLink = s"https://github.com/VirtusLab/Inkuire/releases/download/$inkuireVersion/inkuire.js" - val inkuireDestinationFile = (Compile / resourceManaged).value / "dotty_res" / "scripts" / "inkuire.js" - sbt.IO.touch(inkuireDestinationFile) - - def tryFetch(retries: Int, timeout: Duration): Unit = { - val downloadProcess = (new java.net.URL(inkuireLink) #> inkuireDestinationFile).run() - val result: Future[Int] = Future(blocking(downloadProcess.exitValue())) - try { - Await.result(result, timeout) match { - case 0 => - case res if retries > 0 => - println(s"Failed to fetch inkuire.js from $inkuireLink: Error code $res. $retries retries left") - tryFetch(retries - 1, timeout) - case res => throw new MessageOnlyException(s"Failed to fetch inkuire.js from $inkuireLink: Error code $res") - } - } catch { - case e: TimeoutException => - downloadProcess.destroy() - if (retries > 0) { - println(s"Failed to fetch inkuire.js from $inkuireLink: Download timeout. $retries retries left") - tryFetch(retries - 1, timeout) - } - else { - throw new MessageOnlyException(s"Failed to fetch inkuire.js from $inkuireLink: Download timeout") - } - } - } - - tryFetch(5, Duration(60, "s")) - Seq(inkuireDestinationFile) + DocumentationWebsite.generateStaticAssets( + (`scaladoc-js-contributors` / Compile / fullOptJS).value.data, + (`scaladoc-js-main` / Compile / fullOptJS).value.data, + (`scaladoc-js-contributors` / Compile / baseDirectory).value / "css", + (`scaladoc-js-common` / Compile / baseDirectory).value / "css", + (Compile / resourceManaged).value, + ) }.taskValue, libraryDependencies ++= Dependencies.flexmarkDeps ++ Seq( "nl.big-o" % "liqp" % "0.6.8", @@ -1456,10 +1444,10 @@ object Build { case _ => throw new IllegalArgumentException("No js destination provided") } val jsDestinationFile: File = Paths.get(destJS).toFile - sbt.IO.copyFile((`scaladoc-js` / Compile / fullOptJS).value.data, jsDestinationFile) + sbt.IO.copyFile((`scaladoc-js-markdown` / Compile / fullOptJS).value.data, jsDestinationFile) csses.map { file => val cssDesitnationFile = Paths.get(destCSS).toFile / file - val cssSourceFile = (`scaladoc-js` / Compile / resourceDirectory).value / file + val cssSourceFile = (`scaladoc-js-markdown` / Compile / resourceDirectory).value / file sbt.IO.copyFile(cssSourceFile, cssDesitnationFile) cssDesitnationFile } diff --git a/project/CopyDocs.scala b/project/CopyDocs.scala index d8bcd4474824..e9a7c59ecd01 100644 --- a/project/CopyDocs.scala +++ b/project/CopyDocs.scala @@ -19,10 +19,6 @@ object CopyDocs { */ val outputDir = FileSystems.getDefault.getPath("docs-for-dotty-page") - implicit def stringToFun(s: String): MyParams => String = _ => s - - // Patterns, for convenience - val titlePattern = "(?s)^---\n.*?title: ([^\n]*).*?---" val jekyllLinkPattern = """\{\% link _overviews/scala3-reference(.*) %\}""" val jekyllLinkSubstitution = "..$1" val jekyllLinkPattern2 = """\{\% link _overviews/scala3-scaladoc(.*) %\}""" @@ -30,9 +26,7 @@ object CopyDocs { val localLinkPattern = """\((?!http|www)(.*).html\)""" val localLinkSubstitution = "($1.md)" - case class MyParams(newPath: String) - - val commonTransformations: Set[(String, MyParams => String)] = Set( + val commonTransformations: Map[String, String] = Map( jekyllLinkPattern -> jekyllLinkSubstitution, jekyllLinkPattern2 -> jekyllLinkSubstitution2, localLinkPattern -> localLinkSubstitution, @@ -40,33 +34,29 @@ object CopyDocs { /** * Structure for holding which transformations should be applied to which directories. - * The outer map is holding morphism `directory prefix` -> `set of transformations`. - * The inner set is a collection of pairs `regex pattern` -> `substitution value`. + * The outer map is holding morphism `directory prefix` -> `List of transformations`. + * The inner list is a collection of pairs `regex pattern` -> `substitution value`. */ - val transformationMap: Map[String, Set[(String, MyParams => String)]] = Map( - "docs/docs/usage/scaladoc/index.md" -> Set( + val transformationMap: Map[String, Map[String, String]] = Map( + "docs/docs/usage/scaladoc/index.md" -> Map( ("""\{\{ site\.baseurl \}\}/resources/images/scala3/scaladoc/logo\.svg""" -> "images/scaladoc_logo.svg"), ), - "docs/docs/usage/scaladoc/site-versioning.md" -> Set( + "docs/docs/usage/scaladoc/site-versioning.md" -> Map( ("""/resources/images/scala3/scaladoc/nightly\.gif""" -> "images/scaladoc/nightly.gif"), ), - "docs/docs/usage/scaladoc/search-engine.md" -> Set( + "docs/docs/usage/scaladoc/search-engine.md" -> Map( ("""/resources/images/scala3/scaladoc/inkuire-1\.0\.0-M2_js_flatMap\.gif""" -> "images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif"), ), - "docs/docs/reference/other-new-features/explicit-nulls.md" -> Set( + "docs/docs/reference/other-new-features/explicit-nulls.md" -> Map( ("""/resources/images/scala3/explicit-nulls/explicit-nulls-type-hierarchy\.png""" -> "images/explicit-nulls/explicit-nulls-type-hierarchy.png"), ), - "docs/docs/reference/" -> (commonTransformations + - (titlePattern -> ((p) => s"---\nlayout: doc-page\ntitle: $$1\nmovedTo: https://docs.scala-lang.org/scala3/reference/${p.newPath}.html\n---")), - ), + "docs/docs/reference/" -> commonTransformations, - "docs/docs/usage/scaladoc/" -> (commonTransformations + - (titlePattern -> s"---\ntitle: $$1\n---"), - ), + "docs/docs/usage/scaladoc/" -> commonTransformations ) def copyDocs() = { @@ -75,14 +65,24 @@ object CopyDocs { Files.createDirectories(newPath.getParent()) path.toString match { - case s if s.startsWith("docs/docs/") => + case s if s.startsWith("docs/docs/") && s.endsWith(".md") => val inputStream = Source.fromFile(path.toFile)(Codec.UTF8) val fileContent = inputStream.getLines().mkString("\n") new PrintStream(newPath.toFile) { val patterns = transformationMap.filter { case (k, v) => path.toString.startsWith(k) }.flatMap(_._2) - val params = MyParams(newPath = s.stripPrefix("docs/docs/reference/").stripSuffix(".md")) - val transformed = patterns.foldLeft(fileContent) { case (res, (pattern, substitution)) => res.replaceAll(pattern, substitution(params)) } + val _ :: frontMatter :: actualContent :: Nil = fileContent.split("---", 3).toList + write("---".getBytes("UTF8")) + val frontMatterSplitted = frontMatter.split("\n(?=[^\\s])") + val frontMatterUpdated = List( + Some("layout: doc-page"), + frontMatterSplitted.find(_.startsWith("title")), + frontMatterSplitted.find(_.startsWith("redirectFrom")), + if (s.startsWith("docs/docs/reference/")) Some(s"movedTo: https://docs.scala-lang.org/scala3/reference/${s.stripPrefix("docs/docs/reference/").stripSuffix(".md")}.html") else None + ).flatten.mkString("\n", "\n", "\n") + write(frontMatterUpdated.getBytes("UTF8")) + write("---\n".getBytes("UTF8")) + val transformed = patterns.foldLeft(actualContent) { case (res, (pattern, substitution)) => res.replaceAll(pattern, substitution) } write(transformed.getBytes("UTF8")) } case s => diff --git a/project/DocumentationWebsite.scala b/project/DocumentationWebsite.scala new file mode 100644 index 000000000000..6eee1ed02830 --- /dev/null +++ b/project/DocumentationWebsite.scala @@ -0,0 +1,85 @@ +import java.io.File +import java.nio.file.Paths +import sbt._ +import Build._ + +object DocumentationWebsite { + def generateStaticAssets( + contributorsFile: File, + mainFile: File, + cssContentContributorsSourceBaseFile: File, + cssSourceFileBase: File, + baseDest: File + ): Seq[File] = { + + + val contributorsTestcasesDestinationFile = Paths.get("scaladoc-testcases", "docs", "js", "contributors.js").toFile + val contributorsDestinationFile = Paths.get("docs-for-dotty-page", "js", "contributors.js").toFile + sbt.IO.copyFile(contributorsFile, contributorsTestcasesDestinationFile) + sbt.IO.copyFile(contributorsFile, contributorsDestinationFile) + + val mainDestinationFile = baseDest / "dotty_res" / "scripts" / "scaladoc-scalajs.js" + sbt.IO.copyFile(mainFile, mainDestinationFile) + + val cssCodeSnippetsDesitnationFile = baseDest / "dotty_res" / "styles" / "code-snippets.css" + val cssCodeSnippetsSourceFile = cssSourceFileBase / "code-snippets.css" + sbt.IO.copyFile(cssCodeSnippetsSourceFile, cssCodeSnippetsDesitnationFile) + + val cssContentContributorsTestcasesDesitnationFile = Paths.get("docs-for-dotty-page", "css", "content-contributors.css").toFile + val cssContentContributorsDesitnationFile = Paths.get("scaladoc-testcases", "docs", "css", "content-contributors.css").toFile + val cssContentContributorsSourceFile = cssContentContributorsSourceBaseFile / "content-contributors.css" + sbt.IO.copyFile(cssContentContributorsSourceFile, cssContentContributorsTestcasesDesitnationFile) + sbt.IO.copyFile(cssContentContributorsSourceFile, cssContentContributorsDesitnationFile) + + val dests = Seq("searchbar.css", "social-links.css", "ux.css", "versions-dropdown.css").map { file => + val cssDesitnationFile = baseDest / "dotty_res" / "styles" / file + val cssSourceFile = cssSourceFileBase / file + sbt.IO.copyFile(cssSourceFile, cssDesitnationFile) + cssDesitnationFile + } + + import _root_.scala.sys.process._ + import _root_.scala.concurrent._ + import _root_.scala.concurrent.duration.Duration + import ExecutionContext.Implicits.global + val inkuireVersion = "1.0.0-M3" + val inkuireLink = s"https://github.com/VirtusLab/Inkuire/releases/download/$inkuireVersion/inkuire.js" + val inkuireDestinationFile = baseDest / "dotty_res" / "scripts" / "inkuire.js" + sbt.IO.touch(inkuireDestinationFile) + + def tryFetch(retries: Int, timeout: Duration): Unit = { + val downloadProcess = (new java.net.URL(inkuireLink) #> inkuireDestinationFile).run() + val result: Future[Int] = Future(blocking(downloadProcess.exitValue())) + try { + Await.result(result, timeout) match { + case 0 => + case res if retries > 0 => + println(s"Failed to fetch inkuire.js from $inkuireLink: Error code $res. $retries retries left") + tryFetch(retries - 1, timeout) + case res => throw new MessageOnlyException(s"Failed to fetch inkuire.js from $inkuireLink: Error code $res") + } + } catch { + case e: TimeoutException => + downloadProcess.destroy() + if (retries > 0) { + println(s"Failed to fetch inkuire.js from $inkuireLink: Download timeout. $retries retries left") + tryFetch(retries - 1, timeout) + } + else { + throw new MessageOnlyException(s"Failed to fetch inkuire.js from $inkuireLink: Download timeout") + } + } + } + + tryFetch(5, Duration(60, "s")) + Seq( + inkuireDestinationFile, + mainDestinationFile, + contributorsDestinationFile, + cssContentContributorsDesitnationFile, + cssCodeSnippetsDesitnationFile, + ) ++ dests + } +} + + diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index 29d4dd6c526c..4ddd52b432f7 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -37,6 +37,7 @@ dist/target/pack/bin/scaladoc \ "-snippet-compiler:scaladoc-testcases/docs=compile" \ -siteroot scaladoc-testcases/docs \ -project-footer "Copyright (c) 2002-2021, LAMP/EPFL" \ + -default-template static-site-main \ -author -groups -revision master -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts" diff -rq "$OUT1" "scaladoc/output/testcases" diff --git a/scaladoc-js/resources/code-snippets.css b/scaladoc-js/common/css/code-snippets.css similarity index 97% rename from scaladoc-js/resources/code-snippets.css rename to scaladoc-js/common/css/code-snippets.css index fc7f4f5ffa6d..861d44d4b2d7 100644 --- a/scaladoc-js/resources/code-snippets.css +++ b/scaladoc-js/common/css/code-snippets.css @@ -112,16 +112,18 @@ input:checked + .slider:before { transform: translateX(var(--translation-size)); } -.tooltip { - position: relative; +.tooltip-container { + display: none; } -.tooltip:hover:after { +.tooltip:hover .tooltip-container { + display: block; +} +.tooltip:hover .tooltip-container::after { content: attr(label); padding: 4px 8px; color: white; background-color:black; position: absolute; - left: 0; z-index:10; box-shadow:0 0 3px #444; opacity: 0.8; diff --git a/scaladoc-js/resources/searchbar.css b/scaladoc-js/common/css/searchbar.css similarity index 100% rename from scaladoc-js/resources/searchbar.css rename to scaladoc-js/common/css/searchbar.css diff --git a/scaladoc-js/resources/social-links.css b/scaladoc-js/common/css/social-links.css similarity index 100% rename from scaladoc-js/resources/social-links.css rename to scaladoc-js/common/css/social-links.css diff --git a/scaladoc-js/resources/ux.css b/scaladoc-js/common/css/ux.css similarity index 100% rename from scaladoc-js/resources/ux.css rename to scaladoc-js/common/css/ux.css diff --git a/scaladoc-js/resources/versions-dropdown.css b/scaladoc-js/common/css/versions-dropdown.css similarity index 100% rename from scaladoc-js/resources/versions-dropdown.css rename to scaladoc-js/common/css/versions-dropdown.css diff --git a/scaladoc-js/src/code-snippets/CodeSnippets.scala b/scaladoc-js/common/src/code-snippets/CodeSnippets.scala similarity index 100% rename from scaladoc-js/src/code-snippets/CodeSnippets.scala rename to scaladoc-js/common/src/code-snippets/CodeSnippets.scala diff --git a/scaladoc-js/src/code-snippets/CodeSnippetsGlobals.scala b/scaladoc-js/common/src/code-snippets/CodeSnippetsGlobals.scala similarity index 100% rename from scaladoc-js/src/code-snippets/CodeSnippetsGlobals.scala rename to scaladoc-js/common/src/code-snippets/CodeSnippetsGlobals.scala diff --git a/scaladoc-js/src/code-snippets/Scastie.scala b/scaladoc-js/common/src/code-snippets/Scastie.scala similarity index 100% rename from scaladoc-js/src/code-snippets/Scastie.scala rename to scaladoc-js/common/src/code-snippets/Scastie.scala diff --git a/scaladoc-js/contributors/css/content-contributors.css b/scaladoc-js/contributors/css/content-contributors.css new file mode 100644 index 000000000000..733d6908cc52 --- /dev/null +++ b/scaladoc-js/contributors/css/content-contributors.css @@ -0,0 +1,24 @@ +.content-contributors.hidden { + display: none; +} +.content-contributors .contributors-container { + display: flex; + flex-wrap: wrap; + align-items: center; + padding-bottom: 25px; +} +.content-contributors .contributors-container div { + margin: 5px; +} +.content-contributors .contributors-container div a { + vertical-align: middle; + padding: 3px; + text-decoration: none; +} +.content-contributors .contributors-container div img { + vertical-align: middle; + width: 35px; + height: 35px; + margin-bottom: 0; + border-radius: 7px; +} diff --git a/scaladoc-js/contributors/src/Globals.scala b/scaladoc-js/contributors/src/Globals.scala new file mode 100644 index 000000000000..68b37494fe7d --- /dev/null +++ b/scaladoc-js/contributors/src/Globals.scala @@ -0,0 +1,11 @@ +package dotty.tools.scaladoc + +import scala.scalajs.js +import scala.scalajs.js.annotation.JSGlobalScope + +@js.native +@JSGlobalScope +object Globals extends js.Object { + val githubContributorsUrl: String = js.native +} + diff --git a/scaladoc-js/contributors/src/Main.scala b/scaladoc-js/contributors/src/Main.scala new file mode 100644 index 000000000000..5260e11538e8 --- /dev/null +++ b/scaladoc-js/contributors/src/Main.scala @@ -0,0 +1,5 @@ +package dotty.tools.scaladoc +import scala.scalajs.js.annotation._ + +object Main extends App: + ContentContributors() diff --git a/scaladoc-js/contributors/src/content-contributors/ContentContributors.scala b/scaladoc-js/contributors/src/content-contributors/ContentContributors.scala new file mode 100644 index 000000000000..2ef1beb2185d --- /dev/null +++ b/scaladoc-js/contributors/src/content-contributors/ContentContributors.scala @@ -0,0 +1,78 @@ +package dotty.tools.scaladoc + +import org.scalajs.dom._ +import org.scalajs.dom.ext._ + +import scala.util.matching.Regex._ +import scala.util.matching._ +import org.scalajs.dom.ext.Ajax +import scala.scalajs.js.JSON +import scala.scalajs.js + +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.Future +import scala.util.{Success,Failure} + +// Contributors widget +// see https://stackoverflow.com/a/19200303/4496364 +// Copied from https://github.com/scala/docs.scala-lang/blob/main/resources/js/functions.js and rewritten to Scala.js + +case class FullAuthor(name: String, url: String, image: String) + +trait FallbackAuthor extends js.Object: + def name: String + +trait CommitBottom extends js.Object: + def author: FallbackAuthor + +trait Author extends js.Object: + def login: String + def avatar_url: String + def html_url: String + +trait CommitTop extends js.Object: + def commit: CommitBottom + def author: Author + +trait Commits extends js.Array[CommitTop] + +class ContentContributors: + document.addEventListener("DOMContentLoaded", (e: Event) => { + val indenticonsUrl = "https://github.com/identicons" + js.typeOf(Globals.githubContributorsUrl) match + case "undefined" => + // don't do anything + case url => + val request: Future[String] = Ajax.get(Globals.githubContributorsUrl).map(_.responseText) + request.onComplete { + case Success(json: String) => + val res = JSON.parse(json).asInstanceOf[Commits] + val authors = res.map { commit => + commit.author match + case null => + FullAuthor(commit.commit.author.name, "", s"$indenticonsUrl/${commit.commit.author.name}.png") + case author => + FullAuthor(author.login, author.html_url, author.avatar_url) + }.distinct + val maybeDiv = Option(document.getElementById("documentation-contributors")) + maybeDiv.foreach { div => + authors.foreach { case FullAuthor(name, url, img) => + val divN = document.createElement("div") + val imgN = document.createElement("img").asInstanceOf[html.Image] + imgN.src = img + val autN = document.createElement("a").asInstanceOf[html.Anchor] + autN.href = url + autN.text = name + divN.appendChild(imgN) + divN.appendChild(autN) + div.appendChild(divN) + } + + if authors.nonEmpty then + div.asInstanceOf[html.Div].parentElement.classList.toggle("hidden") + } + case Failure(_) => + println(s"Couldn't fetch contributors for ${Globals.githubContributorsUrl}") + } + }) + diff --git a/scaladoc-js/src/Globals.scala b/scaladoc-js/main/src/Globals.scala similarity index 100% rename from scaladoc-js/src/Globals.scala rename to scaladoc-js/main/src/Globals.scala diff --git a/scaladoc-js/main/src/Main.scala b/scaladoc-js/main/src/Main.scala new file mode 100644 index 000000000000..924b45400eb0 --- /dev/null +++ b/scaladoc-js/main/src/Main.scala @@ -0,0 +1,10 @@ +package dotty.tools.scaladoc +import scala.scalajs.js.annotation._ + +object Main extends App: + Searchbar() + SocialLinks() + DropdownHandler() + Ux() + TooltipNormalizer() + CodeSnippets() diff --git a/scaladoc-js/src/searchbar/PageEntry.scala b/scaladoc-js/main/src/searchbar/PageEntry.scala similarity index 100% rename from scaladoc-js/src/searchbar/PageEntry.scala rename to scaladoc-js/main/src/searchbar/PageEntry.scala diff --git a/scaladoc-js/src/searchbar/Searchbar.scala b/scaladoc-js/main/src/searchbar/Searchbar.scala similarity index 100% rename from scaladoc-js/src/searchbar/Searchbar.scala rename to scaladoc-js/main/src/searchbar/Searchbar.scala diff --git a/scaladoc-js/src/searchbar/SearchbarComponent.scala b/scaladoc-js/main/src/searchbar/SearchbarComponent.scala similarity index 100% rename from scaladoc-js/src/searchbar/SearchbarComponent.scala rename to scaladoc-js/main/src/searchbar/SearchbarComponent.scala diff --git a/scaladoc-js/src/searchbar/SearchbarGlobals.scala b/scaladoc-js/main/src/searchbar/SearchbarGlobals.scala similarity index 100% rename from scaladoc-js/src/searchbar/SearchbarGlobals.scala rename to scaladoc-js/main/src/searchbar/SearchbarGlobals.scala diff --git a/scaladoc-js/src/searchbar/engine/InkuireJSSearchEngine.scala b/scaladoc-js/main/src/searchbar/engine/InkuireJSSearchEngine.scala similarity index 100% rename from scaladoc-js/src/searchbar/engine/InkuireJSSearchEngine.scala rename to scaladoc-js/main/src/searchbar/engine/InkuireJSSearchEngine.scala diff --git a/scaladoc-js/src/searchbar/engine/Matchers.scala b/scaladoc-js/main/src/searchbar/engine/Matchers.scala similarity index 100% rename from scaladoc-js/src/searchbar/engine/Matchers.scala rename to scaladoc-js/main/src/searchbar/engine/Matchers.scala diff --git a/scaladoc-js/src/searchbar/engine/QueryParser.scala b/scaladoc-js/main/src/searchbar/engine/QueryParser.scala similarity index 100% rename from scaladoc-js/src/searchbar/engine/QueryParser.scala rename to scaladoc-js/main/src/searchbar/engine/QueryParser.scala diff --git a/scaladoc-js/src/searchbar/engine/SearchbarEngine.scala b/scaladoc-js/main/src/searchbar/engine/SearchbarEngine.scala similarity index 100% rename from scaladoc-js/src/searchbar/engine/SearchbarEngine.scala rename to scaladoc-js/main/src/searchbar/engine/SearchbarEngine.scala diff --git a/scaladoc-js/src/social-links/SocialLinks.scala b/scaladoc-js/main/src/social-links/SocialLinks.scala similarity index 100% rename from scaladoc-js/src/social-links/SocialLinks.scala rename to scaladoc-js/main/src/social-links/SocialLinks.scala diff --git a/scaladoc-js/main/src/tooltip-normalizer/TooltipNormalizer.scala b/scaladoc-js/main/src/tooltip-normalizer/TooltipNormalizer.scala new file mode 100644 index 000000000000..c2ad5f413979 --- /dev/null +++ b/scaladoc-js/main/src/tooltip-normalizer/TooltipNormalizer.scala @@ -0,0 +1,25 @@ +package dotty.tools.scaladoc + + +import org.scalajs.dom._ +import org.scalajs.dom.ext._ +import scala.scalajs.js +import scalajs.js.DynamicImplicits.truthValue + + +// Handful of links +// https://css-tricks.com/popping-hidden-overflow/ +// https://github.com/highlightjs/highlight.js/issues/728 +// https://stackoverflow.com/a/54482317/14320995 +class TooltipNormalizer: + document.addEventListener("mouseover", (e: Event) => { + if e.target.asInstanceOf[js.Dynamic].closest(".snippet-error.tooltip") then + val tooltipParent = e.target.asInstanceOf[html.Span] + val tooltipContainer = tooltipParent.querySelector(".tooltip-container") + js.typeOf(tooltipContainer) match + case "undefined" => + case _ => + tooltipContainer match + case casted: html.Span => casted.style = s"left: ${Math.round(tooltipParent.offsetLeft)}" + case _ => + }) diff --git a/scaladoc-js/src/ux/Ux.scala b/scaladoc-js/main/src/ux/Ux.scala similarity index 100% rename from scaladoc-js/src/ux/Ux.scala rename to scaladoc-js/main/src/ux/Ux.scala diff --git a/scaladoc-js/src/versions-dropdown/DropdownHandler.scala b/scaladoc-js/main/src/versions-dropdown/DropdownHandler.scala similarity index 100% rename from scaladoc-js/src/versions-dropdown/DropdownHandler.scala rename to scaladoc-js/main/src/versions-dropdown/DropdownHandler.scala diff --git a/scaladoc-js/test/dotty/dokka/MatchersTest.scala b/scaladoc-js/main/test/dotty/tools/scaladoc/MatchersTest.scala similarity index 100% rename from scaladoc-js/test/dotty/dokka/MatchersTest.scala rename to scaladoc-js/main/test/dotty/tools/scaladoc/MatchersTest.scala diff --git a/scaladoc-js/test/dotty/dokka/QueryParserTest.scala b/scaladoc-js/main/test/dotty/tools/scaladoc/QueryParserTest.scala similarity index 99% rename from scaladoc-js/test/dotty/dokka/QueryParserTest.scala rename to scaladoc-js/main/test/dotty/tools/scaladoc/QueryParserTest.scala index bd5ab8f9ea8a..8a79a28abdd1 100644 --- a/scaladoc-js/test/dotty/dokka/QueryParserTest.scala +++ b/scaladoc-js/main/test/dotty/tools/scaladoc/QueryParserTest.scala @@ -32,4 +32,4 @@ class QueryParserTest: testCase("trait", EngineMatchersQuery(List(ByName("trait")))) testCase("trait A", EngineMatchersQuery(List(ByKind("trait"), ByName("A")))) testCase("`trait A`", EngineMatchersQuery(List(ByName("trait A")))) - } \ No newline at end of file + } diff --git a/scaladoc-js/markdown/src/Main.scala b/scaladoc-js/markdown/src/Main.scala new file mode 100644 index 000000000000..f7794057bfdf --- /dev/null +++ b/scaladoc-js/markdown/src/Main.scala @@ -0,0 +1,5 @@ +package dotty.tools.scaladoc +import scala.scalajs.js.annotation._ + +object Main extends App: + CodeSnippets() diff --git a/scaladoc-js/src/Main.scala b/scaladoc-js/src/Main.scala deleted file mode 100644 index f7075766e3b4..000000000000 --- a/scaladoc-js/src/Main.scala +++ /dev/null @@ -1,22 +0,0 @@ -package dotty.tools.scaladoc - -object Main: - - private def common(): Unit = - CodeSnippets() - - def main(): Unit = - Searchbar() - SocialLinks() - DropdownHandler() - Ux() - common() - - /** - * This main is conditionally enabled by system env variable `scaladoc.projectFormat=md` - * passed in ./projects/scripts/genDocsScalaLang - * The reason why we have to pass the condition by env variable is because js is build before scaladoc, - * so we cannot access its args - */ - def markdownMain(): Unit = - common() diff --git a/scaladoc-testcases/docs/_layouts/redirect.html b/scaladoc-testcases/docs/_layouts/redirect.html new file mode 100644 index 000000000000..d0c2329189d8 --- /dev/null +++ b/scaladoc-testcases/docs/_layouts/redirect.html @@ -0,0 +1,14 @@ +--- +hasFrame: false +--- + + + + Redirecting… + + + + +

Redirecting…

+ Click here if you were not redirected. + diff --git a/scaladoc-testcases/docs/_layouts/static-site-main.html b/scaladoc-testcases/docs/_layouts/static-site-main.html new file mode 100644 index 000000000000..2d4c086446fc --- /dev/null +++ b/scaladoc-testcases/docs/_layouts/static-site-main.html @@ -0,0 +1,22 @@ +--- +extraJS: + - js/contributors.js +extraCSS: + - css/bootstrap.min.css + - css/content-contributors.css +--- +
+ {{ content }} + +
diff --git a/scaladoc-testcases/docs/css/bootstrap.min.css b/scaladoc-testcases/docs/css/bootstrap.min.css new file mode 100644 index 000000000000..d9bbfab3ab34 --- /dev/null +++ b/scaladoc-testcases/docs/css/bootstrap.min.css @@ -0,0 +1 @@ +@import url("https://fonts.googleapis.com/css?family=Lato:400,700|Fira+Code:400,700&display=fallback");:root{--light:#fafafa;--toolbar:#414551;--toolbar-entry:#fafafa;--toolbar-active:#7c8296;--sidebar:#fafafa;--sidebar-category:#000;--sidebar-page:#414551;--sidebar-active:#ca445e;--pre-bg:#fafafa;--doc-bg:rgba(202,68,94,0.135);--primary:#414551;--secondary:#ca445e;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:"Lato",sans-serif;--font-family-monospace:"Fira Code","Andale Mono",monospace}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0,0,0,0)}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:Lato,sans-serif;font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{font-style:normal;line-height:inherit}address,dl,ol,ul{margin-bottom:1rem}dl,ol,ul{margin-top:0}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]),a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:Fira Code,Andale Mono,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{border-style:none}img,svg{vertical-align:middle}svg{overflow:hidden}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-family:Lato,sans-serif;font-weight:400;line-height:1.2}.h1,h1{font-size:2.5rem}.h2,h2{font-size:2rem}.h3,h3{font-size:1.75rem}.h4,h4{font-size:1.5rem}.h5,h5{font-size:1.25rem}.h6,h6{font-size:1rem}.lead{font-size:1.25rem;font-weight:300}.display-1{font-size:6rem}.display-1,.display-2{font-weight:300;line-height:1.2}.display-2{font-size:5.5rem}.display-3{font-size:4.5rem}.display-3,.display-4{font-weight:300;line-height:1.2}.display-4{font-size:3.5rem}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-inline,.list-unstyled{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.25rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer:before{content:"\2014\00A0"}.img-fluid,.img-thumbnail{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#fff;border:1px solid #dee2e6;border-radius:.25rem}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code{font-size:87.5%;color:#ca445e;word-break:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#212529}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:960px}}.container-fluid{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{display:flex;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-10,.col-11,.col-12,.col-auto,.col-lg,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-auto,.col-md,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-md-auto,.col-sm,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-auto{position:relative;width:100%;padding-right:15px;padding-left:15px}.col{flex-basis:0;flex-grow:1;max-width:100%}.col-auto{flex:0 0 auto;width:auto;max-width:100%}.col-1{flex:0 0 8.333333%;max-width:8.333333%}.col-2{flex:0 0 16.666667%;max-width:16.666667%}.col-3{flex:0 0 25%;max-width:25%}.col-4{flex:0 0 33.333333%;max-width:33.333333%}.col-5{flex:0 0 41.666667%;max-width:41.666667%}.col-6{flex:0 0 50%;max-width:50%}.col-7{flex:0 0 58.333333%;max-width:58.333333%}.col-8{flex:0 0 66.666667%;max-width:66.666667%}.col-9{flex:0 0 75%;max-width:75%}.col-10{flex:0 0 83.333333%;max-width:83.333333%}.col-11{flex:0 0 91.666667%;max-width:91.666667%}.col-12{flex:0 0 100%;max-width:100%}.order-first{order:-1}.order-last{order:13}.order-0{order:0}.order-1{order:1}.order-2{order:2}.order-3{order:3}.order-4{order:4}.order-5{order:5}.order-6{order:6}.order-7{order:7}.order-8{order:8}.order-9{order:9}.order-10{order:10}.order-11{order:11}.order-12{order:12}.offset-1{margin-left:8.333333%}.offset-2{margin-left:16.666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.333333%}.offset-5{margin-left:41.666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.333333%}.offset-8{margin-left:66.666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.333333%}.offset-11{margin-left:91.666667%}@media (min-width:576px){.col-sm{flex-basis:0;flex-grow:1;max-width:100%}.col-sm-auto{flex:0 0 auto;width:auto;max-width:100%}.col-sm-1{flex:0 0 8.333333%;max-width:8.333333%}.col-sm-2{flex:0 0 16.666667%;max-width:16.666667%}.col-sm-3{flex:0 0 25%;max-width:25%}.col-sm-4{flex:0 0 33.333333%;max-width:33.333333%}.col-sm-5{flex:0 0 41.666667%;max-width:41.666667%}.col-sm-6{flex:0 0 50%;max-width:50%}.col-sm-7{flex:0 0 58.333333%;max-width:58.333333%}.col-sm-8{flex:0 0 66.666667%;max-width:66.666667%}.col-sm-9{flex:0 0 75%;max-width:75%}.col-sm-10{flex:0 0 83.333333%;max-width:83.333333%}.col-sm-11{flex:0 0 91.666667%;max-width:91.666667%}.col-sm-12{flex:0 0 100%;max-width:100%}.order-sm-first{order:-1}.order-sm-last{order:13}.order-sm-0{order:0}.order-sm-1{order:1}.order-sm-2{order:2}.order-sm-3{order:3}.order-sm-4{order:4}.order-sm-5{order:5}.order-sm-6{order:6}.order-sm-7{order:7}.order-sm-8{order:8}.order-sm-9{order:9}.order-sm-10{order:10}.order-sm-11{order:11}.order-sm-12{order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.333333%}.offset-sm-2{margin-left:16.666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.333333%}.offset-sm-5{margin-left:41.666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.333333%}.offset-sm-8{margin-left:66.666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.333333%}.offset-sm-11{margin-left:91.666667%}}@media (min-width:768px){.col-md{flex-basis:0;flex-grow:1;max-width:100%}.col-md-auto{flex:0 0 auto;width:auto;max-width:100%}.col-md-1{flex:0 0 8.333333%;max-width:8.333333%}.col-md-2{flex:0 0 16.666667%;max-width:16.666667%}.col-md-3{flex:0 0 25%;max-width:25%}.col-md-4{flex:0 0 33.333333%;max-width:33.333333%}.col-md-5{flex:0 0 41.666667%;max-width:41.666667%}.col-md-6{flex:0 0 50%;max-width:50%}.col-md-7{flex:0 0 58.333333%;max-width:58.333333%}.col-md-8{flex:0 0 66.666667%;max-width:66.666667%}.col-md-9{flex:0 0 75%;max-width:75%}.col-md-10{flex:0 0 83.333333%;max-width:83.333333%}.col-md-11{flex:0 0 91.666667%;max-width:91.666667%}.col-md-12{flex:0 0 100%;max-width:100%}.order-md-first{order:-1}.order-md-last{order:13}.order-md-0{order:0}.order-md-1{order:1}.order-md-2{order:2}.order-md-3{order:3}.order-md-4{order:4}.order-md-5{order:5}.order-md-6{order:6}.order-md-7{order:7}.order-md-8{order:8}.order-md-9{order:9}.order-md-10{order:10}.order-md-11{order:11}.order-md-12{order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.333333%}.offset-md-2{margin-left:16.666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.333333%}.offset-md-5{margin-left:41.666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.333333%}.offset-md-8{margin-left:66.666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.333333%}.offset-md-11{margin-left:91.666667%}}@media (min-width:992px){.col-lg{flex-basis:0;flex-grow:1;max-width:100%}.col-lg-auto{flex:0 0 auto;width:auto;max-width:100%}.col-lg-1{flex:0 0 8.333333%;max-width:8.333333%}.col-lg-2{flex:0 0 16.666667%;max-width:16.666667%}.col-lg-3{flex:0 0 25%;max-width:25%}.col-lg-4{flex:0 0 33.333333%;max-width:33.333333%}.col-lg-5{flex:0 0 41.666667%;max-width:41.666667%}.col-lg-6{flex:0 0 50%;max-width:50%}.col-lg-7{flex:0 0 58.333333%;max-width:58.333333%}.col-lg-8{flex:0 0 66.666667%;max-width:66.666667%}.col-lg-9{flex:0 0 75%;max-width:75%}.col-lg-10{flex:0 0 83.333333%;max-width:83.333333%}.col-lg-11{flex:0 0 91.666667%;max-width:91.666667%}.col-lg-12{flex:0 0 100%;max-width:100%}.order-lg-first{order:-1}.order-lg-last{order:13}.order-lg-0{order:0}.order-lg-1{order:1}.order-lg-2{order:2}.order-lg-3{order:3}.order-lg-4{order:4}.order-lg-5{order:5}.order-lg-6{order:6}.order-lg-7{order:7}.order-lg-8{order:8}.order-lg-9{order:9}.order-lg-10{order:10}.order-lg-11{order:11}.order-lg-12{order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.333333%}.offset-lg-2{margin-left:16.666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.333333%}.offset-lg-5{margin-left:41.666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.333333%}.offset-lg-8{margin-left:66.666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.333333%}.offset-lg-11{margin-left:91.666667%}}@media (min-width:1200px){.col-xl{flex-basis:0;flex-grow:1;max-width:100%}.col-xl-auto{flex:0 0 auto;width:auto;max-width:100%}.col-xl-1{flex:0 0 8.333333%;max-width:8.333333%}.col-xl-2{flex:0 0 16.666667%;max-width:16.666667%}.col-xl-3{flex:0 0 25%;max-width:25%}.col-xl-4{flex:0 0 33.333333%;max-width:33.333333%}.col-xl-5{flex:0 0 41.666667%;max-width:41.666667%}.col-xl-6{flex:0 0 50%;max-width:50%}.col-xl-7{flex:0 0 58.333333%;max-width:58.333333%}.col-xl-8{flex:0 0 66.666667%;max-width:66.666667%}.col-xl-9{flex:0 0 75%;max-width:75%}.col-xl-10{flex:0 0 83.333333%;max-width:83.333333%}.col-xl-11{flex:0 0 91.666667%;max-width:91.666667%}.col-xl-12{flex:0 0 100%;max-width:100%}.order-xl-first{order:-1}.order-xl-last{order:13}.order-xl-0{order:0}.order-xl-1{order:1}.order-xl-2{order:2}.order-xl-3{order:3}.order-xl-4{order:4}.order-xl-5{order:5}.order-xl-6{order:6}.order-xl-7{order:7}.order-xl-8{order:8}.order-xl-9{order:9}.order-xl-10{order:10}.order-xl-11{order:11}.order-xl-12{order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.333333%}.offset-xl-2{margin-left:16.666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.333333%}.offset-xl-5{margin-left:41.666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.333333%}.offset-xl-8{margin-left:66.666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.333333%}.offset-xl-11{margin-left:91.666667%}}.table{width:100%;margin-bottom:1rem;color:#212529}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}.table tbody+tbody{border-top:2px solid #dee2e6}.table-sm td,.table-sm th{padding:.3rem}.table-bordered,.table-bordered td,.table-bordered th{border:1px solid #dee2e6}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-borderless tbody+tbody,.table-borderless td,.table-borderless th,.table-borderless thead th{border:0}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}.table-hover tbody tr:hover{color:#212529;background-color:rgba(0,0,0,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#cacbce}.table-primary tbody+tbody,.table-primary td,.table-primary th,.table-primary thead th{border-color:#9c9ea5}.table-hover .table-primary:hover,.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#bdbec2}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#f0cbd2}.table-secondary tbody+tbody,.table-secondary td,.table-secondary th,.table-secondary thead th{border-color:#e39eab}.table-hover .table-secondary:hover,.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#eab7c1}.table-active,.table-active>td,.table-active>th,.table-hover .table-active:hover,.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}.table .thead-dark th{color:#fff;background-color:#343a40;border-color:#454d55}.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}.table-dark{color:#fff;background-color:#343a40}.table-dark td,.table-dark th,.table-dark thead th{border-color:#454d55}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:hsla(0,0%,100%,.05)}.table-dark.table-hover tbody tr:hover{color:#fff;background-color:hsla(0,0%,100%,.075)}@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-sm>.table-bordered{border:0}}@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-md>.table-bordered{border:0}}@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-lg>.table-bordered{border:0}}@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive>.table-bordered{border:0}.btn{display:inline-block;font-weight:400;color:#212529;text-align:center;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:transparent;border:1px solid transparent;padding:.375rem .75rem;font-size:1rem;line-height:1.5;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.btn{transition:none}}.btn:hover{color:#212529;text-decoration:none}.btn.focus,.btn:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.btn.disabled,.btn:disabled{opacity:.65}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#414551;border-color:#414551}.btn-primary:hover{color:#fff;background-color:#30333c;border-color:#2a2d35}.btn-primary.focus,.btn-primary:focus{box-shadow:0 0 0 .2rem rgba(94,97,107,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#414551;border-color:#414551}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#2a2d35;border-color:#25272e}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(94,97,107,.5)}.btn-secondary{color:#fff;background-color:#ca445e;border-color:#ca445e}.btn-secondary:hover{color:#fff;background-color:#b5334c;border-color:#ab3048}.btn-secondary.focus,.btn-secondary:focus{box-shadow:0 0 0 .2rem rgba(210,96,118,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#ca445e;border-color:#ca445e}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#ab3048;border-color:#a12e44}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(210,96,118,.5)}.btn-outline-primary{color:#414551;border-color:#414551}.btn-outline-primary:hover{color:#fff;background-color:#414551;border-color:#414551}.btn-outline-primary.focus,.btn-outline-primary:focus{box-shadow:0 0 0 .2rem rgba(65,69,81,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#414551;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#414551;border-color:#414551}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(65,69,81,.5)}.btn-outline-secondary{color:#ca445e;border-color:#ca445e}.btn-outline-secondary:hover{color:#fff;background-color:#ca445e;border-color:#ca445e}.btn-outline-secondary.focus,.btn-outline-secondary:focus{box-shadow:0 0 0 .2rem rgba(202,68,94,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#ca445e;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#ca445e;border-color:#ca445e}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(202,68,94,.5)}.btn-link{font-weight:400;color:#007bff;text-decoration:none}.btn-link:hover{color:#0056b3;text-decoration:underline}.btn-link.focus,.btn-link:focus{text-decoration:underline;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#6c757d;pointer-events:none}.btn-lg{padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.btn-sm{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:.5rem}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{transition:opacity .15s linear}@media (prefers-reduced-motion:reduce){.fade{transition:none}}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.collapsing{position:relative;height:0;overflow:hidden;transition:height .35s ease}@media (prefers-reduced-motion:reduce){.collapsing{transition:none}}.nav{display:flex;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:.5rem 1rem}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#6c757d;pointer-events:none;cursor:default}.nav-tabs{border-bottom:1px solid #dee2e6}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:#e9ecef #e9ecef #dee2e6}.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#fff;border-color:#dee2e6 #dee2e6 #fff}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}.nav-fill .nav-item{flex:1 1 auto;text-align:center}.nav-justified .nav-item{flex-basis:0;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;padding:.5rem 1rem}.navbar,.navbar>.container,.navbar>.container-fluid{display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:.3125rem;padding-bottom:.3125rem;margin-right:1rem;font-size:1.25rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:flex;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}.navbar-collapse{flex-basis:100%;flex-grow:1;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.25rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat 50%;background-size:100% 100%}@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:576px){.navbar-expand-sm{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-sm .navbar-nav{flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}}@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:768px){.navbar-expand-md{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-md .navbar-nav{flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}}@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:992px){.navbar-expand-lg{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-lg .navbar-nav{flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}}@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:1200px){.navbar-expand-xl{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-xl .navbar-nav{flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}}.navbar-expand{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid{flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-light .navbar-brand,.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-light .navbar-text{color:rgba(0,0,0,.5)}.navbar-light .navbar-text a,.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}.navbar-dark .navbar-brand,.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:hsla(0,0%,100%,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:hsla(0,0%,100%,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:hsla(0,0%,100%,.5);border-color:hsla(0,0%,100%,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-dark .navbar-text{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-text a,.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.breadcrumb{display:flex;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}.breadcrumb-item+.breadcrumb-item{padding-left:.5rem}.breadcrumb-item+.breadcrumb-item:before{display:inline-block;padding-right:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover:before{text-decoration:underline;text-decoration:none}.breadcrumb-item.active{color:#6c757d}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media (prefers-reduced-motion:reduce){.badge{transition:none}}a.badge:focus,a.badge:hover{text-decoration:none}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#414551}a.badge-primary:focus,a.badge-primary:hover{color:#fff;background-color:#2a2d35}a.badge-primary.focus,a.badge-primary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(65,69,81,.5)}.badge-secondary{color:#fff;background-color:#ca445e}a.badge-secondary:focus,a.badge-secondary:hover{color:#fff;background-color:#ab3048}a.badge-secondary.focus,a.badge-secondary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(202,68,94,.5)}@-webkit-keyframes spinner-border{to{transform:rotate(1turn)}}@keyframes spinner-border{to{transform:rotate(1turn)}}.spinner-border{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;border:.25em solid;border-right:.25em solid transparent;border-radius:50%;-webkit-animation:spinner-border .75s linear infinite;animation:spinner-border .75s linear infinite}.spinner-border-sm{width:1rem;height:1rem;border-width:.2em}@-webkit-keyframes spinner-grow{0%{transform:scale(0)}50%{opacity:1}}@keyframes spinner-grow{0%{transform:scale(0)}50%{opacity:1}}.spinner-grow{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;background-color:currentColor;border-radius:50%;opacity:0;-webkit-animation:spinner-grow .75s linear infinite;animation:spinner-grow .75s linear infinite}.spinner-grow-sm{width:1rem;height:1rem}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#414551!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#2a2d35!important}.bg-secondary{background-color:#ca445e!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#ab3048!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #dee2e6!important}.border-top{border-top:1px solid #dee2e6!important}.border-right{border-right:1px solid #dee2e6!important}.border-bottom{border-bottom:1px solid #dee2e6!important}.border-left{border-left:1px solid #dee2e6!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#414551!important}.border-secondary{border-color:#ca445e!important}.border-white{border-color:#fff!important}.rounded-sm{border-radius:.2rem!important}.rounded{border-radius:.25rem!important}.rounded-top{border-top-left-radius:.25rem!important}.rounded-right,.rounded-top{border-top-right-radius:.25rem!important}.rounded-bottom,.rounded-right{border-bottom-right-radius:.25rem!important}.rounded-bottom,.rounded-left{border-bottom-left-radius:.25rem!important}.rounded-left{border-top-left-radius:.25rem!important}.rounded-lg{border-radius:.3rem!important}.rounded-circle{border-radius:50%!important}.rounded-pill{border-radius:50rem!important}.rounded-0{border-radius:0!important}.clearfix:after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:flex!important}.d-inline-flex{display:inline-flex!important}@media (min-width:576px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:flex!important}.d-sm-inline-flex{display:inline-flex!important}}@media (min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:flex!important}.d-md-inline-flex{display:inline-flex!important}}@media (min-width:992px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:flex!important}.d-lg-inline-flex{display:inline-flex!important}}@media (min-width:1200px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:flex!important}.d-xl-inline-flex{display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:flex!important}.d-print-inline-flex{display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive:before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9:before{padding-top:42.857143%}.embed-responsive-16by9:before{padding-top:56.25%}.embed-responsive-4by3:before{padding-top:75%}.embed-responsive-1by1:before{padding-top:100%}.flex-row{flex-direction:row!important}.flex-column{flex-direction:column!important}.flex-row-reverse{flex-direction:row-reverse!important}.flex-column-reverse{flex-direction:column-reverse!important}.flex-wrap{flex-wrap:wrap!important}.flex-nowrap{flex-wrap:nowrap!important}.flex-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-fill{flex:1 1 auto!important}.flex-grow-0{flex-grow:0!important}.flex-grow-1{flex-grow:1!important}.flex-shrink-0{flex-shrink:0!important}.flex-shrink-1{flex-shrink:1!important}.justify-content-start{justify-content:flex-start!important}.justify-content-end{justify-content:flex-end!important}.justify-content-center{justify-content:center!important}.justify-content-between{justify-content:space-between!important}.justify-content-around{justify-content:space-around!important}.align-items-start{align-items:flex-start!important}.align-items-end{align-items:flex-end!important}.align-items-center{align-items:center!important}.align-items-baseline{align-items:baseline!important}.align-items-stretch{align-items:stretch!important}.align-content-start{align-content:flex-start!important}.align-content-end{align-content:flex-end!important}.align-content-center{align-content:center!important}.align-content-between{align-content:space-between!important}.align-content-around{align-content:space-around!important}.align-content-stretch{align-content:stretch!important}.align-self-auto{align-self:auto!important}.align-self-start{align-self:flex-start!important}.align-self-end{align-self:flex-end!important}.align-self-center{align-self:center!important}.align-self-baseline{align-self:baseline!important}.align-self-stretch{align-self:stretch!important}@media (min-width:576px){.flex-sm-row{flex-direction:row!important}.flex-sm-column{flex-direction:column!important}.flex-sm-row-reverse{flex-direction:row-reverse!important}.flex-sm-column-reverse{flex-direction:column-reverse!important}.flex-sm-wrap{flex-wrap:wrap!important}.flex-sm-nowrap{flex-wrap:nowrap!important}.flex-sm-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-sm-fill{flex:1 1 auto!important}.flex-sm-grow-0{flex-grow:0!important}.flex-sm-grow-1{flex-grow:1!important}.flex-sm-shrink-0{flex-shrink:0!important}.flex-sm-shrink-1{flex-shrink:1!important}.justify-content-sm-start{justify-content:flex-start!important}.justify-content-sm-end{justify-content:flex-end!important}.justify-content-sm-center{justify-content:center!important}.justify-content-sm-between{justify-content:space-between!important}.justify-content-sm-around{justify-content:space-around!important}.align-items-sm-start{align-items:flex-start!important}.align-items-sm-end{align-items:flex-end!important}.align-items-sm-center{align-items:center!important}.align-items-sm-baseline{align-items:baseline!important}.align-items-sm-stretch{align-items:stretch!important}.align-content-sm-start{align-content:flex-start!important}.align-content-sm-end{align-content:flex-end!important}.align-content-sm-center{align-content:center!important}.align-content-sm-between{align-content:space-between!important}.align-content-sm-around{align-content:space-around!important}.align-content-sm-stretch{align-content:stretch!important}.align-self-sm-auto{align-self:auto!important}.align-self-sm-start{align-self:flex-start!important}.align-self-sm-end{align-self:flex-end!important}.align-self-sm-center{align-self:center!important}.align-self-sm-baseline{align-self:baseline!important}.align-self-sm-stretch{align-self:stretch!important}}@media (min-width:768px){.flex-md-row{flex-direction:row!important}.flex-md-column{flex-direction:column!important}.flex-md-row-reverse{flex-direction:row-reverse!important}.flex-md-column-reverse{flex-direction:column-reverse!important}.flex-md-wrap{flex-wrap:wrap!important}.flex-md-nowrap{flex-wrap:nowrap!important}.flex-md-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-md-fill{flex:1 1 auto!important}.flex-md-grow-0{flex-grow:0!important}.flex-md-grow-1{flex-grow:1!important}.flex-md-shrink-0{flex-shrink:0!important}.flex-md-shrink-1{flex-shrink:1!important}.justify-content-md-start{justify-content:flex-start!important}.justify-content-md-end{justify-content:flex-end!important}.justify-content-md-center{justify-content:center!important}.justify-content-md-between{justify-content:space-between!important}.justify-content-md-around{justify-content:space-around!important}.align-items-md-start{align-items:flex-start!important}.align-items-md-end{align-items:flex-end!important}.align-items-md-center{align-items:center!important}.align-items-md-baseline{align-items:baseline!important}.align-items-md-stretch{align-items:stretch!important}.align-content-md-start{align-content:flex-start!important}.align-content-md-end{align-content:flex-end!important}.align-content-md-center{align-content:center!important}.align-content-md-between{align-content:space-between!important}.align-content-md-around{align-content:space-around!important}.align-content-md-stretch{align-content:stretch!important}.align-self-md-auto{align-self:auto!important}.align-self-md-start{align-self:flex-start!important}.align-self-md-end{align-self:flex-end!important}.align-self-md-center{align-self:center!important}.align-self-md-baseline{align-self:baseline!important}.align-self-md-stretch{align-self:stretch!important}}@media (min-width:992px){.flex-lg-row{flex-direction:row!important}.flex-lg-column{flex-direction:column!important}.flex-lg-row-reverse{flex-direction:row-reverse!important}.flex-lg-column-reverse{flex-direction:column-reverse!important}.flex-lg-wrap{flex-wrap:wrap!important}.flex-lg-nowrap{flex-wrap:nowrap!important}.flex-lg-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-lg-fill{flex:1 1 auto!important}.flex-lg-grow-0{flex-grow:0!important}.flex-lg-grow-1{flex-grow:1!important}.flex-lg-shrink-0{flex-shrink:0!important}.flex-lg-shrink-1{flex-shrink:1!important}.justify-content-lg-start{justify-content:flex-start!important}.justify-content-lg-end{justify-content:flex-end!important}.justify-content-lg-center{justify-content:center!important}.justify-content-lg-between{justify-content:space-between!important}.justify-content-lg-around{justify-content:space-around!important}.align-items-lg-start{align-items:flex-start!important}.align-items-lg-end{align-items:flex-end!important}.align-items-lg-center{align-items:center!important}.align-items-lg-baseline{align-items:baseline!important}.align-items-lg-stretch{align-items:stretch!important}.align-content-lg-start{align-content:flex-start!important}.align-content-lg-end{align-content:flex-end!important}.align-content-lg-center{align-content:center!important}.align-content-lg-between{align-content:space-between!important}.align-content-lg-around{align-content:space-around!important}.align-content-lg-stretch{align-content:stretch!important}.align-self-lg-auto{align-self:auto!important}.align-self-lg-start{align-self:flex-start!important}.align-self-lg-end{align-self:flex-end!important}.align-self-lg-center{align-self:center!important}.align-self-lg-baseline{align-self:baseline!important}.align-self-lg-stretch{align-self:stretch!important}}@media (min-width:1200px){.flex-xl-row{flex-direction:row!important}.flex-xl-column{flex-direction:column!important}.flex-xl-row-reverse{flex-direction:row-reverse!important}.flex-xl-column-reverse{flex-direction:column-reverse!important}.flex-xl-wrap{flex-wrap:wrap!important}.flex-xl-nowrap{flex-wrap:nowrap!important}.flex-xl-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-xl-fill{flex:1 1 auto!important}.flex-xl-grow-0{flex-grow:0!important}.flex-xl-grow-1{flex-grow:1!important}.flex-xl-shrink-0{flex-shrink:0!important}.flex-xl-shrink-1{flex-shrink:1!important}.justify-content-xl-start{justify-content:flex-start!important}.justify-content-xl-end{justify-content:flex-end!important}.justify-content-xl-center{justify-content:center!important}.justify-content-xl-between{justify-content:space-between!important}.justify-content-xl-around{justify-content:space-around!important}.align-items-xl-start{align-items:flex-start!important}.align-items-xl-end{align-items:flex-end!important}.align-items-xl-center{align-items:center!important}.align-items-xl-baseline{align-items:baseline!important}.align-items-xl-stretch{align-items:stretch!important}.align-content-xl-start{align-content:flex-start!important}.align-content-xl-end{align-content:flex-end!important}.align-content-xl-center{align-content:center!important}.align-content-xl-between{align-content:space-between!important}.align-content-xl-around{align-content:space-around!important}.align-content-xl-stretch{align-content:stretch!important}.align-self-xl-auto{align-self:auto!important}.align-self-xl-start{align-self:flex-start!important}.align-self-xl-end{align-self:flex-end!important}.align-self-xl-center{align-self:center!important}.align-self-xl-baseline{align-self:baseline!important}.align-self-xl-stretch{align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media (min-width:576px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media (min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media (min-width:992px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media (min-width:1200px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.overflow-auto{overflow:auto!important}.overflow-hidden{overflow:hidden!important}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.fixed-top{top:0}.fixed-bottom,.fixed-top{position:fixed;right:0;left:0;z-index:1030}.fixed-bottom{bottom:0}@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal}.shadow-sm{box-shadow:0 .125rem .25rem rgba(0,0,0,.075)!important}.shadow{box-shadow:0 .5rem 1rem rgba(0,0,0,.15)!important}.shadow-lg{box-shadow:0 1rem 3rem rgba(0,0,0,.175)!important}.shadow-none{box-shadow:none!important}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.w-auto{width:auto!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.h-auto{height:auto!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.min-vw-100{min-width:100vw!important}.min-vh-100{min-height:100vh!important}.vw-100{width:100vw!important}.vh-100{height:100vh!important}.stretched-link:after{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:auto;content:"";background-color:transparent}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:.25rem!important}.mt-1,.my-1{margin-top:.25rem!important}.mr-1,.mx-1{margin-right:.25rem!important}.mb-1,.my-1{margin-bottom:.25rem!important}.ml-1,.mx-1{margin-left:.25rem!important}.m-2{margin:.5rem!important}.mt-2,.my-2{margin-top:.5rem!important}.mr-2,.mx-2{margin-right:.5rem!important}.mb-2,.my-2{margin-bottom:.5rem!important}.ml-2,.mx-2{margin-left:.5rem!important}.m-3{margin:1rem!important}.mt-3,.my-3{margin-top:1rem!important}.mr-3,.mx-3{margin-right:1rem!important}.mb-3,.my-3{margin-bottom:1rem!important}.ml-3,.mx-3{margin-left:1rem!important}.m-4{margin:1.5rem!important}.mt-4,.my-4{margin-top:1.5rem!important}.mr-4,.mx-4{margin-right:1.5rem!important}.mb-4,.my-4{margin-bottom:1.5rem!important}.ml-4,.mx-4{margin-left:1.5rem!important}.m-5{margin:3rem!important}.mt-5,.my-5{margin-top:3rem!important}.mr-5,.mx-5{margin-right:3rem!important}.mb-5,.my-5{margin-bottom:3rem!important}.ml-5,.mx-5{margin-left:3rem!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:.25rem!important}.pt-1,.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.pl-1,.px-1{padding-left:.25rem!important}.p-2{padding:.5rem!important}.pt-2,.py-2{padding-top:.5rem!important}.pr-2,.px-2{padding-right:.5rem!important}.pb-2,.py-2{padding-bottom:.5rem!important}.pl-2,.px-2{padding-left:.5rem!important}.p-3{padding:1rem!important}.pt-3,.py-3{padding-top:1rem!important}.pr-3,.px-3{padding-right:1rem!important}.pb-3,.py-3{padding-bottom:1rem!important}.pl-3,.px-3{padding-left:1rem!important}.p-4{padding:1.5rem!important}.pt-4,.py-4{padding-top:1.5rem!important}.pr-4,.px-4{padding-right:1.5rem!important}.pb-4,.py-4{padding-bottom:1.5rem!important}.pl-4,.px-4{padding-left:1.5rem!important}.p-5{padding:3rem!important}.pt-5,.py-5{padding-top:3rem!important}.pr-5,.px-5{padding-right:3rem!important}.pb-5,.py-5{padding-bottom:3rem!important}.pl-5,.px-5{padding-left:3rem!important}.m-n1{margin:-.25rem!important}.mt-n1,.my-n1{margin-top:-.25rem!important}.mr-n1,.mx-n1{margin-right:-.25rem!important}.mb-n1,.my-n1{margin-bottom:-.25rem!important}.ml-n1,.mx-n1{margin-left:-.25rem!important}.m-n2{margin:-.5rem!important}.mt-n2,.my-n2{margin-top:-.5rem!important}.mr-n2,.mx-n2{margin-right:-.5rem!important}.mb-n2,.my-n2{margin-bottom:-.5rem!important}.ml-n2,.mx-n2{margin-left:-.5rem!important}.m-n3{margin:-1rem!important}.mt-n3,.my-n3{margin-top:-1rem!important}.mr-n3,.mx-n3{margin-right:-1rem!important}.mb-n3,.my-n3{margin-bottom:-1rem!important}.ml-n3,.mx-n3{margin-left:-1rem!important}.m-n4{margin:-1.5rem!important}.mt-n4,.my-n4{margin-top:-1.5rem!important}.mr-n4,.mx-n4{margin-right:-1.5rem!important}.mb-n4,.my-n4{margin-bottom:-1.5rem!important}.ml-n4,.mx-n4{margin-left:-1.5rem!important}.m-n5{margin:-3rem!important}.mt-n5,.my-n5{margin-top:-3rem!important}.mr-n5,.mx-n5{margin-right:-3rem!important}.mb-n5,.my-n5{margin-bottom:-3rem!important}.ml-n5,.mx-n5{margin-left:-3rem!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media (min-width:576px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:.25rem!important}.mt-sm-1,.my-sm-1{margin-top:.25rem!important}.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}.m-sm-2{margin:.5rem!important}.mt-sm-2,.my-sm-2{margin-top:.5rem!important}.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}.m-sm-3{margin:1rem!important}.mt-sm-3,.my-sm-3{margin-top:1rem!important}.mr-sm-3,.mx-sm-3{margin-right:1rem!important}.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}.ml-sm-3,.mx-sm-3{margin-left:1rem!important}.m-sm-4{margin:1.5rem!important}.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}.m-sm-5{margin:3rem!important}.mt-sm-5,.my-sm-5{margin-top:3rem!important}.mr-sm-5,.mx-sm-5{margin-right:3rem!important}.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}.ml-sm-5,.mx-sm-5{margin-left:3rem!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:.25rem!important}.pt-sm-1,.py-sm-1{padding-top:.25rem!important}.pr-sm-1,.px-sm-1{padding-right:.25rem!important}.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}.pl-sm-1,.px-sm-1{padding-left:.25rem!important}.p-sm-2{padding:.5rem!important}.pt-sm-2,.py-sm-2{padding-top:.5rem!important}.pr-sm-2,.px-sm-2{padding-right:.5rem!important}.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}.pl-sm-2,.px-sm-2{padding-left:.5rem!important}.p-sm-3{padding:1rem!important}.pt-sm-3,.py-sm-3{padding-top:1rem!important}.pr-sm-3,.px-sm-3{padding-right:1rem!important}.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}.pl-sm-3,.px-sm-3{padding-left:1rem!important}.p-sm-4{padding:1.5rem!important}.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}.p-sm-5{padding:3rem!important}.pt-sm-5,.py-sm-5{padding-top:3rem!important}.pr-sm-5,.px-sm-5{padding-right:3rem!important}.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}.pl-sm-5,.px-sm-5{padding-left:3rem!important}.m-sm-n1{margin:-.25rem!important}.mt-sm-n1,.my-sm-n1{margin-top:-.25rem!important}.mr-sm-n1,.mx-sm-n1{margin-right:-.25rem!important}.mb-sm-n1,.my-sm-n1{margin-bottom:-.25rem!important}.ml-sm-n1,.mx-sm-n1{margin-left:-.25rem!important}.m-sm-n2{margin:-.5rem!important}.mt-sm-n2,.my-sm-n2{margin-top:-.5rem!important}.mr-sm-n2,.mx-sm-n2{margin-right:-.5rem!important}.mb-sm-n2,.my-sm-n2{margin-bottom:-.5rem!important}.ml-sm-n2,.mx-sm-n2{margin-left:-.5rem!important}.m-sm-n3{margin:-1rem!important}.mt-sm-n3,.my-sm-n3{margin-top:-1rem!important}.mr-sm-n3,.mx-sm-n3{margin-right:-1rem!important}.mb-sm-n3,.my-sm-n3{margin-bottom:-1rem!important}.ml-sm-n3,.mx-sm-n3{margin-left:-1rem!important}.m-sm-n4{margin:-1.5rem!important}.mt-sm-n4,.my-sm-n4{margin-top:-1.5rem!important}.mr-sm-n4,.mx-sm-n4{margin-right:-1.5rem!important}.mb-sm-n4,.my-sm-n4{margin-bottom:-1.5rem!important}.ml-sm-n4,.mx-sm-n4{margin-left:-1.5rem!important}.m-sm-n5{margin:-3rem!important}.mt-sm-n5,.my-sm-n5{margin-top:-3rem!important}.mr-sm-n5,.mx-sm-n5{margin-right:-3rem!important}.mb-sm-n5,.my-sm-n5{margin-bottom:-3rem!important}.ml-sm-n5,.mx-sm-n5{margin-left:-3rem!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media (min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:.25rem!important}.mt-md-1,.my-md-1{margin-top:.25rem!important}.mr-md-1,.mx-md-1{margin-right:.25rem!important}.mb-md-1,.my-md-1{margin-bottom:.25rem!important}.ml-md-1,.mx-md-1{margin-left:.25rem!important}.m-md-2{margin:.5rem!important}.mt-md-2,.my-md-2{margin-top:.5rem!important}.mr-md-2,.mx-md-2{margin-right:.5rem!important}.mb-md-2,.my-md-2{margin-bottom:.5rem!important}.ml-md-2,.mx-md-2{margin-left:.5rem!important}.m-md-3{margin:1rem!important}.mt-md-3,.my-md-3{margin-top:1rem!important}.mr-md-3,.mx-md-3{margin-right:1rem!important}.mb-md-3,.my-md-3{margin-bottom:1rem!important}.ml-md-3,.mx-md-3{margin-left:1rem!important}.m-md-4{margin:1.5rem!important}.mt-md-4,.my-md-4{margin-top:1.5rem!important}.mr-md-4,.mx-md-4{margin-right:1.5rem!important}.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}.ml-md-4,.mx-md-4{margin-left:1.5rem!important}.m-md-5{margin:3rem!important}.mt-md-5,.my-md-5{margin-top:3rem!important}.mr-md-5,.mx-md-5{margin-right:3rem!important}.mb-md-5,.my-md-5{margin-bottom:3rem!important}.ml-md-5,.mx-md-5{margin-left:3rem!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:.25rem!important}.pt-md-1,.py-md-1{padding-top:.25rem!important}.pr-md-1,.px-md-1{padding-right:.25rem!important}.pb-md-1,.py-md-1{padding-bottom:.25rem!important}.pl-md-1,.px-md-1{padding-left:.25rem!important}.p-md-2{padding:.5rem!important}.pt-md-2,.py-md-2{padding-top:.5rem!important}.pr-md-2,.px-md-2{padding-right:.5rem!important}.pb-md-2,.py-md-2{padding-bottom:.5rem!important}.pl-md-2,.px-md-2{padding-left:.5rem!important}.p-md-3{padding:1rem!important}.pt-md-3,.py-md-3{padding-top:1rem!important}.pr-md-3,.px-md-3{padding-right:1rem!important}.pb-md-3,.py-md-3{padding-bottom:1rem!important}.pl-md-3,.px-md-3{padding-left:1rem!important}.p-md-4{padding:1.5rem!important}.pt-md-4,.py-md-4{padding-top:1.5rem!important}.pr-md-4,.px-md-4{padding-right:1.5rem!important}.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}.pl-md-4,.px-md-4{padding-left:1.5rem!important}.p-md-5{padding:3rem!important}.pt-md-5,.py-md-5{padding-top:3rem!important}.pr-md-5,.px-md-5{padding-right:3rem!important}.pb-md-5,.py-md-5{padding-bottom:3rem!important}.pl-md-5,.px-md-5{padding-left:3rem!important}.m-md-n1{margin:-.25rem!important}.mt-md-n1,.my-md-n1{margin-top:-.25rem!important}.mr-md-n1,.mx-md-n1{margin-right:-.25rem!important}.mb-md-n1,.my-md-n1{margin-bottom:-.25rem!important}.ml-md-n1,.mx-md-n1{margin-left:-.25rem!important}.m-md-n2{margin:-.5rem!important}.mt-md-n2,.my-md-n2{margin-top:-.5rem!important}.mr-md-n2,.mx-md-n2{margin-right:-.5rem!important}.mb-md-n2,.my-md-n2{margin-bottom:-.5rem!important}.ml-md-n2,.mx-md-n2{margin-left:-.5rem!important}.m-md-n3{margin:-1rem!important}.mt-md-n3,.my-md-n3{margin-top:-1rem!important}.mr-md-n3,.mx-md-n3{margin-right:-1rem!important}.mb-md-n3,.my-md-n3{margin-bottom:-1rem!important}.ml-md-n3,.mx-md-n3{margin-left:-1rem!important}.m-md-n4{margin:-1.5rem!important}.mt-md-n4,.my-md-n4{margin-top:-1.5rem!important}.mr-md-n4,.mx-md-n4{margin-right:-1.5rem!important}.mb-md-n4,.my-md-n4{margin-bottom:-1.5rem!important}.ml-md-n4,.mx-md-n4{margin-left:-1.5rem!important}.m-md-n5{margin:-3rem!important}.mt-md-n5,.my-md-n5{margin-top:-3rem!important}.mr-md-n5,.mx-md-n5{margin-right:-3rem!important}.mb-md-n5,.my-md-n5{margin-bottom:-3rem!important}.ml-md-n5,.mx-md-n5{margin-left:-3rem!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media (min-width:992px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:.25rem!important}.mt-lg-1,.my-lg-1{margin-top:.25rem!important}.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}.m-lg-2{margin:.5rem!important}.mt-lg-2,.my-lg-2{margin-top:.5rem!important}.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}.m-lg-3{margin:1rem!important}.mt-lg-3,.my-lg-3{margin-top:1rem!important}.mr-lg-3,.mx-lg-3{margin-right:1rem!important}.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}.ml-lg-3,.mx-lg-3{margin-left:1rem!important}.m-lg-4{margin:1.5rem!important}.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}.m-lg-5{margin:3rem!important}.mt-lg-5,.my-lg-5{margin-top:3rem!important}.mr-lg-5,.mx-lg-5{margin-right:3rem!important}.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}.ml-lg-5,.mx-lg-5{margin-left:3rem!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:.25rem!important}.pt-lg-1,.py-lg-1{padding-top:.25rem!important}.pr-lg-1,.px-lg-1{padding-right:.25rem!important}.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}.pl-lg-1,.px-lg-1{padding-left:.25rem!important}.p-lg-2{padding:.5rem!important}.pt-lg-2,.py-lg-2{padding-top:.5rem!important}.pr-lg-2,.px-lg-2{padding-right:.5rem!important}.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}.pl-lg-2,.px-lg-2{padding-left:.5rem!important}.p-lg-3{padding:1rem!important}.pt-lg-3,.py-lg-3{padding-top:1rem!important}.pr-lg-3,.px-lg-3{padding-right:1rem!important}.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}.pl-lg-3,.px-lg-3{padding-left:1rem!important}.p-lg-4{padding:1.5rem!important}.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}.p-lg-5{padding:3rem!important}.pt-lg-5,.py-lg-5{padding-top:3rem!important}.pr-lg-5,.px-lg-5{padding-right:3rem!important}.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}.pl-lg-5,.px-lg-5{padding-left:3rem!important}.m-lg-n1{margin:-.25rem!important}.mt-lg-n1,.my-lg-n1{margin-top:-.25rem!important}.mr-lg-n1,.mx-lg-n1{margin-right:-.25rem!important}.mb-lg-n1,.my-lg-n1{margin-bottom:-.25rem!important}.ml-lg-n1,.mx-lg-n1{margin-left:-.25rem!important}.m-lg-n2{margin:-.5rem!important}.mt-lg-n2,.my-lg-n2{margin-top:-.5rem!important}.mr-lg-n2,.mx-lg-n2{margin-right:-.5rem!important}.mb-lg-n2,.my-lg-n2{margin-bottom:-.5rem!important}.ml-lg-n2,.mx-lg-n2{margin-left:-.5rem!important}.m-lg-n3{margin:-1rem!important}.mt-lg-n3,.my-lg-n3{margin-top:-1rem!important}.mr-lg-n3,.mx-lg-n3{margin-right:-1rem!important}.mb-lg-n3,.my-lg-n3{margin-bottom:-1rem!important}.ml-lg-n3,.mx-lg-n3{margin-left:-1rem!important}.m-lg-n4{margin:-1.5rem!important}.mt-lg-n4,.my-lg-n4{margin-top:-1.5rem!important}.mr-lg-n4,.mx-lg-n4{margin-right:-1.5rem!important}.mb-lg-n4,.my-lg-n4{margin-bottom:-1.5rem!important}.ml-lg-n4,.mx-lg-n4{margin-left:-1.5rem!important}.m-lg-n5{margin:-3rem!important}.mt-lg-n5,.my-lg-n5{margin-top:-3rem!important}.mr-lg-n5,.mx-lg-n5{margin-right:-3rem!important}.mb-lg-n5,.my-lg-n5{margin-bottom:-3rem!important}.ml-lg-n5,.mx-lg-n5{margin-left:-3rem!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media (min-width:1200px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:.25rem!important}.mt-xl-1,.my-xl-1{margin-top:.25rem!important}.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}.m-xl-2{margin:.5rem!important}.mt-xl-2,.my-xl-2{margin-top:.5rem!important}.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}.m-xl-3{margin:1rem!important}.mt-xl-3,.my-xl-3{margin-top:1rem!important}.mr-xl-3,.mx-xl-3{margin-right:1rem!important}.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}.ml-xl-3,.mx-xl-3{margin-left:1rem!important}.m-xl-4{margin:1.5rem!important}.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}.m-xl-5{margin:3rem!important}.mt-xl-5,.my-xl-5{margin-top:3rem!important}.mr-xl-5,.mx-xl-5{margin-right:3rem!important}.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}.ml-xl-5,.mx-xl-5{margin-left:3rem!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:.25rem!important}.pt-xl-1,.py-xl-1{padding-top:.25rem!important}.pr-xl-1,.px-xl-1{padding-right:.25rem!important}.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}.pl-xl-1,.px-xl-1{padding-left:.25rem!important}.p-xl-2{padding:.5rem!important}.pt-xl-2,.py-xl-2{padding-top:.5rem!important}.pr-xl-2,.px-xl-2{padding-right:.5rem!important}.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}.pl-xl-2,.px-xl-2{padding-left:.5rem!important}.p-xl-3{padding:1rem!important}.pt-xl-3,.py-xl-3{padding-top:1rem!important}.pr-xl-3,.px-xl-3{padding-right:1rem!important}.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}.pl-xl-3,.px-xl-3{padding-left:1rem!important}.p-xl-4{padding:1.5rem!important}.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}.p-xl-5{padding:3rem!important}.pt-xl-5,.py-xl-5{padding-top:3rem!important}.pr-xl-5,.px-xl-5{padding-right:3rem!important}.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}.pl-xl-5,.px-xl-5{padding-left:3rem!important}.m-xl-n1{margin:-.25rem!important}.mt-xl-n1,.my-xl-n1{margin-top:-.25rem!important}.mr-xl-n1,.mx-xl-n1{margin-right:-.25rem!important}.mb-xl-n1,.my-xl-n1{margin-bottom:-.25rem!important}.ml-xl-n1,.mx-xl-n1{margin-left:-.25rem!important}.m-xl-n2{margin:-.5rem!important}.mt-xl-n2,.my-xl-n2{margin-top:-.5rem!important}.mr-xl-n2,.mx-xl-n2{margin-right:-.5rem!important}.mb-xl-n2,.my-xl-n2{margin-bottom:-.5rem!important}.ml-xl-n2,.mx-xl-n2{margin-left:-.5rem!important}.m-xl-n3{margin:-1rem!important}.mt-xl-n3,.my-xl-n3{margin-top:-1rem!important}.mr-xl-n3,.mx-xl-n3{margin-right:-1rem!important}.mb-xl-n3,.my-xl-n3{margin-bottom:-1rem!important}.ml-xl-n3,.mx-xl-n3{margin-left:-1rem!important}.m-xl-n4{margin:-1.5rem!important}.mt-xl-n4,.my-xl-n4{margin-top:-1.5rem!important}.mr-xl-n4,.mx-xl-n4{margin-right:-1.5rem!important}.mb-xl-n4,.my-xl-n4{margin-bottom:-1.5rem!important}.ml-xl-n4,.mx-xl-n4{margin-left:-1.5rem!important}.m-xl-n5{margin:-3rem!important}.mt-xl-n5,.my-xl-n5{margin-top:-3rem!important}.mr-xl-n5,.mx-xl-n5{margin-right:-3rem!important}.mb-xl-n5,.my-xl-n5{margin-bottom:-3rem!important}.ml-xl-n5,.mx-xl-n5{margin-left:-3rem!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-monospace{font-family:Fira Code,Andale Mono,monospace!important}.text-justify{text-align:justify!important}.text-wrap{white-space:normal!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media (min-width:576px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-lighter{font-weight:lighter!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-weight-bolder{font-weight:bolder!important}.font-italic{font-style:italic!important}.text-white{color:#fff!important}.text-primary{color:#414551!important}a.text-primary:focus,a.text-primary:hover{color:#1f2127!important}.text-secondary{color:#ca445e!important}a.text-secondary:focus,a.text-secondary:hover{color:#972b40!important}.text-body{color:#212529!important}.text-muted{color:#6c757d!important}.text-black-50{color:rgba(0,0,0,.5)!important}.text-white-50{color:hsla(0,0%,100%,.5)!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-decoration-none{text-decoration:none!important}.text-break{word-break:break-word!important;overflow-wrap:break-word!important}.text-reset{color:inherit!important}.visible{visibility:visible!important}.invisible{visibility:hidden!important}:root{--font-family-toolbar-main:"Lato",sans-serif;--font-weight-toolbar-main:400;--font-family-toolbar-details:"Lato",sans-serif;--font-weight-toolbar-details:400;--font-family-sidebar:"Lato",sans-serif;--font-size-sidebar-category:18px;--font-weight-sidebar-category:400;--font-size-sidebar-page:1rem;--font-weight-sidebar-page:400} \ No newline at end of file diff --git a/scaladoc-testcases/docs/docs/docs/f1.md b/scaladoc-testcases/docs/docs/docs/f1.md new file mode 100644 index 000000000000..f5b5556f90ac --- /dev/null +++ b/scaladoc-testcases/docs/docs/docs/f1.md @@ -0,0 +1,7 @@ +--- +layout: static-site-main +redirectFrom: + - docs/fr.html + - docs/my-custom-link +--- +F1 diff --git a/scaladoc-testcases/docs/docs/docs/f2.md b/scaladoc-testcases/docs/docs/docs/f2.md new file mode 100644 index 000000000000..2b78acc99544 --- /dev/null +++ b/scaladoc-testcases/docs/docs/docs/f2.md @@ -0,0 +1,4 @@ +--- +layout: static-site-main +--- +F2 diff --git a/scaladoc-testcases/docs/docs/docs/f3.md b/scaladoc-testcases/docs/docs/docs/f3.md new file mode 100644 index 000000000000..4f66928a6431 --- /dev/null +++ b/scaladoc-testcases/docs/docs/docs/f3.md @@ -0,0 +1,4 @@ +--- +layout: static-site-main +--- +F3 diff --git a/scaladoc-testcases/docs/docs/docs/f4.md b/scaladoc-testcases/docs/docs/docs/f4.md new file mode 100644 index 000000000000..c70fac051d13 --- /dev/null +++ b/scaladoc-testcases/docs/docs/docs/f4.md @@ -0,0 +1,4 @@ +--- +layout: static-site-main +--- +F4 diff --git a/scaladoc-testcases/docs/sidebar.yml b/scaladoc-testcases/docs/sidebar.yml new file mode 100644 index 000000000000..6ab7a4936ede --- /dev/null +++ b/scaladoc-testcases/docs/sidebar.yml @@ -0,0 +1,7 @@ +sidebar: + - title: Docs + subsection: + - page: docs/docs/f1.md + - page: docs/docs/f2.md + - page: docs/docs/f3.md + - page: docs/docs/f4.md diff --git a/scaladoc/resources/dotty_res/styles/scalastyle.css b/scaladoc/resources/dotty_res/styles/scalastyle.css index 747bf7cd5e8b..0c639a324f24 100644 --- a/scaladoc/resources/dotty_res/styles/scalastyle.css +++ b/scaladoc/resources/dotty_res/styles/scalastyle.css @@ -18,7 +18,7 @@ body { margin: 0; padding: 0; font-family: "Lato", sans-serif; - font-size: 16px; + font-size: 18px; background: var(--body-bg); } body, button, input { @@ -77,7 +77,7 @@ code { padding: 0 .3em; } pre { - overflow: visible; + overflow-x: auto; scrollbar-width: thin; margin: 0px; } @@ -88,7 +88,10 @@ pre code, pre code.hljs { pre, .symbol.monospace { font-weight: 500; - font-size: 12px; + font-size: 14px; + padding: 8px; + margin-top: 8px; + margin-bottom: 8px; } pre .hljs-comment { /* Fold comments in snippets */ @@ -176,7 +179,7 @@ th { /* Navigation */ #sideMenu2 { - overflow-y: scroll; + overflow-y: auto; overflow-x: hidden; height: 100%; @@ -1018,9 +1021,6 @@ footer .socials { } } - - - /* Breadcrumbs */ .breadcrumbs a { @@ -1035,4 +1035,76 @@ footer .socials { align-self: flex-start; } +/* Header from docs.scala-lang */ + +.navigation .navigation-menu { + padding-left: 0px; + margin: 18px 0px; +} +.navigation .navigation-menu .navigation-menu-item { + margin: 5px 0px; + display: inline-block; +} +.navigation .navigation-menu .navigation-menu-item:last-child { + margin-right: 0px; +} +.navigation .navigation-menu .navigation-menu-item a { + padding: 5px 15px; + text-transform: uppercase; + border-radius: 300px; + font-weight: 700; + color: var(--title-fg); +} +.navigation .navigation-menu .navigation-menu-item a:active, .navigation .navigation-menu .navigation-menu-item a:focus, .navigation .navigation-menu .navigation-menu-item a:hover, .navigation .navigation-menu .navigation-menu-item a.active { + background: var(--red500); + text-decoration: none; +} +.two-columns { + display: flex; + justify-content: space-between; +} + +/* Nav Icons */ + +.arrows { + font-size: 3em; + text-align: center; + + position: fixed; + top: 0; + bottom: 0; + margin: 0; + max-width: 150px; + min-width: 90px; + + display: flex; + justify-content: center; + flex-direction: column; + + transition: color 0.5s, background-color 0.5s; +} + +.arrows.previous, .arrows.next { + color: var(--grey400); +} + +.arrows:hover { + text-decoration: none; + color: var(--grey300); + background-color: var(--grey900); + transition: background-color 0.15s, color 0.15s; +} +.previous { + left: var(--side-width); + float: left; +} + +.next { + right: 0; + float: right; +} + +@media screen and (max-width: 1000px) { + .arrows-wrapper { display: none; } +} diff --git a/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala b/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala index bd8493ebb9ec..580acf9cb6ca 100644 --- a/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala +++ b/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala @@ -61,6 +61,7 @@ object Scaladoc: apiSubdirectory : Boolean = false, scastieConfiguration: String = "", projectFormat: String = "html", + defaultTemplate: Option[String] = None, ) def run(args: Array[String], rootContext: CompilerContext): Reporter = @@ -239,6 +240,7 @@ object Scaladoc: apiSubdirectory.get, scastieConfiguration.get, projectFormat.get, + defaultTemplate.nonDefault ) (Some(docArgs), newContext) } diff --git a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala index e6e32ec475d5..ea35ac0f9b8c 100644 --- a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala +++ b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala @@ -135,5 +135,15 @@ class ScaladocSettings extends SettingGroup with AllScalaSettings: "html" ) + val defaultTemplate: Setting[String] = + StringSetting( + "-default-template", + "default template used by static site", + "The static site is generating empty files for indexes that haven't been provided explicitly in a sidebar/missing index.html in directory. " + + "User can specify what default template should be used for such indexes. It can be useful for providing generic templates that interpolate some common settings, like title, or can have some custom html embedded.", + "" + ) + + def scaladocSpecificSettings: Set[Setting[_]] = Set(sourceLinks, legacySourceLink, syntax, revision, externalDocumentationMappings, socialLinks, skipById, skipByRegex, deprecatedSkipPackages, docRootContent, snippetCompiler, generateInkuire, scastieConfiguration) diff --git a/scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala b/scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala index 398f57d083d4..a9e300040fb8 100644 --- a/scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala +++ b/scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala @@ -13,6 +13,7 @@ def pathToString(p: Path) = trait SourceLink: val path: Option[Path] = None def render(memberName: String, path: Path, operation: String, line: Option[Int], optionalRevision: Option[String]): String + def repoSummary: RepoSummary case class TemplateSourceLink(val urlTemplate: String) extends SourceLink: override val path: Option[Path] = None @@ -32,9 +33,13 @@ case class TemplateSourceLink(val urlTemplate: String) extends SourceLink: mapping.foldLeft(urlTemplate) { case (sourceLink, (regex, value)) => regex.replaceAllIn(sourceLink, Regex.quoteReplacement(value)) } + override def repoSummary = UnknownRepoSummary +sealed class RepoSummary +case class DefinedRepoSummary(origin: String, org: String, repo: String) extends RepoSummary +case object UnknownRepoSummary extends RepoSummary // we cannot easily get that information from template source links -case class WebBasedSourceLink(prefix: String, revision: String, subPath: String) extends SourceLink: +case class WebBasedSourceLink(repoSummary: RepoSummary, prefix: String, revision: String, subPath: String) extends SourceLink: override val path: Option[Path] = None override def render(memberName: String, path: Path, operation: String, line: Option[Int], optionalRevision: Option[String] = None): String = val action = if operation == "view" then "blob" else operation @@ -79,10 +84,10 @@ class SourceLinkParser(revision: Option[String]) extends ArgParser[SourceLink]: name match case "github" => withRevision(rev => - WebBasedSourceLink(githubPrefix(organization, repo), rev, subPath)) + WebBasedSourceLink(DefinedRepoSummary("github", organization, repo), githubPrefix(organization, repo), rev, subPath)) case "gitlab" => withRevision(rev => - WebBasedSourceLink(gitlabPrefix(organization, repo), rev, subPath)) + WebBasedSourceLink(DefinedRepoSummary("gitlab", organization, repo), gitlabPrefix(organization, repo), rev, subPath)) case other => Left(s"'$other' is not a known provider, please provide full source path template.") case BrokenKnownProvider("gitlab" | "github") => @@ -97,13 +102,22 @@ class SourceLinkParser(revision: Option[String]) extends ArgParser[SourceLink]: type Operation = "view" | "edit" -class SourceLinks(val sourceLinks: PathBased[SourceLink]): +class SourceLinks(private val sourceLinks: PathBased[SourceLink]): def pathTo(rawPath: Path, memberName: String = "", line: Option[Int] = None, operation: Operation = "view", optionalRevision: Option[String] = None): Option[String] = sourceLinks.get(rawPath).map(res => res.elem.render(memberName, res.path, operation, line, optionalRevision)) def pathTo(member: Member): Option[String] = member.sources.flatMap(s => pathTo(s.path, member.name, Option(s.lineNumber).map(_ + 1))) + def repoSummary(path: Path): Option[RepoSummary] = + sourceLinks.get(path).map(_.elem.repoSummary) + + def fullPath(path: Path): Option[Path] = + sourceLinks.get(path).map { case PathBased.Result(path, elem) => elem match + case e: WebBasedSourceLink => Paths.get(e.subPath, path.toString) + case _ => path + } + object SourceLinks: val usage = """Source links provide a mapping between file in documentation and code repository. diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala index 3b6876238436..b743163eaaf7 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala @@ -13,6 +13,7 @@ import java.nio.file.Path import java.nio.file.Files import java.nio.file.FileVisitOption import java.io.File +import dotty.tools.scaladoc.staticFileSymbolUUID class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: DocContext) extends Renderer(rootPackage, members, extension = "html"): @@ -82,6 +83,17 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do linkResources(page.link.dri, earlyResources, deferJs = false).toList, linkResources(page.link.dri, resources, deferJs = true).toList, script(raw(s"""var pathToRoot = "${pathToRoot(page.link.dri)}";""")), + (page.content match + case ResolvedTemplate(loadedTemplate, _) => + val path = loadedTemplate.file.toPath + ctx.sourceLinks.repoSummary(path) match + case Some(DefinedRepoSummary("github", org, repo)) => + val tag: TagArg = ctx.sourceLinks.fullPath(relativePath(path)).fold("") { githubContributors => + script(raw(s"""var githubContributorsUrl = "https://api.github.com/repos/$org/$repo/commits?path=$githubContributors";""")) + } + tag // for some reason inference fails so had to state the type explicitly + case _ => "" + case _ => ""), ctx.args.versionsDictionaryUrl match case Some(url) => script(raw(s"""var versionsDictionaryUrl = "$url";""")) case None => "" @@ -148,7 +160,7 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do a(href := pathToPage(link.dri, b.dri))(b.name), "/" )).dropRight(1) - div(cls := "breadcrumbs")(innerTags:_*) + div(cls := "breadcrumbs container")(innerTags:_*) def textFooter: String | AppliedTag = args.projectFooter.fold("") { f => diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala index 7664a542c2bb..d0b51bf54e6f 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala @@ -3,6 +3,7 @@ package renderers import util.HTML._ import collection.JavaConverters._ +import collection.mutable.ListBuffer import java.net.URI import java.net.URL import dotty.tools.scaladoc.site._ @@ -45,7 +46,44 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot val msg = s"ERROR: Multiple index pages for doc found ${indexes.map(_.file)}" report.error(msg) - val templatePages = templates.map(templateToPage(_, siteContext)) + // Below code is for walking in order the tree and modifing its nodes basing on its neighbours + + // First we flatten templates to get them sorted in-order + def flattenedTemplates(template: LoadedTemplate): Seq[LoadedTemplate] = + template +: template.children.flatMap(flattenedTemplates) + + // We add dummy guards + val allTemplates: Seq[Option[LoadedTemplate]] = None +: templates.flatMap(flattenedTemplates).map(Some(_)) :+ None + + // Let's gather the list of maps for each template with its in-order neighbours + val newSettings: List[Map[String, Object]] = allTemplates.sliding(size = 3, step = 1).map { + case None :: None :: Nil => + Map.empty + case prev :: mid :: next :: Nil => + def link(sibling: Option[LoadedTemplate]): Option[String] = + def realPath(path: Path) = if Files.isDirectory(path) then Paths.get(path.toString, "index.html") else path + sibling.map { n => + val realMidPath = realPath(mid.get.file.toPath) + val realSiblingPath = realPath(n.file.toPath) + realMidPath.relativize(realSiblingPath).toString.stripPrefix("../") + } + List(link(prev).map("previous" -> _), link(next).map("next" -> _)).flatten.toMap + }.toList + + def updateSettings(templates: Seq[LoadedTemplate], additionalSettings: ListBuffer[Map[String, Object]]): List[LoadedTemplate] = + val updatedTemplates = List.newBuilder[LoadedTemplate] + for template <- templates do + val head: Map[String, Object] = additionalSettings.remove(0) + val current: Map[String, Object] = template.templateFile.settings.getOrElse("page", Map.empty).asInstanceOf[Map[String, Object]] + val updatedTemplateFile = template.templateFile.copy(settings = template.templateFile.settings.updated("page", head ++ current)) + updatedTemplates += template.copy( + templateFile = updatedTemplateFile, + children = updateSettings(template.children, additionalSettings) + ) + updatedTemplates.result() + + val newTemplates = updateSettings(templates, newSettings.to(ListBuffer)) + val templatePages = newTemplates.map(templateToPage(_, siteContext)) indexes.headOption match case None if templatePages.isEmpty=> @@ -73,6 +111,12 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot (siteContext.orphanedTemplates ++ actualIndexTemplate).map(templateToPage(_, siteContext)) + val redirectPages: Seq[Page] = staticSite.fold(Seq.empty)(siteContext => siteContext.redirectTemplates.map { + case (template, driFrom, driTo) => + val redirectTo = pathToPage(driFrom, driTo) + templateToPage(template.copy(templateFile = template.templateFile.copy(settings = template.templateFile.settings ++ Map("redirectTo" -> redirectTo))), siteContext) + }) + /** * Here we have to retrive index pages from hidden pages and replace fake index pages in navigable page tree. */ @@ -89,7 +133,7 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot val (newNavigablePage, pagesToRemove) = traversePages(navigablePage) - val all = newNavigablePage +: hiddenPages.filterNot(pagesToRemove.contains) + val all = newNavigablePage +: (hiddenPages.filterNot(pagesToRemove.contains) ++ redirectPages) // We need to check for conflicts only if we have top-level member called blog or docs val hasPotentialConflict = rootPackage.members.exists(m => m.name.startsWith("docs") || m.name.startsWith("blog")) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala index a5a30b41681b..396c7830d8dc 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala @@ -33,7 +33,7 @@ trait SiteRenderer(using DocContext) extends Locations: case HashRegex(path, prefix) => (path, prefix) case _ => (str, "") - val res = ctx.driForLink(content.template.templateFile, path).filter(driExists) + val res = ctx.driForLink(content.template.file, path).filter(driExists) res.headOption.map(pathToPage(pageDri, _) + prefix) def processLocalLink(str: String): String = diff --git a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala index 3a7ba6c98d07..ec9ac220b413 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala @@ -41,8 +41,15 @@ case class LoadedTemplate( val posts = children.map(_.lazyTemplateProperties(ctx)) def getMap(key: String) = templateFile.settings.getOrElse(key, Map.empty).asInstanceOf[Map[String, Object]] + val sourceLinks = if !file.exists() then Nil else + // TODO (https://github.com/lampepfl/scala3doc/issues/240): configure source root + // toRealPath is used to turn symlinks into proper paths + val actualPath = Paths.get("").toAbsolutePath.relativize(file.toPath.toRealPath()) + ctx.sourceLinks.pathTo(actualPath).map("viewSource" -> _ ) ++ + ctx.sourceLinks.pathTo(actualPath, operation = "edit", optionalRevision = Some("master")).map("editSource" -> _) + val updatedSettings = templateFile.settings ++ ctx.projectWideProperties + - ("site" -> (getMap("site") + ("posts" -> posts))) + + ("site" -> (getMap("site") + ("posts" -> posts))) + ("urls" -> sourceLinks.toMap) + ("page" -> (getMap("page") + ("title" -> templateFile.title.name))) templateFile.resolveInner(RenderingContext(updatedSettings, ctx.layouts))(using ctx) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala index ded1a1ff20db..3610c8163649 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala @@ -71,6 +71,24 @@ class StaticSiteContext( orphanedFiles.flatMap(p => loadTemplate(p.toFile, isBlog = false)) } + lazy val redirectTemplates: Seq[(LoadedTemplate, DRI, DRI)] = { + def doFlatten(t: LoadedTemplate): Seq[LoadedTemplate] = + t +: t.children.flatMap(doFlatten) + val mainFiles = templates.flatMap(doFlatten) + mainFiles.flatMap { loadedTemplate => + val redirectFrom = loadedTemplate.templateFile.settings.getOrElse("page", Map.empty).asInstanceOf[Map[String, Object]].get("redirectFrom") + def redirectToTemplate(redirectFrom: String) = + val fakeFile = new File(docsPath.toFile, redirectFrom) + val driFrom = driFor(fakeFile.toPath) + val driTo = driFor(loadedTemplate.file.toPath) + (LoadedTemplate(layouts("redirect"), List.empty, fakeFile), driFrom, driTo) + redirectFrom.map { + case redirectFrom: String => Seq(redirectToTemplate(redirectFrom)) + case redirects: List[?] => redirects.asInstanceOf[List[String]].map(redirectToTemplate) + }.getOrElse(Nil) + } + } + val docsPath = root.toPath.resolve("docs") private def isValidTemplate(file: File): Boolean = @@ -87,10 +105,10 @@ class StaticSiteContext( val (indexes, children) = allFiles.flatMap(loadTemplate(_, isBlog)).partition(_.templateFile.isIndexPage()) def loadIndexPage(): TemplateFile = - val indexFiles = from.listFiles { file => file.getName == "index.md" || file.getName == "index.html" } indexes match - case Nil => emptyTemplate(from, from.getName) - case Seq(loadedTemplate) => loadedTemplate.templateFile.copy(file = from) + case Nil => + args.defaultTemplate.fold(emptyTemplate(from, from.getName))(layouts(_).copy(title = TemplateName.FilenameDefined(from.getName))).copy(file = File(from, "index.html")) + case Seq(loadedTemplate) => loadedTemplate.templateFile case _ => // TODO (https://github.com/lampepfl/scaladoc/issues/238): provide proper error handling val msg = s"ERROR: Multiple index pages for $from found in ${indexes.map(_.file)}" @@ -116,14 +134,14 @@ class StaticSiteContext( } val processedTemplate = // Set provided name as arg in page for `docs` - if from.getParentFile.toPath == docsPath && templateFile.isIndexPage() then + if templateFile.file.getParentFile.toPath == docsPath && templateFile.isIndexPage() then if templateFile.title.name != "index" then report.warn("Property `title` will be overridden by project name", from) templateFile.copy(title = TemplateName.FilenameDefined(args.name)) else templateFile - Some(LoadedTemplate(processedTemplate, processedChildren.toList, from)) + Some(LoadedTemplate(processedTemplate, processedChildren.toList, processedTemplate.file)) catch case e: RuntimeException => // TODO (https://github.com/lampepfl/scaladoc/issues/238): provide proper error handling @@ -137,17 +155,17 @@ class StaticSiteContext( if Files.exists(root.toPath.resolve(pagePath)) then pagePath else pagePath.stripSuffix(".html") + ".md" - val file = root.toPath.resolve(path).toFile - val LoadedTemplate(template, children, _) = loadTemplate(file, isBlog).get // Add proper logging if file does not exisits + // val file = root.toPath.resolve(path).toFile + val LoadedTemplate(template, children, file) = loadTemplate(root.toPath.resolve(path).toFile, isBlog).get // Add proper logging if file does not exisits optionTitle match case Some(title) => val newTitle = template.title match case t: TemplateName.YamlDefined => t case _: TemplateName.FilenameDefined => TemplateName.SidebarDefined(title) case t: TemplateName.SidebarDefined => t // should never reach this path - LoadedTemplate(template.copy(settings = template.settings + ("title" -> newTitle.name), file = file, title = newTitle), children, file) + LoadedTemplate(template.copy(settings = template.settings + ("title" -> newTitle.name), title = newTitle), children, file) case None => - LoadedTemplate(template.copy(settings = template.settings, file = file), children, file) + LoadedTemplate(template.copy(settings = template.settings), children, file) case Sidebar.Category(optionTitle, optionIndexPath, nested) => optionIndexPath match @@ -157,30 +175,49 @@ class StaticSiteContext( val title = optionTitle match case Some(t) => t case None => "index" - val fakeFile = new File(new File(root, "docs"), title) - LoadedTemplate(emptyTemplate(fakeFile, title), nested.map(loadSidebarContent), fakeFile) + val sidebarContent = nested.map(loadSidebarContent) + // Heuristic to add section index.html around its child pages. Otherwise we put it in directory named after title of section in top-level + def longestPrefix(s1: String, s2: String): String = s1.zip(s2).takeWhile(Function.tupled(_ == _)).map(_._1).mkString + val sortedNames = sidebarContent.collect { + case t if t.file.getName.reverse.dropWhile(_ != '.').reverse != "index" => + t.file.toPath.toString + }.sorted + def indexPathTemplate(s: String) = Paths.get(root.toString, s, "index.html").toFile + val fakeFile = Option.when(sortedNames.nonEmpty)(sortedNames).map { s => + indexPathTemplate(longestPrefix(s.head, s.last)) + }.filter(_.exists).getOrElse { + indexPathTemplate(s"docs/${title.toLowerCase}") + } + LoadedTemplate( + args.defaultTemplate.fold(emptyTemplate(fakeFile, title))(layouts(_).copy(title = TemplateName.FilenameDefined(title))), + sidebarContent, + fakeFile + ) private def loadAllFiles() = def dir(name: String)= List(new File(root, name)).filter(_.isDirectory) dir("docs").flatMap(_.listFiles()).flatMap(loadTemplate(_, isBlog = false)) ++ dir("blog").flatMap(loadTemplate(_, isBlog = true)) - def driForLink(template: TemplateFile, link: String): Seq[DRI] = + def driForLink(loadedTemplateFile: File, link: String): Seq[DRI] = val pathsDri: Option[Seq[DRI]] = Try { val baseFile = - if link.startsWith("/") then root.toPath.resolve(link.drop(1)) - else template.file.toPath.getParent().resolve(link).normalize() + if + link.startsWith("/") then root.toPath.resolve(link.drop(1)) + else + val path = loadedTemplateFile.toPath + (if Files.isDirectory(path) then path else path.getParent).resolve(link).normalize val fileName = baseFile.getFileName.toString val baseFileName = if fileName.endsWith(".md") then fileName.stripSuffix(".md") else fileName.stripSuffix(".html") - - Seq( + (Seq( Some(baseFile.resolveSibling(baseFileName + ".html")), - Some(baseFile.resolveSibling(baseFileName + ".md")), + Some(baseFile.resolveSibling(baseFileName + ".md")) + ).flatten.filter(Files.exists(_)) ++ Seq( Option.when(baseFileName == "index")(baseFile.getParent) - ).flatten.filter(Files.exists(_)).map(driFor) + ).flatten).map(driFor) }.toOption.filter(_.nonEmpty) pathsDri.getOrElse(memberLinkResolver(link).toList) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala index 8ca2601f9b63..0e8b0994595b 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala @@ -115,14 +115,6 @@ case class TemplateFile( case "html" => Template.parse(this.rawCode).`with`(tag).render(mutableProperties) case "md" => this.rawCode - val sourceLinks = if !file.exists() then Nil else - // TODO (https://github.com/lampepfl/scala3doc/issues/240): configure source root - // toRealPath is used to turn symlinks into proper paths - val actualPath = Paths.get("").toAbsolutePath.relativize(file.toPath.toRealPath()) - ssctx.sourceLinks.pathTo(actualPath).map("viewSource" -> _ ) ++ - // List("editSource" -> ssctx.sourceLinks.pathTo(actualPath)) - ssctx.sourceLinks.pathTo(actualPath, operation = "edit", optionalRevision = Some("master")).map("editSource" -> _ ) - // We want to render markdown only if next template is html val code = if (isHtml || layoutTemplate.exists(!_.isHtml)) rendered else // Snippet compiler currently supports markdown only @@ -132,7 +124,7 @@ case class TemplateFile( ssctx.args.projectFormat match case "html" => HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed) - case "md" => FrontMatterRenderer.render(settings + ("urls" -> sourceLinks.toMap)) + + case "md" => FrontMatterRenderer.render(ctx.properties ++ settings) + Formatter.builder(defaultMarkdownOptions).build().render(processed) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala index a989cfa124e3..9c95ae06d9ee 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala @@ -13,7 +13,7 @@ case class SnippetLine(content: String, lineNo: Int, classes: Set[String] = Set. private def attributesToString: String = attributes.updated("id", lineNo).map((key, value) => s"""$key="$value"""").mkString(" ") def toHTML = val label = if messages.nonEmpty then s"""label="${messages.map(_.escapeReservedTokens).mkString("\n")}"""" else "" - s"""$content""" + s"""$content""" object SnippetRenderer: val hiddenStartSymbol = "//{" diff --git a/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala b/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala index 656e7dbaf9e5..fc215b1de229 100644 --- a/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala @@ -84,4 +84,4 @@ class ReportingTest: .foreach( word => Assert.assertTrue(s"Error message: $msg should contains $word", msg.contains(word)) ) - } \ No newline at end of file + } From 8d9bf45ca3f8c75cb7d699722beffd77e110c444 Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Thu, 2 Dec 2021 09:08:53 +0100 Subject: [PATCH 0861/1244] Fix typo in benchmark profiles --- bench/profiles/projects.yml | 2 +- bench/profiles/sbt.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bench/profiles/projects.yml b/bench/profiles/projects.yml index 10e90eb1c5d3..cc6fb7c90474 100644 --- a/bench/profiles/projects.yml +++ b/bench/profiles/projects.yml @@ -26,7 +26,7 @@ charts: scripts: dotty: - - measure -- -with-compiler $ $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) + - measure -- -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) re2s: - measure -- $(find $PROG_HOME/tests/re2s/src -name *.scala) diff --git a/bench/profiles/sbt.yml b/bench/profiles/sbt.yml index 0503a35d36a7..3e5e8f44a3dc 100644 --- a/bench/profiles/sbt.yml +++ b/bench/profiles/sbt.yml @@ -9,7 +9,7 @@ charts: scripts: dotty-sbt: - - measure -- -with-compiler $ -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) + - measure -- -with-compiler -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) config: pr_base_url: "https://github.com/lampepfl/dotty/pull/" From abab3ee37879ddd189f3e088fd387b8c9b06d90a Mon Sep 17 00:00:00 2001 From: Georgi Krastev Date: Fri, 26 Nov 2021 01:34:24 +0100 Subject: [PATCH 0862/1244] Fix Mirror.Product for type lambdas We don't need to guess how the type parameters should be substituted. Instead we can use the result type directly to obtain the member type. This exposed another issue - the mirrored type contained type variables. To get rid of them we apply `Type.stripTypeVar` recursively. --- .../src/dotty/tools/dotc/core/TypeOps.scala | 7 +++++ .../dotty/tools/dotc/typer/Synthesizer.scala | 17 +++------- tests/pos/i13859.scala | 31 +++++++++++++++++++ 3 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 tests/pos/i13859.scala diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala index 6a5145ffd202..451b567dc771 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeOps.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeOps.scala @@ -829,4 +829,11 @@ object TypeOps: def nestedPairs(ts: List[Type])(using Context): Type = ts.foldRight(defn.EmptyTupleModule.termRef: Type)(defn.PairClass.typeRef.appliedTo(_, _)) + class StripTypeVarsMap(using Context) extends TypeMap: + def apply(tp: Type) = mapOver(tp).stripTypeVar + + /** Apply [[Type.stripTypeVar]] recursively. */ + def stripTypeVars(tp: Type)(using Context): Type = + new StripTypeVarsMap().apply(tp) + end TypeOps diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala index 44351b9a213c..31694c23a8e0 100644 --- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala @@ -249,21 +249,12 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): val cls = mirroredType.classSymbol val accessors = cls.caseAccessors.filterNot(_.isAllOf(PrivateLocal)) val elemLabels = accessors.map(acc => ConstantType(Constant(acc.name.toString))) + val nestedPairs = TypeOps.nestedPairs(accessors.map(mirroredType.resultType.memberInfo(_).widenExpr)) val (monoType, elemsType) = mirroredType match case mirroredType: HKTypeLambda => - def accessorType(acc: Symbol) = - if cls.typeParams.hasSameLengthAs(mirroredType.paramRefs) then - acc.info.subst(cls.typeParams, mirroredType.paramRefs) - else - acc.info - val elems = - mirroredType.derivedLambdaType( - resType = TypeOps.nestedPairs(accessors.map(accessorType)) - ) - (mkMirroredMonoType(mirroredType), elems) + (mkMirroredMonoType(mirroredType), mirroredType.derivedLambdaType(resType = nestedPairs)) case _ => - val elems = TypeOps.nestedPairs(accessors.map(mirroredType.memberInfo(_).widenExpr)) - (mirroredType, elems) + (mirroredType, nestedPairs) val elemsLabels = TypeOps.nestedPairs(elemLabels) checkRefinement(formal, tpnme.MirroredElemTypes, elemsType, span) checkRefinement(formal, tpnme.MirroredElemLabels, elemsLabels, span) @@ -344,7 +335,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): (using Context): Tree = if checkFormal(formal) then formal.member(tpnme.MirroredType).info match - case TypeBounds(mirroredType, _) => synth(mirroredType.stripTypeVar, formal, span) + case TypeBounds(mirroredType, _) => synth(TypeOps.stripTypeVars(mirroredType), formal, span) case other => EmptyTree else EmptyTree diff --git a/tests/pos/i13859.scala b/tests/pos/i13859.scala new file mode 100644 index 000000000000..4092de52fd94 --- /dev/null +++ b/tests/pos/i13859.scala @@ -0,0 +1,31 @@ +import scala.deriving.* + +object Test: + type Kind1[C, O[_]] = C { + type MirroredType[X] = O[X] + type MirroredMonoType = O[Any] + type MirroredElemTypes[_] <: Tuple + } + + type Kind2[C, O[_, _]] = C { + type MirroredType[X, Y] = O[X, Y] + type MirroredMonoType = O[Any, Any] + type MirroredElemTypes[_, _] <: Tuple + } + + type Test[X] = (X, Boolean) + type Swap[X, Y] = (Y, X) + + locally { + val x = summon[Kind1[Mirror.Product, Test]] + x: Mirror.Product { + type MirroredElemTypes[X] = (X, Boolean) + } + } + + locally { + val x = summon[Kind2[Mirror.Product, Swap]] + x: Mirror.Product { + type MirroredElemTypes[X, Y] = (Y, X) + } + } From b2190609827000d9ee2e7119cbda06f6fd5f3c4b Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 29 Sep 2021 13:53:38 +0100 Subject: [PATCH 0863/1244] Space: Cache isSubspace for a 3000% speedup --- bench/profiles/exhaustivity.yml | 9 +++ .../tools/dotc/transform/patmat/Space.scala | 5 ++ tests/pos/i13565.scala | 67 +++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 tests/pos/i13565.scala diff --git a/bench/profiles/exhaustivity.yml b/bench/profiles/exhaustivity.yml index 0591bb0c4d56..68b480a095aa 100644 --- a/bench/profiles/exhaustivity.yml +++ b/bench/profiles/exhaustivity.yml @@ -47,6 +47,12 @@ charts: - key: exhaustivity-i12358 label: bootstrapped + - name: "exhaustivity i13565" + url: https://github.com/lampepfl/dotty/blob/master/tests/pos/i13565.scala + lines: + - key: exhaustivity-i13565 + label: bootstrapped + scripts: patmatexhaust: @@ -73,5 +79,8 @@ scripts: exhaustivity-i12358: - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/patmat/i12358.scala + exhaustivity-i13565: + - measure 20 40 3 $PROG_HOME/dotty/tests/pos/i13565.scala + config: pr_base_url: "https://github.com/lampepfl/dotty/pull/" diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala index 45e811e6d91c..7fc2ef886c52 100644 --- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala +++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala @@ -531,6 +531,11 @@ class SpaceEngine(using Context) extends SpaceLogic { else convertConstantType(tp1, tp2) } + private val isSubspaceCache = mutable.HashMap.empty[(Space, Space, Context), Boolean] + + override def isSubspace(a: Space, b: Space)(using Context): Boolean = + isSubspaceCache.getOrElseUpdate((a, b, ctx), super.isSubspace(a, b)) + /** Is `tp1` a subtype of `tp2`? */ def isSubType(tp1: Type, tp2: Type): Boolean = trace(i"$tp1 <:< $tp2", debug, show = true) { if tp1 == constantNullType && !ctx.explicitNulls then tp2 == constantNullType diff --git a/tests/pos/i13565.scala b/tests/pos/i13565.scala new file mode 100644 index 000000000000..00b7e393a016 --- /dev/null +++ b/tests/pos/i13565.scala @@ -0,0 +1,67 @@ +package ips.clang + +sealed trait PrimaryExpression extends PostfixExpression +sealed trait PostfixExpression extends UnaryExpression +sealed trait UnaryExpression extends CastExpression +sealed trait CastExpression extends MultiplicativeExpression +sealed trait MultiplicativeExpression extends AdditiveExpression +sealed trait AdditiveExpression extends ShiftExpression +sealed trait ShiftExpression extends RelationalExpression +sealed trait RelationalExpression extends EqualityExpression +sealed trait EqualityExpression extends PrecAndExpression +sealed trait PrecAndExpression extends PrecExclusiveOrExpression +sealed trait PrecExclusiveOrExpression extends PrecInclusiveOrExpression +sealed trait PrecInclusiveOrExpression extends PrecLogicalAndExpression +sealed trait PrecLogicalAndExpression extends PrecLogicalOrExpression +sealed trait PrecLogicalOrExpression extends PrecConditionalExpression +sealed trait PrecConditionalExpression extends PrecAssigmentExpression +sealed trait PrecAssigmentExpression extends Expression +sealed trait Expression +sealed trait BinaryExpression { def op: String; def frs: Expression; def snd: Expression } + +type TypeName = String +case class Identifier(value: String) extends PrimaryExpression +case class IntConstant(value: Int) extends PrimaryExpression +case class CharConstant(value: Char) extends PrimaryExpression +case class StringLiteral(value: String) extends PrimaryExpression +case class WrappedExpression(value: Expression) extends PrimaryExpression +case class ArrayIndexExpression(base: PostfixExpression, index: Expression) extends PostfixExpression +case class FunctionCallExpression(fun: PostfixExpression, arguments: List[PrecAssigmentExpression]) extends PostfixExpression +case class DotSelectExpression(qualifier: PostfixExpression, select: Identifier) extends PostfixExpression +case class ArrowSelectExpression(qualifier: PostfixExpression, select: Identifier) extends PostfixExpression +case class PostfixIncrementExpression(base: PostfixExpression) extends PostfixExpression +case class PostfixDecrementExpression(base: PostfixExpression) extends PostfixExpression +case class CompoundLiteral(typeName: TypeName, initializers: List[Int]) extends PostfixExpression +case class PrefixIncrementExpression(base: UnaryExpression) extends UnaryExpression +case class PrefixDecrementExpression(base: UnaryExpression) extends UnaryExpression +case class UnaryOperatorExpression(op: String, argument: CastExpression) extends UnaryExpression +case class SizeofConstExpression(expression: UnaryExpression) extends UnaryExpression +case class SizeofTypeExpression(typeName: TypeName) extends UnaryExpression +case class Cast(typeName: TypeName, argument: CastExpression) extends CastExpression +case class MultiplicativeBinaryExpression(op: String, frs: MultiplicativeExpression, snd: CastExpression) extends MultiplicativeExpression with BinaryExpression +case class AdditiveBinaryExpression(op: String, frs: MultiplicativeExpression, snd: CastExpression) extends MultiplicativeExpression with BinaryExpression +case class ShiftBinaryExpression(op: String, frs: MultiplicativeExpression, snd: CastExpression) extends MultiplicativeExpression with BinaryExpression +case class RelationalBinaryExpression(op: String, frs: RelationalExpression, snd: ShiftExpression) extends RelationalExpression with BinaryExpression +case class EqualityBinaryExpression(op: String, frs: RelationalExpression, snd: ShiftExpression) extends EqualityExpression with BinaryExpression +case class AndBinaryExpression(op: String, frs: PrecAndExpression, snd: EqualityExpression) extends PrecAndExpression with BinaryExpression +case class ExclusiveOrBinaryExpression(op: String, frs: PrecExclusiveOrExpression, snd: PrecAndExpression) extends PrecExclusiveOrExpression with BinaryExpression +case class InclusiveOrBinaryExpression(op: String, frs: PrecExclusiveOrExpression, snd: PrecAndExpression) extends PrecInclusiveOrExpression with BinaryExpression +case class LogicalAndBinaryExpression(op: String, frs: PrecLogicalAndExpression, snd: PrecInclusiveOrExpression) extends PrecLogicalAndExpression with BinaryExpression +case class LogicalOrBinaryExpression(op: String, frs: PrecLogicalAndExpression, snd: PrecInclusiveOrExpression) extends PrecLogicalOrExpression with BinaryExpression +case class ConditionalExpression(cond: PrecLogicalOrExpression, frs: Expression, snd: PrecConditionalExpression) extends PrecConditionalExpression +case class AssigmentExpression(op: String, frs: UnaryExpression, snd: PrecAssigmentExpression) extends PrecAssigmentExpression +case class CommaExpression(frs: Expression, snd: Expression) extends Expression +case class AltCommaExpression(frs: Expression, snd: Expression) extends Expression + +// each AdditionalUnaryExpressionX increase compilation time +sealed trait AdditionalUnaryExpression1 extends UnaryExpression +sealed trait AdditionalUnaryExpression2 extends UnaryExpression +sealed trait AdditionalUnaryExpression3 extends UnaryExpression +sealed trait AdditionalUnaryExpression4 extends UnaryExpression +sealed trait AdditionalUnaryExpression5 extends UnaryExpression + +class LongCompilation: + // this match used to take 2m30 to compile, with 1 cache it now takes 5s (30x speedup, aka 3000%) + def toCastExpression(expr: Expression): CastExpression = expr match + case x: CastExpression => x + case _ => WrappedExpression(expr) From 130cb50eccd3dc4a944fa738c0d38012601e5dcb Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sun, 5 Dec 2021 16:59:32 +0100 Subject: [PATCH 0864/1244] Drop println to command line in macro test --- tests/neg-custom-args/fatal-warnings/i12188/Macro.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/neg-custom-args/fatal-warnings/i12188/Macro.scala b/tests/neg-custom-args/fatal-warnings/i12188/Macro.scala index 230443a54eef..9b49f80f9046 100644 --- a/tests/neg-custom-args/fatal-warnings/i12188/Macro.scala +++ b/tests/neg-custom-args/fatal-warnings/i12188/Macro.scala @@ -14,7 +14,7 @@ object MatchTest { CaseDef(Bind(bind, Typed(Ref(bind), subtype)), None, '{()}.asTerm) } val result = Match(obj, cases) - println(result.show(using Printer.TreeAnsiCode)) + //println(result.show(using Printer.TreeAnsiCode)) result.asExprOf[Unit] } } From 43075b3aecb397e71a8eb053ec626be1342bdb43 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Thu, 2 Dec 2021 12:05:48 +0100 Subject: [PATCH 0865/1244] Remove preprocessing markdowns from CD --- .github/workflows/ci.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 70f69d1fd568..712df11ca03b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -505,17 +505,6 @@ jobs: external_repository: lampepfl/dotty-website publish_branch: gh-pages - - name: Generate docs.scala-lang preprocessed files - run: | - ./project/scripts/genDocsScalaLang - - - name: Deploy Website to docs.scala-lang - uses: peaceiris/actions-gh-pages@v3 - with: - personal_token: ${{ env.DOCS_SCALALANG_BOT_TOKEN }} - publish_dir: docsScalaLang - external_repository: BarkingBad/docs.scala-lang - publish_branch: dev publish_release: runs-on: [self-hosted, Linux] From f492cd699e3fb83ae7fe2d7287a623790f0d1a4a Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 6 Dec 2021 18:51:34 +0100 Subject: [PATCH 0866/1244] Handle hoisted super arguments correctly in elimByName Fixes #14010 --- .../tools/dotc/transform/HoistSuperArgs.scala | 2 +- .../dotc/transform/TransformByNameApply.scala | 6 ++- tests/pos/i14010.scala | 46 +++++++++++++++++++ tests/pos/i14010a.scala | 3 ++ 4 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 tests/pos/i14010.scala create mode 100644 tests/pos/i14010a.scala diff --git a/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala b/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala index ca584561b711..e1bcc7e6a9b4 100644 --- a/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala +++ b/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala @@ -88,7 +88,7 @@ class HoistSuperArgs extends MiniPhase with IdentityDenotTransformer { thisPhase def newSuperArgMethod(argType: Type) = { val (staticFlag, methOwner) = if (cls.owner.is(Package)) (JavaStatic, cls) else (EmptyFlags, cls.owner) - val argTypeWrtConstr = argType.subst(origParams, allParamRefs(constr.info)) + val argTypeWrtConstr = argType.widenTermRefExpr.subst(origParams, allParamRefs(constr.info)) // argType with references to paramRefs of the primary constructor instead of // local parameter accessors newSymbol( diff --git a/compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala b/compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala index af0998293904..9eb9b3f0ad5a 100644 --- a/compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala +++ b/compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala @@ -11,7 +11,8 @@ import Types._ import Flags._ import Decorators._ import DenotTransformers._ -import core.StdNames.nme +import StdNames.nme +import NameKinds.SuperArgName import ast.Trees._ import reporting.trace @@ -51,7 +52,8 @@ abstract class TransformByNameApply extends MiniPhase { thisPhase: DenotTransfor if qual.tpe.derivesFrom(defn.Function0) && (isPureExpr(qual) || qual.symbol.isAllOf(Inline | Param)) => wrap(qual) case _ => - if (isByNameRef(arg) || arg.symbol == defn.cbnArg) arg + if isByNameRef(arg) || arg.symbol == defn.cbnArg || arg.symbol.name.is(SuperArgName) + then arg else wrap(mkByNameClosure(arg, argType)) } case _ => diff --git a/tests/pos/i14010.scala b/tests/pos/i14010.scala new file mode 100644 index 000000000000..a881f783f39b --- /dev/null +++ b/tests/pos/i14010.scala @@ -0,0 +1,46 @@ +abstract class LazyList[+T] { + def head: T + def tail: LazyList[T] + def isEmpty: Boolean + def push[E >: T](top: => E): LazyList[E] = + new Push[E](top, this) + //def map[R](f: T => R): LazyList[R] + def append[E >: T](that: => LazyList[E]): LazyList[E] +} + +private class Push[+T](top: => T, stack: => LazyList[T]) extends LazyList[T] { + override def head: T = + top + override def tail: LazyList[T] = + stack + override def isEmpty: Boolean = + false + //override def map[R](f: T => R): LazyList[R] = + // new Push[R](f(top), stack.map(f)) { + // override def map[R2](f2: R => R2): LazyList[R2] = + // Push.this.map(f2 compose f) + // } + override def append[E >: T](that: => LazyList[E]): LazyList[E] = + new Push[E](top, stack.append(that)) { + override def append[E2 >: E](that2: => LazyList[E2]): LazyList[E2] = + Push.this.append(that.append(that2)) + } +} + +object LazyList { + val empty = + new LazyList[Nothing] { + override def head: Nothing = + throw new NoSuchElementException + override def tail: LazyList[Nothing] = + throw new UnsupportedOperationException + override def isEmpty: Boolean = + true + //override def map[R](f: _ => R): LazyList[R] = + // this + override def append[E](that: => LazyList[E]): LazyList[E] = + that + } + def apply[T](elements: T*): LazyList[T] = + elements.foldRight[LazyList[T]](empty)(new Push(_, _)) +} \ No newline at end of file diff --git a/tests/pos/i14010a.scala b/tests/pos/i14010a.scala new file mode 100644 index 000000000000..5e77f55fdf62 --- /dev/null +++ b/tests/pos/i14010a.scala @@ -0,0 +1,3 @@ +class Foo(top: => Int) { + def foo: Any = new Foo(top) { } +} \ No newline at end of file From 6fa1bf1b449b9851ec06f3163175e4df81d655d0 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 6 Dec 2021 19:48:33 +0100 Subject: [PATCH 0867/1244] Check variance of RHS of opaque type Fixes #13997 --- .../src/dotty/tools/dotc/transform/PostTyper.scala | 2 ++ tests/neg/i13997.scala | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 tests/neg/i13997.scala diff --git a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala index 048395e8dffa..5d08921f1ea6 100644 --- a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala +++ b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala @@ -378,6 +378,8 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase else (tree.rhs, sym.info) match case (rhs: LambdaTypeTree, bounds: TypeBounds) => VarianceChecker.checkLambda(rhs, bounds) + if sym.isOpaqueAlias then + VarianceChecker.checkLambda(rhs, TypeBounds.upper(sym.opaqueAlias)) case _ => processMemberDef(super.transform(tree)) case tree: New if isCheckable(tree) => diff --git a/tests/neg/i13997.scala b/tests/neg/i13997.scala new file mode 100644 index 000000000000..77cca35d93bd --- /dev/null +++ b/tests/neg/i13997.scala @@ -0,0 +1,10 @@ + opaque type CovariantArray[+A] = Array[A] // error + + object CovariantArray: + def crash() = + val stringArray: CovariantArray[String] = Array("foo", "bar") + val anyArray: CovariantArray[Any] = stringArray + anyArray(0) = 42 + stringArray(0).length + + @main def Test = CovariantArray.crash() \ No newline at end of file From 4511eb0e6c576c18662f1b4226caddca3e1c1941 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 7 Dec 2021 17:12:18 +0100 Subject: [PATCH 0868/1244] Don't insert INDENT/UNINDENT without anything in between Fixes #14061 --- compiler/src/dotty/tools/dotc/parsing/Scanners.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index 0fa71dd02a8b..1a2f3cd3d86a 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -539,7 +539,7 @@ object Scanners { || nextWidth == lastWidth && (indentPrefix == MATCH || indentPrefix == CATCH) && token != CASE then if currentRegion.isOutermost then if nextWidth < lastWidth then currentRegion = topLevelRegion(nextWidth) - else if !isLeadingInfixOperator(nextWidth) && !statCtdTokens.contains(lastToken) then + else if !isLeadingInfixOperator(nextWidth) && !statCtdTokens.contains(lastToken) && lastToken != INDENT then currentRegion match case r: Indented => currentRegion = r.enclosing From c8c7908c19ea602c763179d0d34e092637208937 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 7 Dec 2021 17:45:27 +0100 Subject: [PATCH 0869/1244] Add test --- tests/pos/i14061.scala | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 tests/pos/i14061.scala diff --git a/tests/pos/i14061.scala b/tests/pos/i14061.scala new file mode 100644 index 000000000000..1431c1248255 --- /dev/null +++ b/tests/pos/i14061.scala @@ -0,0 +1,10 @@ +def main(args: Array[String]): Unit = + val bar: PartialFunction[Throwable, Unit] = + case e: IllegalArgumentException => e.printStackTrace + case e: Throwable => e.printStackTrace + try + println("a") + catch + bar + finally + println("a") \ No newline at end of file From a509133ee0546b254d421766b5888f7c18c89d30 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 2 Dec 2021 17:50:58 +0000 Subject: [PATCH 0870/1244] Fail compilation of attempting a 0-arity product extraction It's reasonable to desire this to work, but for now let's just not crash. Co-authored-by: Seth Tisue --- .../src/dotty/tools/dotc/typer/Applications.scala | 2 +- tests/neg/i13960.check | 6 ++++++ tests/neg/i13960.scala | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 tests/neg/i13960.check create mode 100644 tests/neg/i13960.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala index 1c346ac7af20..d8e9c413decb 100644 --- a/compiler/src/dotty/tools/dotc/typer/Applications.scala +++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala @@ -189,7 +189,7 @@ object Applications { getUnapplySelectors(getTp, args, pos) else if (unapplyResult.widenSingleton isRef defn.BooleanClass) Nil - else if (defn.isProductSubType(unapplyResult)) + else if (defn.isProductSubType(unapplyResult) && productArity(unapplyResult, pos) != 0) productSelectorTypes(unapplyResult, pos) // this will cause a "wrong number of arguments in pattern" error later on, // which is better than the message in `fail`. diff --git a/tests/neg/i13960.check b/tests/neg/i13960.check new file mode 100644 index 000000000000..ce280f48be4c --- /dev/null +++ b/tests/neg/i13960.check @@ -0,0 +1,6 @@ +-- [E108] Declaration Error: tests/neg/i13960.scala:13:10 -------------------------------------------------------------- +13 | case A() => // error + | ^^^ + | A is not a valid result type of an unapply method of an extractor. + +longer explanation available when compiling with `-explain` diff --git a/tests/neg/i13960.scala b/tests/neg/i13960.scala new file mode 100644 index 000000000000..54ae513598f1 --- /dev/null +++ b/tests/neg/i13960.scala @@ -0,0 +1,15 @@ +class A() extends Product { + override def canEqual(that: Any) = true + override def productArity = 0 + override def productElement(n: Int) = null +} + +object A { + def unapply(a: A): A = a +} + +object Main { + (new A) match { + case A() => // error + } +} From 550c85c134909c5cb1863664c892abd184721c47 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 9 Dec 2021 09:25:47 +0100 Subject: [PATCH 0871/1244] Test for non-open classes warning Fixes #13946 --- compiler/test/dotty/tools/dotc/CompilationTests.scala | 1 + tests/neg-custom-args/i13946/BadPrinter.scala | 4 ++++ tests/neg-custom-args/i13946/Printer.scala | 3 +++ 3 files changed, 8 insertions(+) create mode 100644 tests/neg-custom-args/i13946/BadPrinter.scala create mode 100644 tests/neg-custom-args/i13946/Printer.scala diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index 4a85d863ed9f..87e273b786ec 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -140,6 +140,7 @@ class CompilationTests { compileFilesInDir("tests/neg-custom-args/explicit-nulls", defaultOptions.and("-Yexplicit-nulls")), compileFilesInDir("tests/neg-custom-args/no-experimental", defaultOptions.and("-Yno-experimental")), compileDir("tests/neg-custom-args/impl-conv", defaultOptions.and("-Xfatal-warnings", "-feature")), + compileDir("tests/neg-custom-args/i13946", defaultOptions.and("-Xfatal-warnings", "-feature")), compileFile("tests/neg-custom-args/implicit-conversions.scala", defaultOptions.and("-Xfatal-warnings", "-feature")), compileFile("tests/neg-custom-args/implicit-conversions-old.scala", defaultOptions.and("-Xfatal-warnings", "-feature")), compileFile("tests/neg-custom-args/i3246.scala", scala2CompatMode), diff --git a/tests/neg-custom-args/i13946/BadPrinter.scala b/tests/neg-custom-args/i13946/BadPrinter.scala new file mode 100644 index 000000000000..3ab935de9711 --- /dev/null +++ b/tests/neg-custom-args/i13946/BadPrinter.scala @@ -0,0 +1,4 @@ +// in BadPrinter.scala +import language.future +class BadPrinter extends Printer: // error + override def print(s: String): Unit = println("Bad!!!") \ No newline at end of file diff --git a/tests/neg-custom-args/i13946/Printer.scala b/tests/neg-custom-args/i13946/Printer.scala new file mode 100644 index 000000000000..bc9056de932c --- /dev/null +++ b/tests/neg-custom-args/i13946/Printer.scala @@ -0,0 +1,3 @@ +// in Printer.scala +class Printer: + def print(s: String): Unit = println(s) From 6bdcf0f5dfe3899a94e5db4c37d32b221f3144d4 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 8 Dec 2021 15:46:58 +0100 Subject: [PATCH 0872/1244] Replace GadtConstraint#isEmpty by isNarrowing isEmpty is pointless since it is always false if we are inside a polymorphic method. isNarrowing computes whether the constraint actually has tigher bounds for a type variable than the original bounds. --- .../tools/dotc/core/GadtConstraint.scala | 46 +++++++++++-------- .../src/dotty/tools/dotc/typer/Typer.scala | 4 +- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala index 7d84b9892057..36c2c7899aef 100644 --- a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala +++ b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala @@ -43,8 +43,8 @@ sealed abstract class GadtConstraint extends Showable { */ def contains(sym: Symbol)(using Context): Boolean - def isEmpty: Boolean - final def nonEmpty: Boolean = !isEmpty + /** GADT constraint narrows bounds of at least one variable */ + def isNarrowing: Boolean /** See [[ConstraintHandling.approximation]] */ def approximation(sym: Symbol, fromBelow: Boolean)(using Context): Type @@ -61,13 +61,15 @@ final class ProperGadtConstraint private( private var myConstraint: Constraint, private var mapping: SimpleIdentityMap[Symbol, TypeVar], private var reverseMapping: SimpleIdentityMap[TypeParamRef, Symbol], + private var wasConstrained: Boolean ) extends GadtConstraint with ConstraintHandling { import dotty.tools.dotc.config.Printers.{gadts, gadtsConstr} def this() = this( myConstraint = new OrderingConstraint(SimpleIdentityMap.empty, SimpleIdentityMap.empty, SimpleIdentityMap.empty), mapping = SimpleIdentityMap.empty, - reverseMapping = SimpleIdentityMap.empty + reverseMapping = SimpleIdentityMap.empty, + wasConstrained = false ) /** Exposes ConstraintHandling.subsumes */ @@ -149,20 +151,24 @@ final class ProperGadtConstraint private( if (ntTvar ne null) stripInternalTypeVar(ntTvar) else bound case _ => bound } - ( - internalizedBound match { - case boundTvar: TypeVar => - if (boundTvar eq symTvar) true - else if (isUpper) addLess(symTvar.origin, boundTvar.origin) - else addLess(boundTvar.origin, symTvar.origin) - case bound => - addBoundTransitively(symTvar.origin, bound, isUpper) - } - ).showing({ + + val saved = constraint + val result = internalizedBound match + case boundTvar: TypeVar => + if (boundTvar eq symTvar) true + else if (isUpper) addLess(symTvar.origin, boundTvar.origin) + else addLess(boundTvar.origin, symTvar.origin) + case bound => + addBoundTransitively(symTvar.origin, bound, isUpper) + + gadts.println { val descr = if (isUpper) "upper" else "lower" val op = if (isUpper) "<:" else ">:" i"adding $descr bound $sym $op $bound = $result" - }, gadts) + } + + if constraint ne saved then wasConstrained = true + result } override def isLess(sym1: Symbol, sym2: Symbol)(using Context): Boolean = @@ -193,6 +199,8 @@ final class ProperGadtConstraint private( override def contains(sym: Symbol)(using Context): Boolean = mapping(sym) ne null + def isNarrowing: Boolean = wasConstrained + override def approximation(sym: Symbol, fromBelow: Boolean)(using Context): Type = { val res = approximation(tvarOrError(sym).origin, fromBelow = fromBelow) gadts.println(i"approximating $sym ~> $res") @@ -202,7 +210,8 @@ final class ProperGadtConstraint private( override def fresh: GadtConstraint = new ProperGadtConstraint( myConstraint, mapping, - reverseMapping + reverseMapping, + wasConstrained ) def restore(other: GadtConstraint): Unit = other match { @@ -210,11 +219,10 @@ final class ProperGadtConstraint private( this.myConstraint = other.myConstraint this.mapping = other.mapping this.reverseMapping = other.reverseMapping + this.wasConstrained = other.wasConstrained case _ => ; } - override def isEmpty: Boolean = mapping.size == 0 - // ---- Protected/internal ----------------------------------------------- override protected def constraint = myConstraint @@ -293,7 +301,7 @@ final class ProperGadtConstraint private( override def isLess(sym1: Symbol, sym2: Symbol)(using Context): Boolean = unsupported("EmptyGadtConstraint.isLess") - override def isEmpty: Boolean = true + override def isNarrowing: Boolean = false override def contains(sym: Symbol)(using Context) = false @@ -304,7 +312,7 @@ final class ProperGadtConstraint private( override def fresh = new ProperGadtConstraint override def restore(other: GadtConstraint): Unit = - if (!other.isEmpty) sys.error("cannot restore a non-empty GADTMap") + assert(!other.isNarrowing, "cannot restore a non-empty GADTMap") override def debugBoundsDescription(using Context): String = "EmptyGadtConstraint" diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 6177faf6b6b0..2a393d5049e9 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1662,7 +1662,7 @@ class Typer extends Namer val pat1 = indexPattern(tree).transform(pat) val guard1 = typedExpr(tree.guard, defn.BooleanType) var body1 = ensureNoLocalRefs(typedExpr(tree.body, pt1), pt1, ctx.scope.toList) - if ctx.gadt.nonEmpty then + if ctx.gadt.isNarrowing then // Store GADT constraint to later retrieve it (in PostTyper, for now). // GADT constraints are necessary to correctly check bounds of type app, // see tests/pos/i12226 and issue #12226. It might be possible that this @@ -3824,7 +3824,7 @@ class Typer extends Namer pt match case pt: SelectionProto => - if ctx.gadt.nonEmpty then + if ctx.gadt.isNarrowing then // try GADT approximation if we're trying to select a member // Member lookup cannot take GADTs into account b/c of cache, so we // approximate types based on GADT constraints instead. For an example, From 446fb908cb43abcbe0ab603a7c357964df6219fa Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 8 Dec 2021 17:11:37 +0100 Subject: [PATCH 0873/1244] Bypass eligible caches for implicit search under GADT constraints Under a non-empty GADT constraint, bypass caches when computing eligible implicits. The GADT constraint might influence what implicits are available locally, so cached results would be unreliable. Fixes #13974 --- .../dotty/tools/dotc/typer/Implicits.scala | 33 +++++++++++++------ .../test/dotc/pos-test-pickling.blacklist | 3 ++ .../neg/gadt-approximation-interaction.scala | 4 +-- tests/pos/i13974.scala | 13 ++++++++ tests/pos/i13974a.scala | 12 +++++++ 5 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 tests/pos/i13974.scala create mode 100644 tests/pos/i13974a.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index d7bf75f8bf73..fecdf3eb6cef 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -330,11 +330,25 @@ object Implicits: (this eq finalImplicits) || (outerImplicits eq finalImplicits) } + private def combineEligibles(ownEligible: List[Candidate], outerEligible: List[Candidate]): List[Candidate] = + if ownEligible.isEmpty then outerEligible + else if outerEligible.isEmpty then ownEligible + else + val shadowed = ownEligible.map(_.ref.implicitName).toSet + ownEligible ::: outerEligible.filterConserve(cand => !shadowed.contains(cand.ref.implicitName)) + + def uncachedEligible(tp: Type)(using Context): List[Candidate] = + Stats.record("uncached eligible") + if monitored then record(s"check uncached eligible refs in irefCtx", refs.length) + val ownEligible = filterMatching(tp) + if isOuterMost then ownEligible + else combineEligibles(ownEligible, outerImplicits.uncachedEligible(tp)) + /** The implicit references that are eligible for type `tp`. */ def eligible(tp: Type): List[Candidate] = if (tp.hash == NotCached) Stats.record(i"compute eligible not cached ${tp.getClass}") - Stats.record(i"compute eligible not cached") + Stats.record("compute eligible not cached") computeEligible(tp) else { val eligibles = eligibleCache.lookup(tp) @@ -354,14 +368,8 @@ object Implicits: private def computeEligible(tp: Type): List[Candidate] = /*>|>*/ trace(i"computeEligible $tp in $refs%, %", implicitsDetailed) /*<|<*/ { if (monitored) record(s"check eligible refs in irefCtx", refs.length) val ownEligible = filterMatching(tp) - if (isOuterMost) ownEligible - else if ownEligible.isEmpty then outerImplicits.eligible(tp) - else - val outerEligible = outerImplicits.eligible(tp) - if outerEligible.isEmpty then ownEligible - else - val shadowed = ownEligible.map(_.ref.implicitName).toSet - ownEligible ::: outerEligible.filterConserve(cand => !shadowed.contains(cand.ref.implicitName)) + if isOuterMost then ownEligible + else combineEligibles(ownEligible, outerImplicits.eligible(tp)) } override def isAccessible(ref: TermRef)(using Context): Boolean = @@ -1444,7 +1452,12 @@ trait Implicits: NoMatchingImplicitsFailure else val eligible = - if contextual then ctx.implicits.eligible(wildProto) + if contextual then + if ctx.gadt.isNarrowing then + withoutMode(Mode.ImplicitsEnabled) { + ctx.implicits.uncachedEligible(wildProto) + } + else ctx.implicits.eligible(wildProto) else implicitScope(wildProto).eligible searchImplicit(eligible, contextual) match case result: SearchSuccess => diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist index 42f2e417d759..c913933c6537 100644 --- a/compiler/test/dotc/pos-test-pickling.blacklist +++ b/compiler/test/dotc/pos-test-pickling.blacklist @@ -75,4 +75,7 @@ i13842.scala # GADT cast applied to singleton type difference i4176-gadt.scala +# GADT difference +i13974a.scala + java-inherited-type1 diff --git a/tests/neg/gadt-approximation-interaction.scala b/tests/neg/gadt-approximation-interaction.scala index 683d0668f4a2..5f010e4b784d 100644 --- a/tests/neg/gadt-approximation-interaction.scala +++ b/tests/neg/gadt-approximation-interaction.scala @@ -47,7 +47,7 @@ object ImplicitConversion { def foo[T](t: T, ev: T SUB Int) = ev match { case SUB.Refl() => - t ** 2 // error // implementation limitation + t ** 2 } def bar[T](t: T, ev: T SUB Int) = @@ -67,7 +67,7 @@ object GivenConversion { def foo[T](t: T, ev: T SUB Int) = ev match { case SUB.Refl() => - t ** 2 // error (implementation limitation) + t ** 2 } def bar[T](t: T, ev: T SUB Int) = diff --git a/tests/pos/i13974.scala b/tests/pos/i13974.scala new file mode 100644 index 000000000000..957baab63eb7 --- /dev/null +++ b/tests/pos/i13974.scala @@ -0,0 +1,13 @@ +object Test { + class C + class Use[A] + case class UseC() extends Use[C] + class ConversionTarget + implicit def convert(c: C): ConversionTarget = ??? + def go[X](u: Use[X], x: X) = + u match { + case UseC() => + //val y: C = x + x: ConversionTarget + } +} diff --git a/tests/pos/i13974a.scala b/tests/pos/i13974a.scala new file mode 100644 index 000000000000..69e764abc14d --- /dev/null +++ b/tests/pos/i13974a.scala @@ -0,0 +1,12 @@ + +object Test2: + class Foo[+X] + enum SUB[-S, +T]: + case Refl[U]() extends SUB[U, U] + def f[A, B, C](sub : A SUB (B,C)) = + given Foo[A] = ??? + val x = summon[Foo[A]] + sub match + case SUB.Refl() => + val c: Foo[(B, C)] = summon[Foo[A]] + summon[Foo[(B, C)]] From 6fd7d4286e8f59c13d14b4b8f2a5590420016a9c Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 6 Dec 2021 10:54:34 +0100 Subject: [PATCH 0874/1244] Inline inlined private methods before checking accessibility Fixes #14048 --- compiler/src/dotty/tools/dotc/typer/Inliner.scala | 11 ++++++----- tests/pos/i14048.scala | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 tests/pos/i14048.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index 4fede9b6b9e4..196b678f0685 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -1548,13 +1548,14 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { //if the projection leads to a typed tree then we stop reduction resNoReduce else - val resMaybeReduced = constToLiteral(reducedProjection) - if resNoReduce ne resMaybeReduced then - typed(resMaybeReduced, pt) // redo typecheck if reduction changed something + val res = constToLiteral(reducedProjection) + if resNoReduce ne res then + typed(res, pt) // redo typecheck if reduction changed something + else if res.symbol.isInlineMethod then + inlineIfNeeded(res) else - val res = resMaybeReduced ensureAccessible(res.tpe, tree.qualifier.isInstanceOf[untpd.Super], tree.srcPos) - inlineIfNeeded(res) + res } override def typedIf(tree: untpd.If, pt: Type)(using Context): Tree = diff --git a/tests/pos/i14048.scala b/tests/pos/i14048.scala new file mode 100644 index 000000000000..b815b68c72fd --- /dev/null +++ b/tests/pos/i14048.scala @@ -0,0 +1,5 @@ +class T: + inline def foo(): Unit = bar() + private inline def bar(): Unit = () + +def test(t: T) = t.foo() From abf2ff3f3359bb72dc46f9f5e95fa315c4f6b671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Tue, 9 Nov 2021 14:14:28 +0100 Subject: [PATCH 0875/1244] Better handling of multiple exceptions for saferExceptions * Generate a single accumulated CanThrow capability for multiple catch cases in a try * Allow parentheses around exceptions alternatives in throws clauses --- .../src/dotty/tools/dotc/ast/Desugar.scala | 2 + .../src/dotty/tools/dotc/typer/Typer.scala | 25 +++--- docs/docs/reference/experimental/canthrow.md | 81 +++++++++++-------- tests/pos/i13816.scala | 42 ++++++++++ 4 files changed, 106 insertions(+), 44 deletions(-) create mode 100644 tests/pos/i13816.scala diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index b652a49c0381..7121f7e7370d 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -1265,6 +1265,8 @@ object desugar { * $throws[... $throws[A, E1] ... , En]. */ def throws(tpt: Tree, op: Ident, excepts: Tree)(using Context): AppliedTypeTree = excepts match + case Parens(excepts1) => + throws(tpt, op, excepts1) case InfixOp(l, bar @ Ident(tpnme.raw.BAR), r) => throws(throws(tpt, op, l), bar, r) case e => diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 2a393d5049e9..2cabe2641df4 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1755,15 +1755,22 @@ class Typer extends Namer untpd.ref(defn.Predef_undefined)) .withFlags(Given | Final | Lazy | Erased) .withSpan(expr.span) - val caps = - for - case CaseDef(pat, guard, _) <- cases - if Feature.enabled(Feature.saferExceptions) && pat.tpe.widen.isCheckedException - yield - checkCatch(pat, guard) - makeCanThrow(pat.tpe.widen) - - caps.foldLeft(expr)((e, g) => untpd.Block(g :: Nil, e)) + val caughtExceptions = + if Feature.enabled(Feature.saferExceptions) then + for + CaseDef(pat, guard, _) <- cases + tpe = pat.tpe.widen + if tpe.isCheckedException + yield + checkCatch(pat, guard) + tpe + else Seq.empty + + caughtExceptions match + case Nil => expr + case head :: tail => + val capabilityProof = tail.foldLeft(head: Type)(OrType(_, _, true)) + untpd.Block(makeCanThrow(capabilityProof), expr) def typedTry(tree: untpd.Try, pt: Type)(using Context): Try = { val expr2 :: cases2x = harmonic(harmonize, pt) { diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md index 6377a040b515..3c99b5894a01 100644 --- a/docs/docs/reference/experimental/canthrow.md +++ b/docs/docs/reference/experimental/canthrow.md @@ -87,14 +87,27 @@ can alternatively be expressed like this: ```scala def m(x: T): U throws E ``` -Multiple `CanThrow` capabilities can be combined in a single throws clause. For instance, the method +Also the capability to throw multiple types of exceptions can be expressed in a few ways as shown in the examples below: ```scala -def m2(x: T)(using CanThrow[E1], CanThrow[E2]): U +def m(x: T): U throws E1 | E2 +def m(x: T): U throws E1 throws E2 +def m(x: T)(using CanThrow[E1], CanThrow[E2]): U +def m(x: T)(using CanThrow[E1])(using CanThrow[E2]): U +def m(x: T)(using CanThrow[E1]): U throws E2 ``` -can alternatively be expressed like this: + +**Note 1:** A signature like ```scala -def m(x: T): U throws E1 | E2 +def m(x: T)(using CanThrow[E1 | E2]): U ``` +would also allow throwing `E1` or `E2` inside the method's body but might cause problems when someone tried to call this method +from another method declaring its `CanThrow` capabilities like in the earlier examples. +This is because `CanThrow` has a contravariant type parameter so `CanThrow[E1 | E2]` is a subtype of both `CanThrow[E1]` and `CanThrow[E2]`. +Hence the presence of a given instance of `CanThrow[E1 | E2]` in scope satisfies the requirement for `CanThrow[E1]` and `CanThrow[E2]` +but given instances of `CanThrow[E1]` and `CanThrow[E2]` cannot be combined to provide and instance of `CanThrow[E1 | E2]`. + +**Note 2:** One should keep in mind that `|` binds its left and right arguments more tightly than `throws` so `A | B throws E1 | E2` means `(A | B) throws (Ex1 | Ex2)`, not `A | (B throws E1) | E2`. + The `CanThrow`/`throws` combo essentially propagates the `CanThrow` requirement outwards. But where are these capabilities created in the first place? That's in the `try` expression. Given a `try` like this: ```scala @@ -105,17 +118,29 @@ catch ... case exN: ExN => handlerN ``` -the compiler generates capabilities for `CanThrow[Ex1]`, ..., `CanThrow[ExN]` that are in scope as givens in `body`. It does this by augmenting the `try` roughly as follows: +the compiler generates an accumulated capability of type `CanThrow[Ex1 | ... | Ex2]` that is available as a given in the scope of `body`. It does this by augmenting the `try` roughly as follows: ```scala try - erased given CanThrow[Ex1] = ??? - ... - erased given CanThrow[ExN] = ??? + erased given CanThrow[Ex1 | ... | ExN] = ??? body catch ... ``` -Note that the right-hand side of all givens is `???` (undefined). This is OK since -these givens are erased; they will not be executed at runtime. +Note that the right-hand side of the synthesized given is `???` (undefined). This is OK since +this given is erased; it will not be executed at runtime. + +**Note 1:** The `saferExceptions` feature is designed to work only with checked exceptions. An exception type is _checked_ if it is a subtype of +`Exception` but not of `RuntimeException`. The signature of `CanThrow` still admits `RuntimeException`s since `RuntimeException` is a proper subtype of its bound, `Exception`. But no capabilities will be generated for `RuntimeException`s. Furthermore, `throws` clauses +also may not refer to `RuntimeException`s. + +**Note 2:** To keep things simple, the compiler will currently only generate capabilities +for catch clauses of the form +```scala + case ex: Ex => +``` +where `ex` is an arbitrary variable name (`_` is also allowed), and `Ex` is an arbitrary +checked exception type. Constructor patterns such as `Ex(...)` or patterns with guards +are not allowed. The compiler will issue an error if one of these is used to catch +a checked exception and `saferExceptions` is enabled. ## An Example @@ -133,17 +158,17 @@ def f(x: Double): Double = ``` You'll get this error message: ``` -9 | if x < limit then x * x else throw LimitExceeded() - | ^^^^^^^^^^^^^^^^^^^^^ - |The capability to throw exception LimitExceeded is missing. - |The capability can be provided by one of the following: - | - A using clause `(using CanThrow[LimitExceeded])` - | - A `throws` clause in a result type such as `X throws LimitExceeded` - | - an enclosing `try` that catches LimitExceeded - | - |The following import might fix the problem: - | - | import unsafeExceptions.canThrowAny + if x < limit then x * x else throw LimitExceeded() + ^^^^^^^^^^^^^^^^^^^^^ +The capability to throw exception LimitExceeded is missing. +The capability can be provided by one of the following: + - A using clause `(using CanThrow[LimitExceeded])` + - A `throws` clause in a result type such as `X throws LimitExceeded` + - an enclosing `try` that catches LimitExceeded + +The following import might fix the problem: + + import unsafeExceptions.canThrowAny ``` As the error message implies, you have to declare that `f` needs the capability to throw a `LimitExceeded` exception. The most concise way to do so is to add a `throws` clause: ```scala @@ -179,20 +204,6 @@ closure may refer to capabilities in its free variables. This means that `map` i already effect polymorphic even though we did not change its signature at all. So the takeaway is that the effects as capabilities model naturally provides for effect polymorphism whereas this is something that other approaches struggle with. -**Note 1:** The compiler will only treat checked exceptions that way. An exception type is _checked_ if it is a subtype of -`Exception` but not of `RuntimeException`. The signature of `CanThrow` still admits `RuntimeException`s since `RuntimeException` is a proper subtype of its bound, `Exception`. But no capabilities will be generated for `RuntimeException`s. Furthermore, `throws` clauses -also may not refer to `RuntimeException`s. - -**Note 2:** To keep things simple, the compiler will currently only generate capabilities -for catch clauses of the form -```scala - case ex: Ex => -``` -where `ex` is an arbitrary variable name (`_` is also allowed), and `Ex` is an arbitrary -checked exception type. Constructor patterns such as `Ex(...)` or patterns with guards -are not allowed. The compiler will issue an error if one of these is used to catch -a checked exception and `saferExceptions` is enabled. - ## Gradual Typing Via Imports Another advantage is that the model allows a gradual migration from current unchecked exceptions to safer exceptions. Imagine for a moment that `experimental.saferExceptions` is turned on everywhere. There would be lots of code that breaks since functions have not yet been properly annotated with `throws`. But it's easy to create an escape hatch that lets us ignore the breakages for a while: simply add the import diff --git a/tests/pos/i13816.scala b/tests/pos/i13816.scala new file mode 100644 index 000000000000..b85cb408a198 --- /dev/null +++ b/tests/pos/i13816.scala @@ -0,0 +1,42 @@ +import language.experimental.saferExceptions + +class Ex1 extends Exception("Ex1") +class Ex2 extends Exception("Ex2") + +def foo1(i: Int): Unit throws Ex1 throws Ex2 = + if i > 0 then throw new Ex1 else throw new Ex2 + +def foo2(i: Int): Unit throws Ex1 | Ex2 = + if i > 0 then throw new Ex1 else throw new Ex2 + +def foo3(i: Int): Unit throws (Ex1 | Ex2) = + if i > 0 then throw new Ex1 else throw new Ex2 + +def foo4(i: Int)(using CanThrow[Ex1], CanThrow[Ex2]): Unit = + if i > 0 then throw new Ex1 else throw new Ex2 + +def foo5(i: Int)(using CanThrow[Ex1])(using CanThrow[Ex2]): Unit = + if i > 0 then throw new Ex1 else throw new Ex2 + +def foo6(i: Int)(using CanThrow[Ex1 | Ex2]): Unit = + if i > 0 then throw new Ex1 else throw new Ex2 + +def foo7(i: Int)(using CanThrow[Ex1]): Unit throws Ex2 = + if i > 0 then throw new Ex1 else throw new Ex2 + +def foo8(i: Int)(using CanThrow[Ex2]): Unit throws Ex1 = + if i > 0 then throw new Ex1 else throw new Ex2 + +def test(): Unit = + try + foo1(1) + foo2(1) + foo3(1) + foo4(1) + foo5(1) + foo6(1) + foo7(1) + foo8(1) + catch + case _: Ex1 => + case _: Ex2 => From 3a6e245933d6e4f61a7a0cee2867d7c2d9826eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Fri, 3 Dec 2021 17:09:17 +0100 Subject: [PATCH 0876/1244] Better handling of multiple exceptions for saferExceptions - reworks --- .../src/dotty/tools/dotc/typer/Typer.scala | 14 ++++----- docs/docs/reference/experimental/canthrow.md | 6 ++-- library/src/scala/CanThrow.scala | 2 +- tests/neg/i13846.check | 14 ++++----- tests/neg/i13864.check | 6 ++-- tests/neg/saferExceptions.check | 20 ++++++------ tests/pos/i13816.scala | 31 ++++++++++++++----- 7 files changed, 53 insertions(+), 40 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 2cabe2641df4..a7b9730b3d23 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1759,18 +1759,16 @@ class Typer extends Namer if Feature.enabled(Feature.saferExceptions) then for CaseDef(pat, guard, _) <- cases - tpe = pat.tpe.widen - if tpe.isCheckedException + if pat.tpe.widen.isCheckedException yield checkCatch(pat, guard) - tpe + pat.tpe.widen else Seq.empty - caughtExceptions match - case Nil => expr - case head :: tail => - val capabilityProof = tail.foldLeft(head: Type)(OrType(_, _, true)) - untpd.Block(makeCanThrow(capabilityProof), expr) + if caughtExceptions.isEmpty then expr + else + val capabilityProof = caughtExceptions.reduce(OrType(_, _, true)) + untpd.Block(makeCanThrow(capabilityProof), expr) def typedTry(tree: untpd.Try, pt: Type)(using Context): Try = { val expr2 :: cases2x = harmonic(harmonize, pt) { diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md index 3c99b5894a01..df92676831d2 100644 --- a/docs/docs/reference/experimental/canthrow.md +++ b/docs/docs/reference/experimental/canthrow.md @@ -162,9 +162,9 @@ You'll get this error message: ^^^^^^^^^^^^^^^^^^^^^ The capability to throw exception LimitExceeded is missing. The capability can be provided by one of the following: - - A using clause `(using CanThrow[LimitExceeded])` - - A `throws` clause in a result type such as `X throws LimitExceeded` - - an enclosing `try` that catches LimitExceeded + - Adding a using clause `(using CanThrow[LimitExceeded])` to the definition of the enclosing method + - Adding `throws LimitExceeded` clause after the result type of the enclosing method + - Wrapping this piece of code with a `try` block that catches LimitExceeded The following import might fix the problem: diff --git a/library/src/scala/CanThrow.scala b/library/src/scala/CanThrow.scala index 4da00b8a76ac..3e66e42514e4 100644 --- a/library/src/scala/CanThrow.scala +++ b/library/src/scala/CanThrow.scala @@ -7,7 +7,7 @@ import annotation.{implicitNotFound, experimental} * a given of class `CanThrow[Ex]` to be available. */ @experimental -@implicitNotFound("The capability to throw exception ${E} is missing.\nThe capability can be provided by one of the following:\n - A using clause `(using CanThrow[${E}])`\n - A `throws` clause in a result type such as `X throws ${E}`\n - an enclosing `try` that catches ${E}") +@implicitNotFound("The capability to throw exception ${E} is missing.\nThe capability can be provided by one of the following:\n - Adding a using clause `(using CanThrow[${E}])` to the definition of the enclosing method\n - Adding `throws ${E}` clause after the result type of the enclosing method\n - Wrapping this piece of code with a `try` block that catches ${E}") erased class CanThrow[-E <: Exception] @experimental diff --git a/tests/neg/i13846.check b/tests/neg/i13846.check index 50de19874b8c..69ea0f0e51ac 100644 --- a/tests/neg/i13846.check +++ b/tests/neg/i13846.check @@ -5,13 +5,13 @@ -- Error: tests/neg/i13846.scala:7:9 ----------------------------------------------------------------------------------- 7 | foo() // error | ^ - | The capability to throw exception ArithmeticException is missing. - | The capability can be provided by one of the following: - | - A using clause `(using CanThrow[ArithmeticException])` - | - A `throws` clause in a result type such as `X throws ArithmeticException` - | - an enclosing `try` that catches ArithmeticException + | The capability to throw exception ArithmeticException is missing. + | The capability can be provided by one of the following: + | - Adding a using clause `(using CanThrow[ArithmeticException])` to the definition of the enclosing method + | - Adding `throws ArithmeticException` clause after the result type of the enclosing method + | - Wrapping this piece of code with a `try` block that catches ArithmeticException | - | The following import might fix the problem: + | The following import might fix the problem: | - | import unsafeExceptions.canThrowAny + | import unsafeExceptions.canThrowAny | diff --git a/tests/neg/i13864.check b/tests/neg/i13864.check index bce0788d31ce..54e81ea82774 100644 --- a/tests/neg/i13864.check +++ b/tests/neg/i13864.check @@ -8,9 +8,9 @@ | ^ | The capability to throw exception Ex[Int] is missing. | The capability can be provided by one of the following: - | - A using clause `(using CanThrow[Ex[Int]])` - | - A `throws` clause in a result type such as `X throws Ex[Int]` - | - an enclosing `try` that catches Ex[Int] + | - Adding a using clause `(using CanThrow[Ex[Int]])` to the definition of the enclosing method + | - Adding `throws Ex[Int]` clause after the result type of the enclosing method + | - Wrapping this piece of code with a `try` block that catches Ex[Int] | | The following import might fix the problem: | diff --git a/tests/neg/saferExceptions.check b/tests/neg/saferExceptions.check index 06c5bcc1a547..5f51ce08d6db 100644 --- a/tests/neg/saferExceptions.check +++ b/tests/neg/saferExceptions.check @@ -3,9 +3,9 @@ | ^^^^^^^^^^^^^^^^^ | The capability to throw exception Exception is missing. | The capability can be provided by one of the following: - | - A using clause `(using CanThrow[Exception])` - | - A `throws` clause in a result type such as `X throws Exception` - | - an enclosing `try` that catches Exception + | - Adding a using clause `(using CanThrow[Exception])` to the definition of the enclosing method + | - Adding `throws Exception` clause after the result type of the enclosing method + | - Wrapping this piece of code with a `try` block that catches Exception | | The following import might fix the problem: | @@ -14,13 +14,13 @@ -- Error: tests/neg/saferExceptions.scala:17:46 ------------------------------------------------------------------------ 17 | def baz(x: Int): Int throws Failure = bar(x) // error | ^ - | The capability to throw exception java.io.IOException is missing. - | The capability can be provided by one of the following: - | - A using clause `(using CanThrow[java.io.IOException])` - | - A `throws` clause in a result type such as `X throws java.io.IOException` - | - an enclosing `try` that catches java.io.IOException + | The capability to throw exception java.io.IOException is missing. + | The capability can be provided by one of the following: + | - Adding a using clause `(using CanThrow[java.io.IOException])` to the definition of the enclosing method + | - Adding `throws java.io.IOException` clause after the result type of the enclosing method + | - Wrapping this piece of code with a `try` block that catches java.io.IOException | - | The following import might fix the problem: + | The following import might fix the problem: | - | import unsafeExceptions.canThrowAny + | import unsafeExceptions.canThrowAny | diff --git a/tests/pos/i13816.scala b/tests/pos/i13816.scala index b85cb408a198..a87be4803936 100644 --- a/tests/pos/i13816.scala +++ b/tests/pos/i13816.scala @@ -4,28 +4,28 @@ class Ex1 extends Exception("Ex1") class Ex2 extends Exception("Ex2") def foo1(i: Int): Unit throws Ex1 throws Ex2 = - if i > 0 then throw new Ex1 else throw new Ex2 + if i > 0 then throw new Ex1 else throw new Ex2 def foo2(i: Int): Unit throws Ex1 | Ex2 = - if i > 0 then throw new Ex1 else throw new Ex2 + if i > 0 then throw new Ex1 else throw new Ex2 def foo3(i: Int): Unit throws (Ex1 | Ex2) = - if i > 0 then throw new Ex1 else throw new Ex2 + if i > 0 then throw new Ex1 else throw new Ex2 def foo4(i: Int)(using CanThrow[Ex1], CanThrow[Ex2]): Unit = - if i > 0 then throw new Ex1 else throw new Ex2 + if i > 0 then throw new Ex1 else throw new Ex2 def foo5(i: Int)(using CanThrow[Ex1])(using CanThrow[Ex2]): Unit = - if i > 0 then throw new Ex1 else throw new Ex2 + if i > 0 then throw new Ex1 else throw new Ex2 def foo6(i: Int)(using CanThrow[Ex1 | Ex2]): Unit = - if i > 0 then throw new Ex1 else throw new Ex2 + if i > 0 then throw new Ex1 else throw new Ex2 def foo7(i: Int)(using CanThrow[Ex1]): Unit throws Ex2 = - if i > 0 then throw new Ex1 else throw new Ex2 + if i > 0 then throw new Ex1 else throw new Ex2 def foo8(i: Int)(using CanThrow[Ex2]): Unit throws Ex1 = - if i > 0 then throw new Ex1 else throw new Ex2 + if i > 0 then throw new Ex1 else throw new Ex2 def test(): Unit = try @@ -40,3 +40,18 @@ def test(): Unit = catch case _: Ex1 => case _: Ex2 => + + try + try + foo1(1) + foo2(1) + foo3(1) + foo4(1) + foo5(1) + // foo6(1) // As explained in the docs this won't work until we find a way to aggregate capabilities + foo7(1) + foo8(1) + catch + case _: Ex1 => + catch + case _: Ex2 => From 0d1485fae747d6a0d3d15c5d7648810fd7b006ff Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 6 Dec 2021 09:45:15 +0100 Subject: [PATCH 0877/1244] Remove strong assertion when inlining This assertion can fail if the inlined function generated a error. Fixes #14039 --- compiler/src/dotty/tools/dotc/typer/Inliner.scala | 1 - tests/neg-macros/i14039/Macro_1.scala | 7 +++++++ tests/neg-macros/i14039/Test_2.scala | 5 +++++ tests/neg/i14039.check | 4 ++++ tests/neg/i14039.scala | 4 ++++ 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tests/neg-macros/i14039/Macro_1.scala create mode 100644 tests/neg-macros/i14039/Test_2.scala create mode 100644 tests/neg/i14039.check create mode 100644 tests/neg/i14039.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index 196b678f0685..65283b763673 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -1540,7 +1540,6 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { inlineIfNeeded(tryInlineArg(tree.asInstanceOf[tpd.Tree]) `orElse` super.typedIdent(tree, pt)) override def typedSelect(tree: untpd.Select, pt: Type)(using Context): Tree = { - assert(tree.hasType, tree) val qual1 = typed(tree.qualifier, shallowSelectionProto(tree.name, pt, this)) val resNoReduce = untpd.cpy.Select(tree)(qual1, tree.name).withType(tree.typeOpt) val reducedProjection = reducer.reduceProjection(resNoReduce) diff --git a/tests/neg-macros/i14039/Macro_1.scala b/tests/neg-macros/i14039/Macro_1.scala new file mode 100644 index 000000000000..d91a93a1dded --- /dev/null +++ b/tests/neg-macros/i14039/Macro_1.scala @@ -0,0 +1,7 @@ +import scala.quoted.* + +object Macro: + inline def apply(): Any = ${Macro.impl} + + def impl(using Quotes): Expr[Any] = + quotes.reflect.report.errorAndAbort("my message") diff --git a/tests/neg-macros/i14039/Test_2.scala b/tests/neg-macros/i14039/Test_2.scala new file mode 100644 index 000000000000..ff29836b379f --- /dev/null +++ b/tests/neg-macros/i14039/Test_2.scala @@ -0,0 +1,5 @@ +class Dsl { + val entries = Seq.newBuilder[Any] + inline def get(): Unit = entries += Macro.apply() + def test = get() // error +} diff --git a/tests/neg/i14039.check b/tests/neg/i14039.check new file mode 100644 index 000000000000..a9bae09c2415 --- /dev/null +++ b/tests/neg/i14039.check @@ -0,0 +1,4 @@ +-- Error: tests/neg/i14039.scala:4:14 ---------------------------------------------------------------------------------- +4 |def test = get() // error + | ^^^^^ + | my error diff --git a/tests/neg/i14039.scala b/tests/neg/i14039.scala new file mode 100644 index 000000000000..3d34a84f0e8d --- /dev/null +++ b/tests/neg/i14039.scala @@ -0,0 +1,4 @@ +val entries = Seq.newBuilder[Any] +inline def error(): Any = compiletime.error("my error") +inline def get(): Unit = entries += error() +def test = get() // error From ad725895c92d65b49e9fd1ce018f7f22ba6f807d Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Thu, 9 Dec 2021 14:26:51 +0100 Subject: [PATCH 0878/1244] Revert "Fix typo in benchmark profiles" This reverts commit 2f410ae3fafa569f1e90c2d240c482bee5a7983e. --- bench/profiles/projects.yml | 2 +- bench/profiles/sbt.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bench/profiles/projects.yml b/bench/profiles/projects.yml index cc6fb7c90474..10e90eb1c5d3 100644 --- a/bench/profiles/projects.yml +++ b/bench/profiles/projects.yml @@ -26,7 +26,7 @@ charts: scripts: dotty: - - measure -- -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) + - measure -- -with-compiler $ $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) re2s: - measure -- $(find $PROG_HOME/tests/re2s/src -name *.scala) diff --git a/bench/profiles/sbt.yml b/bench/profiles/sbt.yml index 3e5e8f44a3dc..0503a35d36a7 100644 --- a/bench/profiles/sbt.yml +++ b/bench/profiles/sbt.yml @@ -9,7 +9,7 @@ charts: scripts: dotty-sbt: - - measure -- -with-compiler -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) + - measure -- -with-compiler $ -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) config: pr_base_url: "https://github.com/lampepfl/dotty/pull/" From 0d93c96624d997c43e71fadd53213f50430685d9 Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Thu, 9 Dec 2021 14:27:31 +0100 Subject: [PATCH 0879/1244] Revert "Update scala3-bench calls in bootstrapCmdTests" This reverts commit 30d600c25ceb439d30f3b911ef3da1629d9b3445. --- project/scripts/bootstrapCmdTests | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrapCmdTests index 9f8956e1d23c..0dfa3460eeaa 100755 --- a/project/scripts/bootstrapCmdTests +++ b/project/scripts/bootstrapCmdTests @@ -5,10 +5,10 @@ set -e source $(dirname $0)/cmdTestsCommon.inc.sh # check that benchmarks can run -"$SBT" "scala3-bench/jmh:run -wi 1 -i 1 -- tests/pos/alias.scala" +"$SBT" "scala3-bench/jmh:run 1 1 tests/pos/alias.scala" # The above is here as it relies on the bootstrapped library. -"$SBT" "scala3-bench-bootstrapped/jmh:run -wi 1 -i 1 -- tests/pos/alias.scala" -"$SBT" "scala3-bench-bootstrapped/jmh:run -wi 1 -i 1 -- -with-compiler compiler/src/dotty/tools/dotc/core/Types.scala" +"$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala" +"$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 -with-compiler compiler/src/dotty/tools/dotc/core/Types.scala" echo "testing scala.quoted.Expr.run from sbt scala" "$SBT" ";scala3-compiler-bootstrapped/scalac -with-compiler tests/run-staging/quote-run.scala; scala3-compiler-bootstrapped/scala -with-compiler Test" > "$tmp" From 28554ff41101442d020273015236f6dd1c62a6ae Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Thu, 9 Dec 2021 14:27:34 +0100 Subject: [PATCH 0880/1244] Revert "Allow passing any JMH option to scala3-bench" This reverts commit 32324febbb204c74ddfb037b4acb49baf31c40cc. --- bench/profiles/ci.yml | 30 ++++++------ bench/profiles/empty.yml | 6 +-- bench/profiles/exhaustivity.yml | 16 +++---- bench/profiles/implicits.yml | 8 ++-- bench/profiles/misc.yml | 4 +- bench/profiles/projects.yml | 4 +- bench/profiles/sbt.yml | 2 +- bench/profiles/tuples.yml | 10 ++-- bench/profiles/typing.yml | 2 +- bench/scripts/collection-vector.sh | 2 +- bench/scripts/compiler-cold.sh | 2 +- bench/scripts/compiler.sh | 2 +- bench/scripts/library-cold.sh | 2 +- bench/scripts/library.sh | 2 +- bench/src/main/scala/Benchmarks.scala | 66 +++++++++++---------------- 15 files changed, 72 insertions(+), 86 deletions(-) diff --git a/bench/profiles/ci.yml b/bench/profiles/ci.yml index 96a4c1e10716..0571d509a286 100644 --- a/bench/profiles/ci.yml +++ b/bench/profiles/ci.yml @@ -1,55 +1,55 @@ scripts: re2s: - - measure -wi 1 -i 1 -f 1 -- $(find $PROG_HOME/tests/re2s/src -name *.scala) + - measure 1 1 1 $(find $PROG_HOME/tests/re2s/src -name *.scala) implicit-cache: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicit_cache.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicit_cache.scala implicit-cache-from-tasty: - source $PROG_HOME/dotty/bench/scripts/implicit-cache-from-tasty implicit-scope-loop: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala i1535: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/i1535.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/i1535.scala i1687: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/i1687.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/i1687.scala empty-class: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-class.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-class.scala empty-object: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-object.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-object.scala empty-file: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/empty-file.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/empty-file.scala patmatexhaust: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/patmatexhaust.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/patmatexhaust.scala exhaustivity-I: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala exhaustivity-S: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala exhaustivity-T: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala exhaustivity-V: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala implicitNums: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/implicitNums.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/implicitNums.scala implicitNums-from-tasty: - source $PROG_HOME/dotty/bench/scripts/implicitNums-from-tasty inductive-implicits: - - measure -wi 1 -i 1 -f 1 -- $PROG_HOME/dotty/tests/bench/inductive-implicits.scala + - measure 1 1 1 $PROG_HOME/dotty/tests/bench/inductive-implicits.scala scalap: - source $PROG_HOME/dotty/bench/scripts/scalap diff --git a/bench/profiles/empty.yml b/bench/profiles/empty.yml index bdee3609fe8d..ef878e07f50d 100644 --- a/bench/profiles/empty.yml +++ b/bench/profiles/empty.yml @@ -21,13 +21,13 @@ charts: scripts: empty-class: - - measure -- $PROG_HOME/dotty/tests/bench/empty-class.scala + - measure $PROG_HOME/dotty/tests/bench/empty-class.scala empty-object: - - measure -- $PROG_HOME/dotty/tests/bench/empty-object.scala + - measure $PROG_HOME/dotty/tests/bench/empty-object.scala empty-file: - - measure -- $PROG_HOME/dotty/tests/bench/empty-file.scala + - measure $PROG_HOME/dotty/tests/bench/empty-file.scala config: pr_base_url: "https://github.com/lampepfl/dotty/pull/" diff --git a/bench/profiles/exhaustivity.yml b/bench/profiles/exhaustivity.yml index 68b480a095aa..1dd4f78c5aa8 100644 --- a/bench/profiles/exhaustivity.yml +++ b/bench/profiles/exhaustivity.yml @@ -56,28 +56,28 @@ charts: scripts: patmatexhaust: - - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/patmatexhaust.scala + - measure 20 40 3 $PROG_HOME/dotty/tests/bench/patmatexhaust.scala exhaustivity-I: - - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala + - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-I.scala exhaustivity-S: - - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala + - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-S.scala exhaustivity-T: - - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala + - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-T.scala exhaustivity-V: - - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala + - measure 20 40 3 $PROG_HOME/dotty/tests/bench/exhaustivity-V.scala exhaustivity-mips: - - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/patmat/i7186.scala + - measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i7186.scala exhaustivity-i12241: - - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/patmat/i12241.scala + - measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i12241.scala exhaustivity-i12358: - - measure -wi 20 -i 40 -f 3 -- $PROG_HOME/dotty/tests/patmat/i12358.scala + - measure 20 40 3 $PROG_HOME/dotty/tests/patmat/i12358.scala exhaustivity-i13565: - measure 20 40 3 $PROG_HOME/dotty/tests/pos/i13565.scala diff --git a/bench/profiles/implicits.yml b/bench/profiles/implicits.yml index 97b0840d17c2..d20a99c26461 100644 --- a/bench/profiles/implicits.yml +++ b/bench/profiles/implicits.yml @@ -30,19 +30,19 @@ charts: scripts: implicit-cache: - - measure -- $PROG_HOME/dotty/tests/bench/implicit_cache.scala + - measure $PROG_HOME/dotty/tests/bench/implicit_cache.scala implicit-cache-from-tasty: - source $PROG_HOME/dotty/bench/scripts/implicit-cache-from-tasty implicit-scope-loop: - - measure -- $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala + - measure $PROG_HOME/dotty/tests/bench/implicit-scope-loop.scala inductive-implicits: - - measure -- $PROG_HOME/dotty/tests/bench/inductive-implicits.scala + - measure $PROG_HOME/dotty/tests/bench/inductive-implicits.scala implicitNums: - - measure -- $PROG_HOME/dotty/tests/bench/implicitNums.scala + - measure $PROG_HOME/dotty/tests/bench/implicitNums.scala implicitNums-from-tasty: - source $PROG_HOME/dotty/bench/scripts/implicitNums-from-tasty diff --git a/bench/profiles/misc.yml b/bench/profiles/misc.yml index f0b6a5d11ed8..80172fc791ed 100644 --- a/bench/profiles/misc.yml +++ b/bench/profiles/misc.yml @@ -15,7 +15,7 @@ charts: scripts: i1535: - - measure -- $PROG_HOME/dotty/tests/bench/i1535.scala + - measure $PROG_HOME/dotty/tests/bench/i1535.scala i1687: - - measure -- $PROG_HOME/dotty/tests/bench/i1687.scala + - measure $PROG_HOME/dotty/tests/bench/i1687.scala diff --git a/bench/profiles/projects.yml b/bench/profiles/projects.yml index 10e90eb1c5d3..2d96fb732910 100644 --- a/bench/profiles/projects.yml +++ b/bench/profiles/projects.yml @@ -26,10 +26,10 @@ charts: scripts: dotty: - - measure -- -with-compiler $ $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) + - measure -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) re2s: - - measure -- $(find $PROG_HOME/tests/re2s/src -name *.scala) + - measure $(find $PROG_HOME/tests/re2s/src -name *.scala) # scalapb: # - source $PROG_HOME/dotty/bench/scripts/scalapb diff --git a/bench/profiles/sbt.yml b/bench/profiles/sbt.yml index 0503a35d36a7..3ab0e43f3db2 100644 --- a/bench/profiles/sbt.yml +++ b/bench/profiles/sbt.yml @@ -9,7 +9,7 @@ charts: scripts: dotty-sbt: - - measure -- -with-compiler $ -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) + - measure -with-compiler -Yforce-sbt-phases -with-dotty $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) config: pr_base_url: "https://github.com/lampepfl/dotty/pull/" diff --git a/bench/profiles/tuples.yml b/bench/profiles/tuples.yml index 7977644a5731..eaa2f302a885 100644 --- a/bench/profiles/tuples.yml +++ b/bench/profiles/tuples.yml @@ -44,19 +44,19 @@ charts: scripts: tuple22-creation-apply: - - measure -- $PROG_HOME/dotty/tests/bench/tuple22-creation-apply.scala + - measure $PROG_HOME/dotty/tests/bench/tuple22-creation-apply.scala tuple22-creation-cons: - - measure -- $PROG_HOME/dotty/tests/bench/tuple22-creation-cons.scala + - measure $PROG_HOME/dotty/tests/bench/tuple22-creation-cons.scala tuple22-tails: - - measure -- $PROG_HOME/dotty/tests/bench/tuple22-tails.scala + - measure $PROG_HOME/dotty/tests/bench/tuple22-tails.scala tuple22-apply: - - measure -- $PROG_HOME/dotty/tests/bench/tuple22-apply.scala + - measure $PROG_HOME/dotty/tests/bench/tuple22-apply.scala tuple22-size: - - measure -- $PROG_HOME/dotty/tests/bench/tuple22-size.scala + - measure $PROG_HOME/dotty/tests/bench/tuple22-size.scala tuple-reverse: - measure-run TupleOps.reverse diff --git a/bench/profiles/typing.yml b/bench/profiles/typing.yml index 24a8835aeb55..4df33da49d32 100644 --- a/bench/profiles/typing.yml +++ b/bench/profiles/typing.yml @@ -8,7 +8,7 @@ charts: scripts: find-ref: - - measure -- $PROG_HOME/dotty/tests/bench/FindRef.scala + - measure $PROG_HOME/dotty/tests/bench/FindRef.scala config: pr_base_url: "https://github.com/lampepfl/dotty/pull/" diff --git a/bench/scripts/collection-vector.sh b/bench/scripts/collection-vector.sh index 65f6bdeb15a6..fb23a4a709db 100755 --- a/bench/scripts/collection-vector.sh +++ b/bench/scripts/collection-vector.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -sbt "dotty-bench-bootstrapped/jmh:run -wi 40 -i 40 -f 3 -- bench/tests/Vector.scala" +sbt "dotty-bench-bootstrapped/jmh:run 40 40 3 bench/tests/Vector.scala" diff --git a/bench/scripts/compiler-cold.sh b/bench/scripts/compiler-cold.sh index a7b5e0a5e2d1..06c1e3823a50 100755 --- a/bench/scripts/compiler-cold.sh +++ b/bench/scripts/compiler-cold.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 0 -i 1 -f 10 -- " {} + | sbt +find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 0 1 10" {} + | sbt diff --git a/bench/scripts/compiler.sh b/bench/scripts/compiler.sh index ff8c9f5ca907..0d1491d88676 100755 --- a/bench/scripts/compiler.sh +++ b/bench/scripts/compiler.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 5 -i 10 -- " {} + | sbt +find compiler/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 5 10" {} + | sbt diff --git a/bench/scripts/library-cold.sh b/bench/scripts/library-cold.sh index 80b80aa0445c..349be0cc282f 100755 --- a/bench/scripts/library-cold.sh +++ b/bench/scripts/library-cold.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 0 -i 1 -f 10 -- " {} + | sbt +find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 0 1 10" {} + | sbt diff --git a/bench/scripts/library.sh b/bench/scripts/library.sh index 40245b06bf28..b811349f85ec 100755 --- a/bench/scripts/library.sh +++ b/bench/scripts/library.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run -wi 40 -i 30 -- " {} + | sbt +find library/src/ -type f \( -name "*.scala" -or -name "*.java" \) -exec echo "dotty-bench-bootstrapped/jmh:run 40 30" {} + | sbt diff --git a/bench/src/main/scala/Benchmarks.scala b/bench/src/main/scala/Benchmarks.scala index 81346c596927..6e0bae6e72de 100644 --- a/bench/src/main/scala/Benchmarks.scala +++ b/bench/src/main/scala/Benchmarks.scala @@ -7,7 +7,7 @@ import reporting._ import org.openjdk.jmh.results.RunResult import org.openjdk.jmh.runner.Runner -import org.openjdk.jmh.runner.options.{OptionsBuilder, CommandLineOptions} +import org.openjdk.jmh.runner.options.OptionsBuilder import org.openjdk.jmh.annotations._ import org.openjdk.jmh.results.format._ import java.util.concurrent.TimeUnit @@ -22,47 +22,37 @@ import dotty.tools.io.AbstractFile object Bench { val COMPILE_OPTS_FILE = "compile.txt" - def printUsage() = - println("Usage (from SBT): scala3-bench/jmh:run -- ") - println("Display JMH help: scala3-bench/jmh:run -h") - println("Our default JMH options: -wi 30 -i 20 -f 3 -tu ms -bm AverageTime -jvmArgs \"-Xms2G -Xmx2G\"") - def main(args: Array[String]): Unit = { if (args.isEmpty) { - println("Missing arguments.") - printUsage() + println("Missing ") return } + val (intArgs, args1) = args.span(x => try { x.toInt; true } catch { case _: Throwable => false } ) - val (jmhArgs, _scalacArgs) = args.span(_ != "--") - val scalacArgs = _scalacArgs.drop(1) - - storeCompileOptions(scalacArgs) - - val jmhCliOps = new CommandLineOptions(jmhArgs:_*) - val jmhOps = new OptionsBuilder().parent(jmhCliOps) - - // set our own default options - if !jmhCliOps.shouldFailOnError().hasValue() then jmhOps.shouldFailOnError(true) - if !jmhCliOps.getWarmupIterations().hasValue() then jmhOps.warmupIterations(30) - if !jmhCliOps.getMeasurementIterations().hasValue() then jmhOps.measurementIterations(20) - if !jmhCliOps.getForkCount().hasValue() then jmhOps.forks(1) - if jmhCliOps.getBenchModes().isEmpty() then jmhOps.mode(Mode.AverageTime) - if !jmhCliOps.getTimeUnit().hasValue() then jmhOps.timeUnit(TimeUnit.MILLISECONDS) - if !jmhCliOps.getJvmArgs().hasValue() then jmhOps.jvmArgs("-Xms2G", "-Xmx2G") + val warmup = if (intArgs.length > 0) intArgs(0).toInt else 30 + val iterations = if (intArgs.length > 1) intArgs(1).toInt else 20 + val forks = if (intArgs.length > 2) intArgs(2).toInt else 1 - val runner = new Runner(jmhOps.build()) - if jmhCliOps.shouldHelp() then - printUsage() - println("Following is the JMH options documentation.") - println("-------------------------------------------") - return jmhCliOps.showHelp() - if jmhCliOps.shouldList() then return runner.list() - if jmhCliOps.shouldListWithParams() then return runner.listWithParams(jmhCliOps) - if jmhCliOps.shouldListProfilers() then return jmhCliOps.listProfilers() - if jmhCliOps.shouldListResultFormats() then return jmhCliOps.listResultFormats() + import File.{ separator => sep } + val args2 = args1.map { arg => + if ((arg.endsWith(".scala") || arg.endsWith(".java")) && !(new File(arg)).isAbsolute) ".." + sep + arg + else arg + } + storeCompileOptions(args2) + + val opts = new OptionsBuilder() + .shouldFailOnError(true) + .jvmArgs("-Xms2G", "-Xmx2G") + .mode(Mode.AverageTime) + .timeUnit(TimeUnit.MILLISECONDS) + .warmupIterations(warmup) + .measurementIterations(iterations) + .forks(forks) + .build + + val runner = new Runner(opts) // full access to all JMH features, you can also provide a custom output Format here runner.run() // actually run the benchmarks removeCompileOptions @@ -71,17 +61,13 @@ object Bench { def removeCompileOptions: Unit = new File(COMPILE_OPTS_FILE).delete() def storeCompileOptions(args: Array[String]): Unit = { - import File.{ separator => sep } - val standard_libs = System.getProperty("BENCH_CLASS_PATH") val compiler_libs = System.getProperty("BENCH_COMPILER_CLASS_PATH") val libs = if (args.contains("-with-compiler")) compiler_libs else standard_libs - var argsNorm = args.filter(_ != "-with-compiler").map { arg => - if ((arg.endsWith(".scala") || arg.endsWith(".java")) && !(new File(arg)).isAbsolute) ".." + sep + arg - else arg - } + var argsNorm = args.filter(_ != "-with-compiler") + import File.{ pathSeparator => sep } var cpIndex = argsNorm.indexOf("-classpath") if (cpIndex == -1) cpIndex = argsNorm.indexOf("-cp") if (cpIndex != -1) argsNorm(cpIndex + 1) = argsNorm(cpIndex + 1) + sep + libs From a2f4cf3a097b58cc64a35ebbc33a744d27739530 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 9 Dec 2021 17:45:31 +0100 Subject: [PATCH 0881/1244] Make outer references Java-synthetic Fixes #14083 I verified manually that the puter accessors are now ACC_SYNHETIC. If someone wants to add a bytecode test, this would be good. I don't know how to make one. --- compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala | 2 +- tests/pos/i14083.scala | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 tests/pos/i14083.scala diff --git a/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala index a6a6b2736b1b..9c50e3c2f114 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala @@ -177,7 +177,7 @@ object ExplicitOuter { else prefix.widen) val info = if (flags.is(Method)) ExprType(target) else target atPhaseNoEarlier(explicitOuterPhase.next) { // outer accessors are entered at explicitOuter + 1, should not be defined before. - newSymbol(owner, name, Synthetic | flags, info, coord = cls.coord) + newSymbol(owner, name, SyntheticArtifact | flags, info, coord = cls.coord) } } diff --git a/tests/pos/i14083.scala b/tests/pos/i14083.scala new file mode 100644 index 000000000000..542640e96bf1 --- /dev/null +++ b/tests/pos/i14083.scala @@ -0,0 +1,3 @@ +class Outer { + class Inner +} \ No newline at end of file From 507ba24aa6ca01d1986d040e47a812a6a5212074 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 9 Dec 2021 18:13:04 +0100 Subject: [PATCH 0882/1244] Make it a proper test --- tests/pos/i14083.scala | 3 --- tests/run/i14083.scala | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 tests/pos/i14083.scala create mode 100644 tests/run/i14083.scala diff --git a/tests/pos/i14083.scala b/tests/pos/i14083.scala deleted file mode 100644 index 542640e96bf1..000000000000 --- a/tests/pos/i14083.scala +++ /dev/null @@ -1,3 +0,0 @@ -class Outer { - class Inner -} \ No newline at end of file diff --git a/tests/run/i14083.scala b/tests/run/i14083.scala new file mode 100644 index 000000000000..7c4d7f4da4dc --- /dev/null +++ b/tests/run/i14083.scala @@ -0,0 +1,9 @@ +class Outer { + class Inner +} +@main def Test = + assert( + classOf[Outer#Inner] + .getDeclaredFields + .filter(_.getName == "$outer") + .exists(_.isSynthetic)) From 37c96db970381b0915ba23f13195d198e7c87d67 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 9 Dec 2021 18:23:59 +0100 Subject: [PATCH 0883/1244] Make constructor parameter $outer also Java synthetic This does not work yet, since the backend does not issue a ACC_SYNTHETIC for parameters labeled Artifact. --- compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala | 1 + compiler/src/dotty/tools/dotc/transform/Erasure.scala | 2 +- tests/run/i14083.scala | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala b/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala index 03d5ac13665b..4085d87ad7ca 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala @@ -343,6 +343,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters { def emitParamNames(jmethod: asm.MethodVisitor, params: List[Symbol]) = for param <- params do var access = asm.Opcodes.ACC_FINAL + if param.is(Artifact) then access |= asm.Opcodes.ACC_SYNTHETIC jmethod.visitParameter(param.name.mangledString, access) /* diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index ab6f00dfc575..7a89a819677f 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -929,7 +929,7 @@ object Erasure { if constr.isConstructor && needsOuterParam(constr.owner.asClass) then constr.info match case MethodTpe(outerName :: _, outerType :: _, _) => - val outerSym = newSymbol(constr, outerName, Flags.Param, outerType) + val outerSym = newSymbol(constr, outerName, Flags.Param | Flags.SyntheticArtifact, outerType) ValDef(outerSym) :: Nil case _ => // There's a possible race condition that a constructor was looked at diff --git a/tests/run/i14083.scala b/tests/run/i14083.scala index 7c4d7f4da4dc..4014e474ad45 100644 --- a/tests/run/i14083.scala +++ b/tests/run/i14083.scala @@ -2,6 +2,10 @@ class Outer { class Inner } @main def Test = + assert(classOf[Outer#Inner] + .getConstructors.head + .getParameters.head + .isSynthetic) assert( classOf[Outer#Inner] .getDeclaredFields From 5bb07b0a4471d68a819b949e987ee2f676bae6db Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 13 Aug 2021 09:20:45 +0100 Subject: [PATCH 0884/1244] Move bootstrapped cmd test to bootstrapCmdTests --- project/scripts/bootstrapCmdTests | 4 ++++ project/scripts/cmdTests | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrapCmdTests index 0dfa3460eeaa..8c49983613b1 100755 --- a/project/scripts/bootstrapCmdTests +++ b/project/scripts/bootstrapCmdTests @@ -53,6 +53,10 @@ clear_out "$OUT" ./bin/scalac -decompile -color:never "$OUT/out.jar" > "$tmp" grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp" +echo "testing sbt scalac with suspension" +clear_out "$OUT" +"$SBT" "scala3-compiler-bootstrapped/scalac -d $OUT tests/pos-macros/macros-in-same-project-1/Bar.scala tests/pos-macros/macros-in-same-project-1/Foo.scala" > "$tmp" + # echo ":quit" | ./dist/target/pack/bin/scala # not supported by CI echo "testing ./bin/scaladoc" diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index e486b0f5cc50..659b2808ed07 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -7,7 +7,7 @@ echo "testing sbt scalac and scala" "$SBT" ";scalac $SOURCE -d $OUT ;scala -classpath $OUT $MAIN" > "$tmp" grep -qe "$EXPECTED_OUTPUT" "$tmp" -# check that `sbt scalac` compiles and `sbt scala` runs it +# check that `sbt scalac -from-tasty` compiles and `sbt scala` runs it echo "testing sbt scalac -from-tasty and scala -classpath" clear_out "$OUT" "$SBT" ";scalac $SOURCE -d $OUT ;scalac -from-tasty -d $OUT1 $OUT/$TASTY ;scala -classpath $OUT1 $MAIN" > "$tmp" @@ -47,10 +47,6 @@ if grep -q "tests/pos/i10430/app.scala" "$tmp"; then exit 1 fi -echo "testing sbt scalac with suspension" -clear_out "$OUT" -"$SBT" "scala3-compiler-bootstrapped/scalac -d $OUT tests/pos-macros/macros-in-same-project-1/Bar.scala tests/pos-macros/macros-in-same-project-1/Foo.scala" > "$tmp" - # check that missing source file does not crash message rendering echo "testing that missing source file does not crash message rendering" clear_out "$OUT" From a9f4849771a5eb7ccd5f6e23e98a312812368930 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 19 Nov 2021 21:20:24 +0000 Subject: [PATCH 0885/1244] Implement :settings in the REPL --- .../tools/dotc/core/MacroClassLoader.scala | 4 ++-- .../tools/repl/AbstractFileClassLoader.scala | 2 +- .../src/dotty/tools/repl/ParseResult.scala | 9 ++++++++- compiler/src/dotty/tools/repl/Rendering.scala | 6 +++--- .../src/dotty/tools/repl/ReplDriver.scala | 19 +++++++++++++++++++ compiler/test-resources/repl/settings-command | 16 ++++++++++++++++ .../test-resources/repl/settings-outputDir | 18 ++++++++++++++++++ 7 files changed, 67 insertions(+), 7 deletions(-) create mode 100644 compiler/test-resources/repl/settings-command create mode 100644 compiler/test-resources/repl/settings-outputDir diff --git a/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala b/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala index 896da4044b42..e56835d59c54 100644 --- a/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala +++ b/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala @@ -23,7 +23,7 @@ object MacroClassLoader { private def makeMacroClassLoader(using Context): ClassLoader = trace("new macro class loader") { val entries = ClassPath.expandPath(ctx.settings.classpath.value, expandStar=true) val urls = entries.map(cp => java.nio.file.Paths.get(cp).toUri.toURL).toArray - val out = ctx.settings.outputDir.value.jpath.toUri.toURL // to find classes in case of suspended compilation - new java.net.URLClassLoader(urls :+ out, getClass.getClassLoader) + val out = Option(ctx.settings.outputDir.value.toURL) // to find classes in case of suspended compilation + new java.net.URLClassLoader(urls ++ out.toList, getClass.getClassLoader) } } diff --git a/compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala b/compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala index a3f4047fb646..7263758b60c5 100644 --- a/compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala +++ b/compiler/src/dotty/tools/repl/AbstractFileClassLoader.scala @@ -18,7 +18,7 @@ import io.AbstractFile import java.net.{URL, URLConnection, URLStreamHandler} import java.util.Collections -class AbstractFileClassLoader(root: AbstractFile, parent: ClassLoader) extends ClassLoader(parent): +class AbstractFileClassLoader(val root: AbstractFile, parent: ClassLoader) extends ClassLoader(parent): private def findAbstractFile(name: String) = root.lookupPath(name.split('/').toIndexedSeq, directory = false) override protected def findResource(name: String) = diff --git a/compiler/src/dotty/tools/repl/ParseResult.scala b/compiler/src/dotty/tools/repl/ParseResult.scala index c8d36e5c889f..bc0305c17944 100644 --- a/compiler/src/dotty/tools/repl/ParseResult.scala +++ b/compiler/src/dotty/tools/repl/ParseResult.scala @@ -80,6 +80,11 @@ case object Imports extends Command { val command: String = ":imports" } +case class Settings(arg: String) extends Command +object Settings { + val command: String = ":settings" +} + /** Reset the session to the initial state from when the repl program was * started */ @@ -106,6 +111,7 @@ case object Help extends Command { |:doc print the documentation for the given expression |:imports show import history |:reset reset the repl to its initial state, forgetting all session entries + |:settings update compiler options, if possible """.stripMargin } @@ -128,7 +134,8 @@ object ParseResult { Imports.command -> (_ => Imports), Load.command -> (arg => Load(arg)), TypeOf.command -> (arg => TypeOf(arg)), - DocOf.command -> (arg => DocOf(arg)) + DocOf.command -> (arg => DocOf(arg)), + Settings.command -> (arg => Settings(arg)), ) def apply(source: SourceFile)(implicit state: State): ParseResult = { diff --git a/compiler/src/dotty/tools/repl/Rendering.scala b/compiler/src/dotty/tools/repl/Rendering.scala index 085df909d71e..435d1266e3a5 100644 --- a/compiler/src/dotty/tools/repl/Rendering.scala +++ b/compiler/src/dotty/tools/repl/Rendering.scala @@ -31,16 +31,16 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None) { private val MaxStringElements: Int = 1000 // no need to mkString billions of elements - private var myClassLoader: ClassLoader = _ + private var myClassLoader: AbstractFileClassLoader = _ private var myReplStringOf: Object => String = _ /** Class loader used to load compiled code */ private[repl] def classLoader()(using Context) = - if (myClassLoader != null) myClassLoader + if (myClassLoader != null && myClassLoader.root == ctx.settings.outputDir.value) myClassLoader else { - val parent = parentClassLoader.getOrElse { + val parent = Option(myClassLoader).orElse(parentClassLoader).getOrElse { val compilerClasspath = ctx.platform.classPath(using ctx).asURLs // We can't use the system classloader as a parent because it would // pollute the user classpath with everything passed to the JVM diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala index 40876b260394..ceeceb12f669 100644 --- a/compiler/src/dotty/tools/repl/ReplDriver.scala +++ b/compiler/src/dotty/tools/repl/ReplDriver.scala @@ -5,8 +5,10 @@ import java.nio.charset.StandardCharsets import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.{tpd, untpd} +import dotty.tools.dotc.config.CommandLineParser.tokenize import dotty.tools.dotc.config.Properties.{javaVersion, javaVmName, simpleVersionString} import dotty.tools.dotc.core.Contexts._ +import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Phases.{unfusedPhases, typerPhase} import dotty.tools.dotc.core.Denotations.Denotation import dotty.tools.dotc.core.Flags._ @@ -414,6 +416,23 @@ class ReplDriver(settings: Array[String], } state + case Settings(arg) => arg match + case "" => + given ctx: Context = state.context + for (s <- ctx.settings.userSetSettings(ctx.settingsState).sortBy(_.name)) + out.println(s"${s.name} = ${if s.value == "" then "\"\"" else s.value}") + state + case _ => + setup(tokenize(arg).toArray, rootCtx) match + case Some((files, ictx)) => + inContext(ictx) { + if files.nonEmpty then out.println(i"Ignoring spurious arguments: $files%, %") + ictx.base.initialize()(using ictx) + rootCtx = ictx + } + case _ => + state.copy(context = rootCtx) + case Quit => // end of the world! state diff --git a/compiler/test-resources/repl/settings-command b/compiler/test-resources/repl/settings-command new file mode 100644 index 000000000000..db4b1af7343f --- /dev/null +++ b/compiler/test-resources/repl/settings-command @@ -0,0 +1,16 @@ +scala> def f(thread: Thread) = thread.stop() +there were 1 deprecation warning(s); re-run with -deprecation for details +def f(thread: Thread): Unit + +scala>:settings -deprecation foo.scala +Ignoring spurious arguments: foo.scala + +scala> def f(thread: Thread) = thread.stop() +1 warning found +-- Deprecation Warning: -------------------------------------------------------- +1 | def f(thread: Thread) = thread.stop() + | ^^^^^^^^^^^ + |method stop in class Thread is deprecated since : see corresponding Javadoc for more information. +def f(thread: Thread): Unit + +scala> diff --git a/compiler/test-resources/repl/settings-outputDir b/compiler/test-resources/repl/settings-outputDir new file mode 100644 index 000000000000..8f0460a30cfe --- /dev/null +++ b/compiler/test-resources/repl/settings-outputDir @@ -0,0 +1,18 @@ +scala> java.nio.file.Files.exists(java.nio.file.Files.createDirectories(java.nio.file.Paths.get("target", "test-repl-settings-outDir"))) +val res0: Boolean = true + +scala> val x = 1 +val x: Int = 1 + +scala>:settings -d target/test-repl-settings-outDir + +scala> val y = 2 +val y: Int = 2 + +scala> x +val res1: Int = 1 + +scala> y +val res2: Int = 2 + +scala> java.nio.file.Files.walk(java.nio.file.Paths.get("target", "test-repl-settings-outDir")).sorted(java.util.Comparator.reverseOrder).forEach(java.nio.file.Files.delete) From 18420b9bf61edda8de9883e585f5fed7dcbb1223 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 1 Dec 2021 22:21:43 +0000 Subject: [PATCH 0886/1244] Fix REPL clashing with CWD artefacts This reverts the change that moves all the REPL's artefacts into the "repl$" package, moving everything back to the empty package. Then it fixes the class name and package name shadowing issue, by simulating what the batch compiler does when it compiles a source file without a package statement: it considers the sources to be in the empty package. Then the imports for the previous runs and the user-defined imports will be in sub-contexts of the empty package. The reason the working directory artefacts were shadowing the REPL artefacts was because before the imports were being added to sub-contexts of the root package, afterwhich the REPL tree was being wrapped in the empty package. That meant that the classes found in the empty package (i.e. classfiles in the working directory, or even directories) had precedence over the wildcard imports for the previous runs. The tests now cascade up into contexts that don't have the current compilation unit stored on them, so I had to safeguard against that in Typer. Also, I developed a variant of ShadowingTests, using the batch compiler, to automate the expectations of how the shadowing should and shouldn't work. --- .../src/dotty/tools/dotc/core/StdNames.scala | 1 - .../src/dotty/tools/dotc/typer/Typer.scala | 2 +- compiler/src/dotty/tools/repl/Rendering.scala | 4 +- .../src/dotty/tools/repl/ReplCompiler.scala | 12 ++-- .../src/dotty/tools/repl/ScriptEngine.scala | 2 +- .../dotc/reporting/ErrorMessagesTest.scala | 2 +- .../tools/repl/ShadowingBatchTests.scala | 71 +++++++++++++++++++ .../dotty/tools/repl/ShadowingTests.scala | 4 -- 8 files changed, 82 insertions(+), 16 deletions(-) create mode 100644 compiler/test/dotty/tools/repl/ShadowingBatchTests.scala diff --git a/compiler/src/dotty/tools/dotc/core/StdNames.scala b/compiler/src/dotty/tools/dotc/core/StdNames.scala index 4988b81918df..a8915cb9d74b 100644 --- a/compiler/src/dotty/tools/dotc/core/StdNames.scala +++ b/compiler/src/dotty/tools/dotc/core/StdNames.scala @@ -133,7 +133,6 @@ object StdNames { val OPS_PACKAGE: N = "" val OVERLOADED: N = "" val PACKAGE: N = "package" - val REPL_PACKAGE: N = "repl$" val ROOT: N = "" val SPECIALIZED_SUFFIX: N = "$sp" val SUPER_PREFIX: N = "super$" diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index a7b9730b3d23..1ba0c0efeba4 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -298,7 +298,7 @@ class Typer extends Namer */ def isDefinedInCurrentUnit(denot: Denotation)(using Context): Boolean = denot match { case MultiDenotation(d1, d2) => isDefinedInCurrentUnit(d1) || isDefinedInCurrentUnit(d2) - case denot: SingleDenotation => denot.symbol.source == ctx.compilationUnit.source + case denot: SingleDenotation => ctx.compilationUnit != null && denot.symbol.source == ctx.compilationUnit.source } /** Is `denot` the denotation of a self symbol? */ diff --git a/compiler/src/dotty/tools/repl/Rendering.scala b/compiler/src/dotty/tools/repl/Rendering.scala index 435d1266e3a5..bb5496f0cc8b 100644 --- a/compiler/src/dotty/tools/repl/Rendering.scala +++ b/compiler/src/dotty/tools/repl/Rendering.scala @@ -158,7 +158,7 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None) { //at repl$.rs$line$2$.(rs$line$2:1) //at repl$.rs$line$2.res1(rs$line$2) def isWrapperInitialization(ste: StackTraceElement) = - ste.getClassName.startsWith(nme.REPL_PACKAGE.toString + ".") // d.symbol.owner.name.show is simple name + ste.getClassName.startsWith(REPL_WRAPPER_NAME_PREFIX) // d.symbol.owner.name.show is simple name && (ste.getMethodName == nme.STATIC_CONSTRUCTOR.show || ste.getMethodName == nme.CONSTRUCTOR.show) cause.formatStackTracePrefix(!isWrapperInitialization(_)) @@ -170,7 +170,7 @@ private[repl] class Rendering(parentClassLoader: Option[ClassLoader] = None) { } object Rendering { - final val REPL_WRAPPER_NAME_PREFIX = s"${nme.REPL_PACKAGE}.${str.REPL_SESSION_LINE}" + final val REPL_WRAPPER_NAME_PREFIX = str.REPL_SESSION_LINE extension (s: Symbol) def showUser(using Context): String = { diff --git a/compiler/src/dotty/tools/repl/ReplCompiler.scala b/compiler/src/dotty/tools/repl/ReplCompiler.scala index d80e9871fdee..9249172b5d4d 100644 --- a/compiler/src/dotty/tools/repl/ReplCompiler.scala +++ b/compiler/src/dotty/tools/repl/ReplCompiler.scala @@ -47,7 +47,7 @@ class ReplCompiler extends Compiler { def importPreviousRun(id: Int)(using Context) = { // we first import the wrapper object id - val path = nme.REPL_PACKAGE ++ "." ++ objectNames(id) + val path = nme.EMPTY_PACKAGE ++ "." ++ objectNames(id) val ctx0 = ctx.fresh .setNewScope .withRootImports(RootRef(() => requiredModuleRef(path)) :: Nil) @@ -59,9 +59,9 @@ class ReplCompiler extends Compiler { importContext(imp)(using ctx)) } - val rootCtx = super.rootContext - .withRootImports // default root imports - .withRootImports(RootRef(() => defn.EmptyPackageVal.termRef) :: Nil) + val rootCtx = super.rootContext.fresh + .setOwner(defn.EmptyPackageClass) + .withRootImports (1 to state.objectIndex).foldLeft(rootCtx)((ctx, id) => importPreviousRun(id)(using ctx)) } @@ -147,7 +147,7 @@ class ReplCompiler extends Compiler { val module = ModuleDef(objectTermName, tmpl) .withSpan(span) - PackageDef(Ident(nme.REPL_PACKAGE), List(module)) + PackageDef(Ident(nme.EMPTY_PACKAGE), List(module)) } private def createUnit(defs: Definitions, span: Span)(using Context): CompilationUnit = { @@ -249,7 +249,7 @@ class ReplCompiler extends Compiler { val wrapper = TypeDef("$wrapper".toTypeName, tmpl) .withMods(Modifiers(Final)) .withSpan(Span(0, expr.length)) - PackageDef(Ident(nme.REPL_PACKAGE), List(wrapper)) + PackageDef(Ident(nme.EMPTY_PACKAGE), List(wrapper)) } ParseResult(sourceFile)(state) match { diff --git a/compiler/src/dotty/tools/repl/ScriptEngine.scala b/compiler/src/dotty/tools/repl/ScriptEngine.scala index 9c0ced8e5fa0..501dbd0263d7 100644 --- a/compiler/src/dotty/tools/repl/ScriptEngine.scala +++ b/compiler/src/dotty/tools/repl/ScriptEngine.scala @@ -37,7 +37,7 @@ class ScriptEngine extends AbstractScriptEngine { val vid = state.valIndex state = driver.run(script)(state) val oid = state.objectIndex - Class.forName(s"${nme.REPL_PACKAGE}.${str.REPL_SESSION_LINE}$oid", true, rendering.classLoader()(using state.context)) + Class.forName(s"${Rendering.REPL_WRAPPER_NAME_PREFIX}$oid", true, rendering.classLoader()(using state.context)) .getDeclaredMethods.find(_.getName == s"${str.REPL_RES_PREFIX}$vid") .map(_.invoke(null)) .getOrElse(null) diff --git a/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala b/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala index cc7d1eac2004..76f06802c79c 100644 --- a/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala +++ b/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala @@ -8,7 +8,7 @@ import org.junit.Assert._ trait ErrorMessagesTest extends DottyTest { - private def newContext = { + protected def newContext = { val rep = new StoreReporter(null) with UniqueMessagePositions with HideNonSensicalMessages initialCtx.setReporter(rep).setSetting(ctx.settings.color, "never") diff --git a/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala b/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala new file mode 100644 index 000000000000..bcfe1c3251a7 --- /dev/null +++ b/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala @@ -0,0 +1,71 @@ +package dotty.tools +package repl + +import java.io.File +import java.nio.file.Files + +import org.junit.{ After, AfterClass, BeforeClass, Ignore, Test } +import org.junit.Assert._ +import io.{ Directory, PlainDirectory } +import dotc.core.Contexts._ +import dotc.reporting.{ ErrorMessagesTest, StoreReporter } +import vulpix.TestConfiguration + +object ShadowingBatchTests: + val dir = Directory(Files.createTempDirectory("batch-shadow")) + + @BeforeClass def suiteStarting: Unit = dir.createDirectory() + @AfterClass def suiteFinished: Unit = dir.deleteRecursively() + +class ShadowingBatchTests extends ErrorMessagesTest: + import ShadowingBatchTests._ + + @After def testFinished: Unit = dir.list.foreach(_.deleteRecursively()) + + val compiler = new dotc.Compiler() + + override def initializeCtx(ictx: FreshContext) = inContext(ictx) { + super.initializeCtx(ictx) + val settings = ictx.settings; import settings._ + ictx.setSetting(outputDir, new PlainDirectory(dir)) + ictx.setSetting(classpath, classpath.value + File.pathSeparator + dir.jpath.toAbsolutePath) + } + + @Test def file = + checkMessages("class C(val c: Int)").expectNoErrors + checkMessages("object rsline1 {\n def line1 = new C().c\n}").expect { (_, msgs) => + assertMessageCount(1, msgs) + assertEquals("missing argument for parameter c of constructor C in class C: (c: Int): C", msgs.head.message) + } + checkMessages("object rsline2 {\n def line2 = new C(13).c\n}").expectNoErrors + checkMessages("object rsline3 {\n class C { val c = 42 }\n}").expectNoErrors + checkMessages("import rsline3._\nobject rsline4 {\n def line4 = new C().c\n}").expectNoErrors + + @Test def directory = + checkMessages("package foo\nclass C").expectNoErrors + checkMessages("object rsline1 {\n def line1 = foo\n}").expect { (_, msgs) => + assertMessageCount(1, msgs) + assertEquals("package foo is not a value", msgs.head.message) + } + checkMessages("object rsline2 {\n val foo = 2\n}").expectNoErrors + checkMessages("import rsline2._\nobject rsline3 {\n def line3 = foo\n}").expectNoErrors + + @Test def directoryJava = + checkMessages("object rsline1 {\n def line1 = java\n}").expect { (_, msgs) => + assertMessageCount(1, msgs) + assertEquals("package java is not a value", msgs.head.message) + } + checkMessages("object rsline2 {\n val java = 2\n}").expectNoErrors + checkMessages("import rsline2._\nobject rsline3 {\n def line3 = java\n}").expectNoErrors + + def checkMessages(source: String): Report = + ctx = newContext + val run = compiler.newRun(using ctx.fresh) + run.compileFromStrings(List(source)) + val runCtx = run.runContext + if runCtx.reporter.hasErrors then + val rep = runCtx.reporter.asInstanceOf[StoreReporter] + val msgs = rep.removeBufferedMessages(using runCtx).map(_.msg).reverse + new Report(msgs, runCtx) + else new EmptyReport +end ShadowingBatchTests diff --git a/compiler/test/dotty/tools/repl/ShadowingTests.scala b/compiler/test/dotty/tools/repl/ShadowingTests.scala index 4284c44c58de..43c182b9ae5b 100644 --- a/compiler/test/dotty/tools/repl/ShadowingTests.scala +++ b/compiler/test/dotty/tools/repl/ShadowingTests.scala @@ -95,7 +95,6 @@ class ShadowingTests extends ReplTest(options = ShadowingTests.options): |""".stripMargin ) - @Ignore("not yet fixed") @Test def `shadow subdirectories on classpath` = // NB: Tests of shadowing of subdirectories on the classpath are only valid // when the subdirectories exist prior to initialization of the REPL driver. @@ -128,9 +127,6 @@ class ShadowingTests extends ReplTest(options = ShadowingTests.options): ShadowingTests.createSubDir("util") testScript(name = "", """|scala> import util.Try - |1 | import util.Try - | | ^^^ - | | value Try is not a member of util | |scala> object util { class Try { override def toString = "you've gotta try!" } } |// defined object util From dd064e9d885c7bfcb45684df613b5e894dd526a8 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sat, 11 Dec 2021 18:08:27 +0100 Subject: [PATCH 0887/1244] Reject empty target names Fixes #14062 --- compiler/src/dotty/tools/dotc/typer/Checking.scala | 8 +++++--- tests/neg/i14062.scala | 10 ++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 tests/neg/i14062.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index 2b539d54ef49..f4ec37881d6c 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -20,6 +20,7 @@ import ErrorReporting.errorTree import rewrites.Rewrites.patch import util.Spans.Span import Phases.refchecksPhase +import Constants.Constant import util.SrcPos import util.Spans.Span @@ -1204,13 +1205,14 @@ trait Checking { /** Check arguments of compiler-defined annotations */ def checkAnnotArgs(tree: Tree)(using Context): tree.type = val cls = Annotations.annotClass(tree) - def needsStringLit(arg: Tree) = - report.error(em"@${cls.name} needs a string literal as argument", arg.srcPos) tree match case Apply(tycon, arg :: Nil) if cls == defn.TargetNameAnnot => arg match + case Literal(Constant("")) => + report.error(em"target name cannot be empty", arg.srcPos) case Literal(_) => // ok - case _ => needsStringLit(arg) + case _ => + report.error(em"@${cls.name} needs a string literal as argument", arg.srcPos) case _ => tree diff --git a/tests/neg/i14062.scala b/tests/neg/i14062.scala new file mode 100644 index 000000000000..e2e6625a97e0 --- /dev/null +++ b/tests/neg/i14062.scala @@ -0,0 +1,10 @@ +import annotation.* + +object Test: + + @targetName("") // error + def foo = println("ok") + + foo + + From 78f7c20b7d73a99a300fc0110b807decaa3916a0 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Tue, 7 Dec 2021 18:35:00 +0100 Subject: [PATCH 0888/1244] Allow `import ` to show completions Previously, there would be no completions after simple `import annot`. Now, we make sure that the completions mode is set correctly for that case. Additionally, whenever both `java.lang` and `scala` imports conflict we choose scala one. --- .../tools/dotc/interactive/Completion.scala | 24 +++++++++++++++++++ .../tools/languageserver/CompletionTest.scala | 9 +++++++ 2 files changed, 33 insertions(+) diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala index b57c300defae..8c0e5f7bd8f5 100644 --- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala +++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala @@ -61,6 +61,8 @@ object Completion { */ def completionMode(path: List[Tree], pos: SourcePosition): Mode = path match { + case Ident(_) :: Import(_, _) :: _ => + Mode.Import case (ref: RefTree) :: _ => if (ref.name.isTermName) Mode.Term else if (ref.name.isTypeName) Mode.Type @@ -211,6 +213,22 @@ object Completion { // import a.C def isSameSymbolImportedDouble = denotss.forall(_.denots == first.denots) + def isScalaPackage(scopedDenots: ScopedDenotations) = + scopedDenots.denots.exists(_.info.typeSymbol.owner == defn.ScalaPackageClass) + + def isJavaLangPackage(scopedDenots: ScopedDenotations) = + scopedDenots.denots.exists(_.info.typeSymbol.owner == defn.JavaLangPackageClass) + + // For example + // import java.lang.annotation + // is shadowed by + // import scala.annotation + def isJavaLangAndScala = denotss match + case List(first, second) => + isScalaPackage(first) && isJavaLangPackage(second) || + isScalaPackage(second) && isJavaLangPackage(first) + case _ => false + denotss.find(!_.ctx.isImportContext) match { // most deeply nested member or local definition if not shadowed by an import case Some(local) if local.ctx.scope == first.ctx.scope => @@ -218,6 +236,12 @@ object Completion { case None if isSingleImport || isImportedInDifferentScope || isSameSymbolImportedDouble => resultMappings += name -> first.denots + case None if isJavaLangAndScala => + denotss.foreach{ + denots => + if isScalaPackage(denots) then + resultMappings += name -> denots.denots + } case _ => } diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala index bc870e329f4f..c9ebdaf8e5d2 100644 --- a/language-server/test/dotty/tools/languageserver/CompletionTest.scala +++ b/language-server/test/dotty/tools/languageserver/CompletionTest.scala @@ -976,4 +976,13 @@ class CompletionTest { ("main", Module, "main") ) ) + + @Test def i13623_annotation : Unit = + code"""import annot${m1}""" + .withSource + .completion(m1, + Set( + ("annotation", Module, "scala.annotation") + ) + ) } From 75a1bef4d355649383f8f9264798b26f1ce7d80f Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Fri, 10 Dec 2021 19:28:45 +0100 Subject: [PATCH 0889/1244] Fix issues with multiple java.lang and scala shadowing improts --- .../src/dotty/tools/dotc/interactive/Completion.scala | 11 ++++++----- .../dotty/tools/languageserver/CompletionTest.scala | 9 +++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala index 8c0e5f7bd8f5..1f26b50b6cce 100644 --- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala +++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala @@ -24,6 +24,7 @@ import dotty.tools.dotc.printing.Texts._ import dotty.tools.dotc.util.{NameTransformer, NoSourcePosition, SourcePosition} import scala.collection.mutable +import scala.util.control.NonFatal /** * One of the results of a completion query. @@ -223,11 +224,11 @@ object Completion { // import java.lang.annotation // is shadowed by // import scala.annotation - def isJavaLangAndScala = denotss match - case List(first, second) => - isScalaPackage(first) && isJavaLangPackage(second) || - isScalaPackage(second) && isJavaLangPackage(first) - case _ => false + def isJavaLangAndScala = + try + denotss.forall(denots => isScalaPackage(denots) || isJavaLangPackage(denots)) + catch + case NonFatal(_) => false denotss.find(!_.ctx.isImportContext) match { // most deeply nested member or local definition if not shadowed by an import diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala index c9ebdaf8e5d2..afee53328857 100644 --- a/language-server/test/dotty/tools/languageserver/CompletionTest.scala +++ b/language-server/test/dotty/tools/languageserver/CompletionTest.scala @@ -985,4 +985,13 @@ class CompletionTest { ("annotation", Module, "scala.annotation") ) ) + + @Test def importAnnotationAfterImport : Unit = + code"""import java.lang.annotation; import annot${m1}""" + .withSource + .completion(m1, + Set( + ("annotation", Module, "scala.annotation") + ) + ) } From ac83bb67711cc73ebec1bcd26d7ed064cba8d553 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Mon, 6 Dec 2021 11:49:45 +0100 Subject: [PATCH 0890/1244] Revert headers and links --- .gitignore | 7 -- docs/README.md | 4 - docs/docs/reference/changed-features.md | 6 +- .../changed-features/compiler-plugins.md | 6 +- .../changed-features/eta-expansion-spec.md | 4 +- .../changed-features/eta-expansion.md | 10 +- .../implicit-conversions-spec.md | 10 +- .../changed-features/implicit-conversions.md | 8 +- .../changed-features/implicit-resolution.md | 6 +- .../reference/changed-features/imports.md | 6 +- docs/docs/reference/changed-features/index.md | 7 ++ .../changed-features/interpolation-escapes.md | 4 +- .../changed-features/lazy-vals-init.md | 6 +- .../changed-features/main-functions.md | 8 +- .../changed-features/match-syntax.md | 6 +- .../changed-features/numeric-literals.md | 6 +- .../reference/changed-features/operators.md | 10 +- .../changed-features/overload-resolution.md | 8 +- .../changed-features/pattern-bindings.md | 6 +- .../changed-features/pattern-matching.md | 8 +- .../changed-features/structural-types-spec.md | 6 +- .../changed-features/structural-types.md | 8 +- .../changed-features/type-checking.md | 6 +- .../changed-features/type-inference.md | 6 +- .../changed-features/vararg-splices.md | 6 +- .../reference/changed-features/wildcards.md | 6 +- docs/docs/reference/contextual.md | 30 +++--- .../contextual/by-name-context-parameters.md | 6 +- .../reference/contextual/context-bounds.md | 6 +- .../contextual/context-functions-spec.md | 7 +- .../reference/contextual/context-functions.md | 8 +- docs/docs/reference/contextual/conversions.md | 6 +- .../reference/contextual/derivation-macro.md | 8 +- docs/docs/reference/contextual/derivation.md | 8 +- .../reference/contextual/extension-methods.md | 10 +- .../reference/contextual/given-imports.md | 6 +- docs/docs/reference/contextual/givens.md | 10 +- .../contextual/multiversal-equality.md | 8 +- .../contextual/relationship-implicits.md | 6 +- .../right-associative-extension-methods.md | 4 +- .../docs/reference/contextual/type-classes.md | 10 +- .../reference/contextual/using-clauses.md | 12 +-- docs/docs/reference/dropped-features.md | 6 +- .../reference/dropped-features/auto-apply.md | 6 +- .../dropped-features/class-shadowing-spec.md | 4 +- .../dropped-features/class-shadowing.md | 8 +- .../dropped-features/delayed-init.md | 8 +- .../reference/dropped-features/do-while.md | 8 +- .../dropped-features/early-initializers.md | 8 +- .../dropped-features/existential-types.md | 6 +- .../reference/dropped-features/limit22.md | 8 +- .../docs/reference/dropped-features/macros.md | 12 +-- .../dropped-features/nonlocal-returns.md | 5 +- .../dropped-features/package-objects.md | 6 +- .../dropped-features/procedure-syntax.md | 6 +- .../reference/dropped-features/symlits.md | 6 +- .../dropped-features/this-qualifier.md | 8 +- .../dropped-features/type-projection.md | 6 +- .../dropped-features/weak-conformance-spec.md | 4 +- .../dropped-features/weak-conformance.md | 8 +- .../dropped-features/wildcard-init.md | 6 +- docs/docs/reference/dropped-features/xml.md | 6 +- docs/docs/reference/enums.md | 6 +- docs/docs/reference/enums/adts.md | 10 +- docs/docs/reference/enums/desugarEnums.md | 8 +- docs/docs/reference/enums/enums.md | 8 +- docs/docs/reference/experimental/canthrow.md | 6 +- .../experimental/erased-defs-spec.md | 6 +- .../reference/experimental/erased-defs.md | 8 +- .../experimental/named-typeargs-spec.md | 4 +- .../reference/experimental/named-typeargs.md | 4 +- .../experimental/numeric-literals.md | 4 +- docs/docs/reference/experimental/overview.md | 5 +- .../docs/reference/features-classification.md | 84 ++++++++-------- docs/docs/reference/language-versions.md | 6 +- docs/docs/reference/metaprogramming.md | 18 ++-- .../metaprogramming/compiletime-ops.md | 6 +- docs/docs/reference/metaprogramming/inline.md | 8 +- .../reference/metaprogramming/macros-spec.md | 8 +- docs/docs/reference/metaprogramming/macros.md | 12 +-- .../reference/metaprogramming/reflection.md | 12 +-- .../reference/metaprogramming/simple-smp.md | 6 +- .../docs/reference/metaprogramming/staging.md | 8 +- .../metaprogramming/tasty-inspect.md | 6 +- docs/docs/reference/new-types.md | 6 +- .../dependent-function-types-spec.md | 6 +- .../new-types/dependent-function-types.md | 8 +- .../new-types/intersection-types-spec.md | 4 +- .../reference/new-types/intersection-types.md | 8 +- docs/docs/reference/new-types/match-types.md | 6 +- .../new-types/polymorphic-function-types.md | 8 +- .../reference/new-types/type-lambdas-spec.md | 8 +- docs/docs/reference/new-types/type-lambdas.md | 8 +- .../reference/new-types/union-types-spec.md | 8 +- docs/docs/reference/new-types/union-types.md | 8 +- docs/docs/reference/other-new-features.md | 6 +- .../other-new-features/control-syntax.md | 6 +- .../creator-applications.md | 6 +- .../other-new-features/experimental-defs.md | 6 +- .../other-new-features/explicit-nulls.md | 12 +-- .../reference/other-new-features/export.md | 6 +- .../indentation-experimental.md | 4 +- .../other-new-features/indentation.md | 10 +- .../other-new-features/kind-polymorphism.md | 6 +- .../reference/other-new-features/matchable.md | 8 +- .../other-new-features/opaques-details.md | 6 +- .../reference/other-new-features/opaques.md | 8 +- .../other-new-features/open-classes.md | 6 +- .../parameter-untupling-spec.md | 4 +- .../other-new-features/parameter-untupling.md | 8 +- .../other-new-features/safe-initialization.md | 8 +- .../other-new-features/targetName.md | 6 +- .../threadUnsafe-annotation.md | 6 +- .../other-new-features/trait-parameters.md | 6 +- .../other-new-features/transparent-traits.md | 8 +- .../reference/other-new-features/type-test.md | 6 +- docs/docs/reference/overview.md | 99 +++++++++---------- docs/docs/reference/soft-modifier.md | 4 +- docs/docs/reference/syntax.md | 9 +- docs/docs/usage/ide-support.md | 1 - docs/docs/usage/scaladoc/blog.md | 14 ++- docs/docs/usage/scaladoc/docstrings.md | 8 +- docs/docs/usage/scaladoc/index.md | 7 +- docs/docs/usage/scaladoc/linking.md | 6 +- docs/docs/usage/scaladoc/search-engine.md | 8 +- docs/docs/usage/scaladoc/settings.md | 5 +- docs/docs/usage/scaladoc/site-versioning.md | 8 +- docs/docs/usage/scaladoc/static-site.md | 8 +- .../worksheet-mode-implementation-details.md | 5 + 129 files changed, 445 insertions(+), 654 deletions(-) delete mode 100644 docs/README.md create mode 100644 docs/docs/reference/changed-features/index.md diff --git a/.gitignore b/.gitignore index fd9530725f5d..17a292e4c6a7 100644 --- a/.gitignore +++ b/.gitignore @@ -102,10 +102,3 @@ cs # Coursier test product compiler/test-coursier/run/*.jar - -# Docs -docs-for-dotty-page/* - -# docs.scala-lang deplyment temp dir -docsScalaLang/ -docs/_site/ diff --git a/docs/README.md b/docs/README.md deleted file mode 100644 index f6d95155126a..000000000000 --- a/docs/README.md +++ /dev/null @@ -1,4 +0,0 @@ -This directory is for keeping all the compiler related docs. - -For serving this files, one should notice that files under `docs/docs/reference` and `docs/docs/usage/scaladoc` are designed to be compatible with `docs.scala-lang` jekyll page. -Preprocessing the sources to be compatible with scaladoc static site is done via script at `project/CopyDocs.scala` diff --git a/docs/docs/reference/changed-features.md b/docs/docs/reference/changed-features.md index 7a8f717f2394..05a138b396fa 100644 --- a/docs/docs/reference/changed-features.md +++ b/docs/docs/reference/changed-features.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Other Changed Features" -type: chapter -num: 52 -previous-page: /scala3/reference/other-new-features/experimental-defs -next-page: /scala3/reference/changed-features/numeric-literals +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features.html --- The following pages document the features that have changed in Scala 3, compared to Scala 2. diff --git a/docs/docs/reference/changed-features/compiler-plugins.md b/docs/docs/reference/changed-features/compiler-plugins.md index b8e108c560c4..2a446e9cfb84 100644 --- a/docs/docs/reference/changed-features/compiler-plugins.md +++ b/docs/docs/reference/changed-features/compiler-plugins.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Changes in Compiler Plugins" -type: section -num: 68 -previous-page: /scala3/reference/changed-features/eta-expansion -next-page: /scala3/reference/changed-features/lazy-vals-init +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/compiler-plugins.html --- Compiler plugins are supported by Dotty (and Scala 3) since 0.9. There are two notable changes diff --git a/docs/docs/reference/changed-features/eta-expansion-spec.md b/docs/docs/reference/changed-features/eta-expansion-spec.md index 78d021003cc4..67f7606d5b15 100644 --- a/docs/docs/reference/changed-features/eta-expansion-spec.md +++ b/docs/docs/reference/changed-features/eta-expansion-spec.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Automatic Eta Expansion - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/eta-expansion-spec.html --- ## Motivation diff --git a/docs/docs/reference/changed-features/eta-expansion.md b/docs/docs/reference/changed-features/eta-expansion.md index f21cb54406ad..2ae9af870a55 100644 --- a/docs/docs/reference/changed-features/eta-expansion.md +++ b/docs/docs/reference/changed-features/eta-expansion.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Automatic Eta Expansion" -type: section -num: 67 -previous-page: /scala3/reference/changed-features/pattern-matching -next-page: /scala3/reference/changed-features/compiler-plugins +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/eta-expansion.html --- The conversion of _methods_ into _functions_ has been improved and happens automatically for methods with one or more parameters. @@ -38,7 +36,7 @@ rather than `next _`. The reason for excluding nullary methods from automatic eta expansion is that Scala implicitly inserts the `()` argument, which would conflict with eta expansion. Automatic `()` insertion is -[limited](../dropped-features/auto-apply.html) in Scala 3, but the fundamental ambiguity +[limited](../dropped-features/auto-apply.md) in Scala 3, but the fundamental ambiguity remains. -[More details](eta-expansion-spec.html) +[More details](eta-expansion-spec.md) diff --git a/docs/docs/reference/changed-features/implicit-conversions-spec.md b/docs/docs/reference/changed-features/implicit-conversions-spec.md index 32bb641dbf74..47cfd941bf02 100644 --- a/docs/docs/reference/changed-features/implicit-conversions-spec.md +++ b/docs/docs/reference/changed-features/implicit-conversions-spec.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Implicit Conversions - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/implicit-conversions-spec.html --- ## Implementation @@ -82,7 +82,7 @@ implicit val myConverter: Int => String = _.toString implicit val myConverter: Conversion[Int, String] = _.toString ``` -Note that implicit conversions are also affected by the [changes to implicit resolution](implicit-resolution.html) between Scala 2 and Scala 3. +Note that implicit conversions are also affected by the [changes to implicit resolution](implicit-resolution.md) between Scala 2 and Scala 3. ## Motivation for the changes @@ -109,9 +109,9 @@ will report a type error, because `Map` isn't an instance of Implicit values that are used as views should see their type changed to `Conversion`. For the migration of implicit conversions that are affected by the -changes to implicit resolution, refer to the [Changes in Implicit Resolution](implicit-resolution.html) for more information. +changes to implicit resolution, refer to the [Changes in Implicit Resolution](implicit-resolution.md) for more information. ## Reference -For more information about implicit resolution, see [Changes in Implicit Resolution](implicit-resolution.html). +For more information about implicit resolution, see [Changes in Implicit Resolution](implicit-resolution.md). Other details are available in [PR #2065](https://github.com/lampepfl/dotty/pull/2065). diff --git a/docs/docs/reference/changed-features/implicit-conversions.md b/docs/docs/reference/changed-features/implicit-conversions.md index aab1baa32373..2ee2583d3cd8 100644 --- a/docs/docs/reference/changed-features/implicit-conversions.md +++ b/docs/docs/reference/changed-features/implicit-conversions.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Implicit Conversions" -type: section -num: 61 -previous-page: /scala3/reference/changed-features/implicit-resolution -next-page: /scala3/reference/changed-features/overload-resolution +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/implicit-conversions.html --- An _implicit conversion_, also called _view_, is a conversion that @@ -63,4 +61,4 @@ implicitly[Ordering[A]] // Ok, will use the implicit conversion from // `A` to `Int` and the `Ordering` for `Int`. ``` -[More details](implicit-conversions-spec.html) +[More details](implicit-conversions-spec.md) diff --git a/docs/docs/reference/changed-features/implicit-resolution.md b/docs/docs/reference/changed-features/implicit-resolution.md index 2a563aceeb19..435104a12024 100644 --- a/docs/docs/reference/changed-features/implicit-resolution.md +++ b/docs/docs/reference/changed-features/implicit-resolution.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Changes in Implicit Resolution" -type: section -num: 60 -previous-page: /scala3/reference/changed-features/type-inference -next-page: /scala3/reference/changed-features/implicit-conversions +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/implicit-resolution.html --- This section describes changes to the implicit resolution that apply both to the new `given`s and to the old-style `implicit`s in Scala 3. diff --git a/docs/docs/reference/changed-features/imports.md b/docs/docs/reference/changed-features/imports.md index e46fbc8fc44b..7d364ce68b92 100644 --- a/docs/docs/reference/changed-features/imports.md +++ b/docs/docs/reference/changed-features/imports.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Imports" -type: section -num: 57 -previous-page: /scala3/reference/changed-features/wildcards -next-page: /scala3/reference/changed-features/type-checking +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/imports.html --- The syntax of wildcard and renaming imports (and exports) has changed. diff --git a/docs/docs/reference/changed-features/index.md b/docs/docs/reference/changed-features/index.md new file mode 100644 index 000000000000..70946645b06b --- /dev/null +++ b/docs/docs/reference/changed-features/index.md @@ -0,0 +1,7 @@ +--- +layout: doc-page +title: "Other Changed Features" +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/index.html +--- + +The following pages document the features that have changed in Scala 3, compared to Scala 2. diff --git a/docs/docs/reference/changed-features/interpolation-escapes.md b/docs/docs/reference/changed-features/interpolation-escapes.md index c61ef9828178..d5b3a82d94cc 100644 --- a/docs/docs/reference/changed-features/interpolation-escapes.md +++ b/docs/docs/reference/changed-features/interpolation-escapes.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Escapes in interpolations" +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/interpolation-escapes.html --- In Scala 2 there is no straightforward way to represent a single quote character `"` in a single quoted interpolation. A `\` character can't be used for that because interpolators themselves decide how to handle escaping, so the parser doesn't know whether the `"` should be escaped or used as a terminator. diff --git a/docs/docs/reference/changed-features/lazy-vals-init.md b/docs/docs/reference/changed-features/lazy-vals-init.md index f70ec622f6e1..c3b25cdc5ab3 100644 --- a/docs/docs/reference/changed-features/lazy-vals-init.md +++ b/docs/docs/reference/changed-features/lazy-vals-init.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: Lazy Vals Initialization -type: section -num: 69 -previous-page: /scala3/reference/changed-features/compiler-plugins -next-page: /scala3/reference/changed-features/main-functions +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/lazy-vals-init.html --- Scala 3 implements [Version 6](https://docs.scala-lang.org/sips/improved-lazy-val-initialization.html#version-6---no-synchronization-on-this-and-concurrent-initialization-of-fields) diff --git a/docs/docs/reference/changed-features/main-functions.md b/docs/docs/reference/changed-features/main-functions.md index 777532e7110b..e0e13a14f681 100644 --- a/docs/docs/reference/changed-features/main-functions.md +++ b/docs/docs/reference/changed-features/main-functions.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Main Methods" -type: section -num: 70 -previous-page: /scala3/reference/changed-features/lazy-vals-init -next-page: /scala3/reference/dropped-features +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/main-functions.html --- Scala 3 offers a new way to define programs that can be invoked from the command line: @@ -87,5 +85,5 @@ object happyBirthday extends App: ... ``` -The previous functionality of `App`, which relied on the "magic" [`DelayedInit`]({% link _scala3-reference/dropped-features/delayed-init.md %}) trait, is no longer available. [`App`](https://scala-lang.org/api/3.x/scala/App.html) still exists in limited form for now, but it does not support command line arguments and will be deprecated in the future. If programs need to cross-build +The previous functionality of `App`, which relied on the "magic" [`DelayedInit`]({% link _scala3-reference/dropped-features/delayed-init.md %}) trait, is no longer available. [`App`](https://scala-lang.org/api/3.x/scala/App.md) still exists in limited form for now, but it does not support command line arguments and will be deprecated in the future. If programs need to cross-build between Scala 2 and Scala 3, it is recommended to use an explicit `main` method with an `Array[String]` argument instead. diff --git a/docs/docs/reference/changed-features/match-syntax.md b/docs/docs/reference/changed-features/match-syntax.md index 12e35cfa94df..cff77262611b 100644 --- a/docs/docs/reference/changed-features/match-syntax.md +++ b/docs/docs/reference/changed-features/match-syntax.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Match Expressions" -type: section -num: 63 -previous-page: /scala3/reference/changed-features/overload-resolution -next-page: /scala3/reference/changed-features/vararg-splices +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/match-syntax.html --- The syntactical precedence of match expressions has been changed. diff --git a/docs/docs/reference/changed-features/numeric-literals.md b/docs/docs/reference/changed-features/numeric-literals.md index 1cc07e3b1c8e..758cc2e21373 100644 --- a/docs/docs/reference/changed-features/numeric-literals.md +++ b/docs/docs/reference/changed-features/numeric-literals.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Numeric Literals" -type: section -num: 53 -previous-page: /scala3/reference/changed-features -next-page: /scala3/reference/changed-features/structural-types +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/numeric-literals.html --- [Document was moved](../experimental/numeric-literals.md) diff --git a/docs/docs/reference/changed-features/operators.md b/docs/docs/reference/changed-features/operators.md index 953aa18c8408..495eb8c5ede9 100644 --- a/docs/docs/reference/changed-features/operators.md +++ b/docs/docs/reference/changed-features/operators.md @@ -1,15 +1,13 @@ --- +layout: doc-page title: "Rules for Operators" -type: section -num: 55 -previous-page: /scala3/reference/changed-features/structural-types -next-page: /scala3/reference/changed-features/wildcards +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/operators.html --- The rules for infix operators have changed in some parts: First, an alphanumeric method can be used as an infix operator only if its definition carries an `infix` modifier. Second, it is recommended (but not enforced) to -augment definitions of symbolic operators with [`@targetName` annotations](../other-new-features/targetName.html). Finally, +augment definitions of symbolic operators with [`@targetName` annotations](../other-new-features/targetName.md). Finally, a syntax change allows infix operators to be written on the left in a multi-line expression. ## The `infix` Modifier @@ -99,7 +97,7 @@ or if the `-source future` option is given in Dotty/Scala 3. ## The `@targetName` Annotation -It is recommended that definitions of symbolic operators carry a [`@targetName` annotation](../other-new-features/targetName.html) that provides an encoding of the operator with an alphanumeric name. This has several benefits: +It is recommended that definitions of symbolic operators carry a [`@targetName` annotation](../other-new-features/targetName.md) that provides an encoding of the operator with an alphanumeric name. This has several benefits: - It helps interoperability between Scala and other languages. One can call a Scala-defined symbolic operator from another language using its target name, diff --git a/docs/docs/reference/changed-features/overload-resolution.md b/docs/docs/reference/changed-features/overload-resolution.md index 4205acdd412f..e6c929f7a2ef 100644 --- a/docs/docs/reference/changed-features/overload-resolution.md +++ b/docs/docs/reference/changed-features/overload-resolution.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Changes in Overload Resolution" -type: section -num: 62 -previous-page: /scala3/reference/changed-features/implicit-conversions -next-page: /scala3/reference/changed-features/match-syntax +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/overload-resolution.html --- Overload resolution in Scala 3 improves on Scala 2 in two ways. @@ -44,7 +42,7 @@ resolution yields several competing alternatives when `n >= 1` parameter lists a into account, then resolution re-tried using `n + 1` argument lists. This change is motivated by the new language feature -[extension methods](../contextual/extension-methods.html), where emerges the need to do +[extension methods](../contextual/extension-methods.md), where emerges the need to do overload resolution based on additional argument blocks. ## Parameter Types of Function Values diff --git a/docs/docs/reference/changed-features/pattern-bindings.md b/docs/docs/reference/changed-features/pattern-bindings.md index a5eb39e98da6..978bff2d7d7e 100644 --- a/docs/docs/reference/changed-features/pattern-bindings.md +++ b/docs/docs/reference/changed-features/pattern-bindings.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Pattern Bindings" -type: section -num: 65 -previous-page: /scala3/reference/changed-features/vararg-splices -next-page: /scala3/reference/changed-features/pattern-matching +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/pattern-bindings.html --- In Scala 2, pattern bindings in `val` definitions and `for` expressions are diff --git a/docs/docs/reference/changed-features/pattern-matching.md b/docs/docs/reference/changed-features/pattern-matching.md index 93712f004307..b9115fe93233 100644 --- a/docs/docs/reference/changed-features/pattern-matching.md +++ b/docs/docs/reference/changed-features/pattern-matching.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Option-less pattern matching" -type: section -num: 66 -previous-page: /scala3/reference/changed-features/pattern-bindings -next-page: /scala3/reference/changed-features/eta-expansion +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/pattern-matching.html --- The implementation of pattern matching in Scala 3 was greatly simplified compared to Scala 2. From a user perspective, this means that Scala 3 generated patterns are a *lot* easier to debug, as variables all show up in debug modes and positions are correctly preserved. @@ -243,4 +241,4 @@ Abstract type testing with `ClassTag` is replaced with `TypeTest` or the alias ` - pattern `_: X` for an abstract type requires a `TypeTest` in scope - pattern `x @ X()` for an unapply that takes an abstract type requires a `TypeTest` in scope -[More details on `TypeTest`](../other-new-features/type-test.html) +[More details on `TypeTest`](../other-new-features/type-test.md) diff --git a/docs/docs/reference/changed-features/structural-types-spec.md b/docs/docs/reference/changed-features/structural-types-spec.md index eb7e653a780a..5c99afbcc1bb 100644 --- a/docs/docs/reference/changed-features/structural-types-spec.md +++ b/docs/docs/reference/changed-features/structural-types-spec.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Programmatic Structural Types - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/structural-types-spec.html --- ## Syntax @@ -81,7 +81,7 @@ and `Rs` are structural refinement declarations, and given `v.a` of type `U`, we Note that `v`'s static type does not necessarily have to conform to `Selectable`, nor does it need to have `selectDynamic` and `applyDynamic` as members. It suffices that there is an implicit conversion that can turn `v` into a `Selectable`, and the selection methods could also be available as -[extension methods](../contextual/extension-methods.html). +[extension methods](../contextual/extension-methods.md). ## Limitations of Structural Types diff --git a/docs/docs/reference/changed-features/structural-types.md b/docs/docs/reference/changed-features/structural-types.md index 3ce3d6ac88bd..904525a4655d 100644 --- a/docs/docs/reference/changed-features/structural-types.md +++ b/docs/docs/reference/changed-features/structural-types.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Programmatic Structural Types" -type: section -num: 54 -previous-page: /scala3/reference/changed-features/numeric-literals -next-page: /scala3/reference/changed-features/operators +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/structural-types.html --- ## Motivation @@ -191,4 +189,4 @@ differences. `java.lang.Class` arguments indicating the method's formal parameter types. `Dynamic` comes with `updateDynamic`. -[More details](structural-types-spec.html) +[More details](structural-types-spec.md) diff --git a/docs/docs/reference/changed-features/type-checking.md b/docs/docs/reference/changed-features/type-checking.md index f647e57ac462..09a62698d4c7 100644 --- a/docs/docs/reference/changed-features/type-checking.md +++ b/docs/docs/reference/changed-features/type-checking.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Changes in Type Checking" -type: section -num: 58 -previous-page: /scala3/reference/changed-features/imports -next-page: /scala3/reference/changed-features/type-inference +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/type-checking.html --- *** **TO BE FILLED IN** *** diff --git a/docs/docs/reference/changed-features/type-inference.md b/docs/docs/reference/changed-features/type-inference.md index 2432cb8e4339..020878444914 100644 --- a/docs/docs/reference/changed-features/type-inference.md +++ b/docs/docs/reference/changed-features/type-inference.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Changes in Type Inference" -type: section -num: 59 -previous-page: /scala3/reference/changed-features/type-checking -next-page: /scala3/reference/changed-features/implicit-resolution +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/type-inference.html --- For more information, see the two presentations diff --git a/docs/docs/reference/changed-features/vararg-splices.md b/docs/docs/reference/changed-features/vararg-splices.md index 2da55ee79945..1d8b61408176 100644 --- a/docs/docs/reference/changed-features/vararg-splices.md +++ b/docs/docs/reference/changed-features/vararg-splices.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Vararg Splices" -type: section -num: 64 -previous-page: /scala3/reference/changed-features/match-syntax -next-page: /scala3/reference/changed-features/pattern-bindings +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/vararg-splices.html --- The syntax of vararg splices in patterns and function arguments has changed. The new syntax uses a postfix `*`, analogously to how a vararg parameter is declared. diff --git a/docs/docs/reference/changed-features/wildcards.md b/docs/docs/reference/changed-features/wildcards.md index 0a84ebbf2a48..3336f43c3795 100644 --- a/docs/docs/reference/changed-features/wildcards.md +++ b/docs/docs/reference/changed-features/wildcards.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: Wildcard Arguments in Types -type: section -num: 56 -previous-page: /scala3/reference/changed-features/operators -next-page: /scala3/reference/changed-features/imports +movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/wildcards.html --- The syntax of wildcard arguments in types has changed from `_` to `?`. Example: diff --git a/docs/docs/reference/contextual.md b/docs/docs/reference/contextual.md index 1dfc5e6baa97..de9046162c69 100644 --- a/docs/docs/reference/contextual.md +++ b/docs/docs/reference/contextual.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Contextual Abstractions" -type: chapter -num: 13 -previous-page: /scala3/reference/enums/desugarEnums -next-page: /scala3/reference/contextual/givens +movedTo: https://docs.scala-lang.org/scala3/reference/contextual.html --- ### Critique of the Status Quo @@ -52,25 +50,25 @@ Existing Scala programmers by and large have gotten used to the status quo and s The following pages introduce a redesign of contextual abstractions in Scala. They introduce four fundamental changes: -1. [Given Instances](./contextual/givens.html) are a new way to define basic terms that can be synthesized. They replace implicit definitions. The core principle of the proposal is that, rather than mixing the `implicit` modifier with a large number of features, we have a single way to define terms that can be synthesized for types. +1. [Given Instances](./contextual/givens.md) are a new way to define basic terms that can be synthesized. They replace implicit definitions. The core principle of the proposal is that, rather than mixing the `implicit` modifier with a large number of features, we have a single way to define terms that can be synthesized for types. -2. [Using Clauses](./contextual/using-clauses.html) are a new syntax for implicit _parameters_ and their _arguments_. It unambiguously aligns parameters and arguments, solving a number of language warts. It also allows us to have several `using` clauses in a definition. +2. [Using Clauses](./contextual/using-clauses.md) are a new syntax for implicit _parameters_ and their _arguments_. It unambiguously aligns parameters and arguments, solving a number of language warts. It also allows us to have several `using` clauses in a definition. -3. ["Given" Imports](./contextual/given-imports.html) are a new class of import selectors that specifically import +3. ["Given" Imports](./contextual/given-imports.md) are a new class of import selectors that specifically import givens and nothing else. -4. [Implicit Conversions](./contextual/conversions.html) are now expressed as given instances of a standard `Conversion` class. All other forms of implicit conversions will be phased out. +4. [Implicit Conversions](./contextual/conversions.md) are now expressed as given instances of a standard `Conversion` class. All other forms of implicit conversions will be phased out. This section also contains pages describing other language features that are related to context abstraction. These are: -- [Context Bounds](./contextual/context-bounds.html), which carry over unchanged. -- [Extension Methods](./contextual/extension-methods.html) replace implicit classes in a way that integrates better with type classes. -- [Implementing Type Classes](./contextual/type-classes.html) demonstrates how some common type classes can be implemented using the new constructs. -- [Type Class Derivation](./contextual/derivation.html) introduces constructs to automatically derive type class instances for ADTs. -- [Multiversal Equality](./contextual/multiversal-equality.html) introduces a special type class to support type safe equality. -- [Context Functions](./contextual/context-functions.html) provide a way to abstract over context parameters. -- [By-Name Context Parameters](./contextual/by-name-context-parameters.html) are an essential tool to define recursive synthesized values without looping. -- [Relationship with Scala 2 Implicits](./contextual/relationship-implicits.html) discusses the relationship between old-style implicits and new-style givens and how to migrate from one to the other. +- [Context Bounds](./contextual/context-bounds.md), which carry over unchanged. +- [Extension Methods](./contextual/extension-methods.md) replace implicit classes in a way that integrates better with type classes. +- [Implementing Type Classes](./contextual/type-classes.md) demonstrates how some common type classes can be implemented using the new constructs. +- [Type Class Derivation](./contextual/derivation.md) introduces constructs to automatically derive type class instances for ADTs. +- [Multiversal Equality](./contextual/multiversal-equality.md) introduces a special type class to support type safe equality. +- [Context Functions](./contextual/context-functions.md) provide a way to abstract over context parameters. +- [By-Name Context Parameters](./contextual/by-name-context-parameters.md) are an essential tool to define recursive synthesized values without looping. +- [Relationship with Scala 2 Implicits](./contextual/relationship-implicits.md) discusses the relationship between old-style implicits and new-style givens and how to migrate from one to the other. Overall, the new design achieves a better separation of term inference from the rest of the language: There is a single way to define givens instead of a multitude of forms all taking an `implicit` modifier. There is a single way to introduce implicit parameters and arguments instead of conflating implicit with normal arguments. There is a separate way to import givens that does not allow them to hide in a sea of normal imports. And there is a single way to define an implicit conversion which is clearly marked as such and does not require special syntax. diff --git a/docs/docs/reference/contextual/by-name-context-parameters.md b/docs/docs/reference/contextual/by-name-context-parameters.md index c1777b625912..8e8427f7457f 100644 --- a/docs/docs/reference/contextual/by-name-context-parameters.md +++ b/docs/docs/reference/contextual/by-name-context-parameters.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "By-Name Context Parameters" -type: section -num: 25 -previous-page: /scala3/reference/contextual/conversions -next-page: /scala3/reference/contextual/relationship-implicits +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/by-name-context-parameters.html --- Context parameters can be declared by-name to avoid a divergent inferred expansion. Example: diff --git a/docs/docs/reference/contextual/context-bounds.md b/docs/docs/reference/contextual/context-bounds.md index 5c7ea5cd5936..e336f00cc463 100644 --- a/docs/docs/reference/contextual/context-bounds.md +++ b/docs/docs/reference/contextual/context-bounds.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Context Bounds" -type: section -num: 17 -previous-page: /scala3/reference/contextual/using-clauses -next-page: /scala3/reference/contextual/given-imports +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/context-bounds.html --- A context bound is a shorthand for expressing the common pattern of a context parameter that depends on a type parameter. Using a context bound, the `maximum` function of the last section can be written like this: diff --git a/docs/docs/reference/contextual/context-functions-spec.md b/docs/docs/reference/contextual/context-functions-spec.md index 9267eea23f49..9e358ecede41 100644 --- a/docs/docs/reference/contextual/context-functions-spec.md +++ b/docs/docs/reference/contextual/context-functions-spec.md @@ -1,7 +1,8 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Context Functions - More Details" + +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/context-functions-spec.html --- ## Syntax @@ -66,7 +67,7 @@ itself a context function literal. This is analogous to the automatic insertion of `scala.Function0` around expressions in by-name argument position. Context function types generalize to `N > 22` in the same way that function types do, see [the corresponding -documentation](../dropped-features/limit22.html). +documentation](../dropped-features/limit22.md). ## Examples diff --git a/docs/docs/reference/contextual/context-functions.md b/docs/docs/reference/contextual/context-functions.md index 1b930b3c8dfc..c556a0cadf8f 100644 --- a/docs/docs/reference/contextual/context-functions.md +++ b/docs/docs/reference/contextual/context-functions.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Context Functions" -type: section -num: 23 -previous-page: /scala3/reference/contextual/multiversal-equality -next-page: /scala3/reference/contextual/conversions +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/context-functions.html --- _Context functions_ are functions with (only) context parameters. @@ -153,4 +151,4 @@ val s = For more information, see the [blog article](https://www.scala-lang.org/blog/2016/12/07/implicit-function-types.html), (which uses a different syntax that has been superseded). -[More details](./context-functions-spec.html) +[More details](./context-functions-spec.md) diff --git a/docs/docs/reference/contextual/conversions.md b/docs/docs/reference/contextual/conversions.md index 5a222515adea..9928719663e2 100644 --- a/docs/docs/reference/contextual/conversions.md +++ b/docs/docs/reference/contextual/conversions.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Implicit Conversions" -type: section -num: 24 -previous-page: /scala3/reference/contextual/context-functions -next-page: /scala3/reference/contextual/by-name-context-parameters +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/conversions.html --- Implicit conversions are defined by given instances of the `scala.Conversion` class. diff --git a/docs/docs/reference/contextual/derivation-macro.md b/docs/docs/reference/contextual/derivation-macro.md index c9c657d7804f..c75f0430ec9b 100644 --- a/docs/docs/reference/contextual/derivation-macro.md +++ b/docs/docs/reference/contextual/derivation-macro.md @@ -1,10 +1,10 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "How to write a type class `derived` method using macros" +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/derivation-macro.html --- -In the main [derivation](./derivation.html) documentation page, we explained the +In the main [derivation](./derivation.md) documentation page, we explained the details behind `Mirror`s and type class derivation. Here we demonstrate how to implement a type class `derived` method using macros only. We follow the same example of deriving `Eq` instances and for simplicity we support a `Product` @@ -109,7 +109,7 @@ and an age of type `Int`, the equality check we want to generate is the followin ## Calling the derived method inside the macro -Following the rules in [Macros](../metaprogramming.html) we create two methods. +Following the rules in [Macros](../metaprogramming.md) we create two methods. One that hosts the top-level splice `eqv` and one that is the implementation. Alternatively and what is shown below is that we can call the `eqv` method directly. The `eqGen` can trigger the derivation. diff --git a/docs/docs/reference/contextual/derivation.md b/docs/docs/reference/contextual/derivation.md index d7ec09c3705c..843116217d56 100644 --- a/docs/docs/reference/contextual/derivation.md +++ b/docs/docs/reference/contextual/derivation.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Type Class Derivation" -type: section -num: 21 -previous-page: /scala3/reference/contextual/type-classes -next-page: /scala3/reference/contextual/multiversal-equality +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/derivation.html --- Type class derivation is a way to automatically generate given instances for type classes which satisfy some simple @@ -338,7 +336,7 @@ inline def derived[A](using gen: K0.Generic[A]): Eq[A] = The framework described here enables all three of these approaches without mandating any of them. For a brief discussion on how to use macros to write a type class `derived` -method please read more at [How to write a type class `derived` method using macros](./derivation-macro.html). +method please read more at [How to write a type class `derived` method using macros](./derivation-macro.md). ### Deriving instances elsewhere diff --git a/docs/docs/reference/contextual/extension-methods.md b/docs/docs/reference/contextual/extension-methods.md index 06364baa507f..c2a12081cf99 100644 --- a/docs/docs/reference/contextual/extension-methods.md +++ b/docs/docs/reference/contextual/extension-methods.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Extension Methods" -type: section -num: 19 -previous-page: /scala3/reference/contextual/given-imports -next-page: /scala3/reference/contextual/type-classes +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/extension-methods.html --- Extension methods allow one to add methods to a type after the type is defined. Example: @@ -63,7 +61,7 @@ the right-associative operator `+:` to an extension method. This is analogous to the implementation of right binding operators as normal methods. The Scala compiler preprocesses an infix operation `x +: xs` to `xs.+:(x)`, so the extension method ends up being applied to the sequence as first argument (in other words, the -two swaps cancel each other out). See [here for details](./right-associative-extension-methods.html). +two swaps cancel each other out). See [here for details](./right-associative-extension-methods.md). ### Generic Extensions @@ -285,7 +283,7 @@ def position(s: String)(ch: Char, n: Int): Int = ### Syntax Here are the syntax changes for extension methods and collective extensions relative -to the [current syntax](../syntax.html). +to the [current syntax](../syntax.md). ``` BlockStat ::= ... | Extension diff --git a/docs/docs/reference/contextual/given-imports.md b/docs/docs/reference/contextual/given-imports.md index 7e498415888e..3e3bc3d275cc 100644 --- a/docs/docs/reference/contextual/given-imports.md +++ b/docs/docs/reference/contextual/given-imports.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Importing Givens" -type: section -num: 18 -previous-page: /scala3/reference/contextual/context-bounds -next-page: /scala3/reference/contextual/extension-methods +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/given-imports.html --- A special form of import wildcard selector is used to import given instances. Example: diff --git a/docs/docs/reference/contextual/givens.md b/docs/docs/reference/contextual/givens.md index 0ca25c068c93..caaa1990282b 100644 --- a/docs/docs/reference/contextual/givens.md +++ b/docs/docs/reference/contextual/givens.md @@ -1,13 +1,11 @@ --- +layout: doc-page title: "Given Instances" -type: section -num: 15 -previous-page: /scala3/reference/contextual -next-page: /scala3/reference/contextual/using-clauses +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/givens.html --- Given instances (or, simply, "givens") define "canonical" values of certain types -that serve for synthesizing arguments to [context parameters](./using-clauses.html). Example: +that serve for synthesizing arguments to [context parameters](./using-clauses.md). Example: ```scala trait Ord[T]: @@ -36,7 +34,7 @@ a given for the type `Ord[Int]` whereas `listOrd[T]` defines givens for `Ord[List[T]]` for all types `T` that come with a given instance for `Ord[T]` themselves. The `using` clause in `listOrd` defines a condition: There must be a given of type `Ord[T]` for a given of type `Ord[List[T]]` to exist. -Such conditions are expanded by the compiler to [context parameters](./using-clauses.html). +Such conditions are expanded by the compiler to [context parameters](./using-clauses.md). ## Anonymous Givens diff --git a/docs/docs/reference/contextual/multiversal-equality.md b/docs/docs/reference/contextual/multiversal-equality.md index 19b44c654494..1af1786374bc 100644 --- a/docs/docs/reference/contextual/multiversal-equality.md +++ b/docs/docs/reference/contextual/multiversal-equality.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Multiversal Equality" -type: section -num: 22 -previous-page: /scala3/reference/contextual/derivation -next-page: /scala3/reference/contextual/context-functions +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/multiversal-equality.html --- Previously, Scala had universal equality: Two values of any types @@ -106,7 +104,7 @@ Instead of defining `CanEqual` instances directly, it is often more convenient t class Box[T](x: T) derives CanEqual ``` -By the usual rules of [type class derivation](./derivation.html), +By the usual rules of [type class derivation](./derivation.md), this generates the following `CanEqual` instance in the companion object of `Box`: ```scala diff --git a/docs/docs/reference/contextual/relationship-implicits.md b/docs/docs/reference/contextual/relationship-implicits.md index 9be698affdd8..4a23e781bd70 100644 --- a/docs/docs/reference/contextual/relationship-implicits.md +++ b/docs/docs/reference/contextual/relationship-implicits.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Relationship with Scala 2 Implicits" -type: section -num: 26 -previous-page: /scala3/reference/contextual/by-name-context-parameters -next-page: /scala3/reference/metaprogramming +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/relationship-implicits.html --- Many, but not all, of the new contextual abstraction features in Scala 3 can be mapped to Scala 2's implicits. This page gives a rundown on the relationships between new and old features. diff --git a/docs/docs/reference/contextual/right-associative-extension-methods.md b/docs/docs/reference/contextual/right-associative-extension-methods.md index b77e6dccdd78..7c2cf6b02675 100644 --- a/docs/docs/reference/contextual/right-associative-extension-methods.md +++ b/docs/docs/reference/contextual/right-associative-extension-methods.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Right-Associative Extension Methods: Details" +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/right-associative-extension-methods.html --- The most general form of leading parameters of an extension method is as follows: diff --git a/docs/docs/reference/contextual/type-classes.md b/docs/docs/reference/contextual/type-classes.md index 4c80e7b53b14..c4648b3baf28 100644 --- a/docs/docs/reference/contextual/type-classes.md +++ b/docs/docs/reference/contextual/type-classes.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Implementing Type classes" -type: section -num: 20 -previous-page: /scala3/reference/contextual/extension-methods -next-page: /scala3/reference/contextual/derivation +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/type-classes.html --- A _type class_ is an abstract, parameterized type that lets you add new behavior to any closed data type without using sub-typing. This can be useful in multiple use-cases, for example: @@ -100,7 +98,7 @@ assertTransformation(List("a1", "b1"), List("a", "b"), elt => s"${elt}1") ``` That's a first step, but in practice we probably would like the `map` function to be a method directly accessible on the type `F`. So that we can call `map` directly on instances of `F`, and get rid of the `summon[Functor[F]]` part. -As in the previous example of Monoids, [`extension` methods](extension-methods.html) help achieving that. Let's re-define the `Functor` type class with extension methods. +As in the previous example of Monoids, [`extension` methods](extension-methods.md) help achieving that. Let's re-define the `Functor` type class with extension methods. ```scala trait Functor[F[_]]: @@ -237,7 +235,7 @@ given configDependentMonad: Monad[ConfigDependent] with end configDependentMonad ``` -The type `ConfigDependent` can be written using [type lambdas](../new-types/type-lambdas.html): +The type `ConfigDependent` can be written using [type lambdas](../new-types/type-lambdas.md): ```scala type ConfigDependent = [Result] =>> Config => Result diff --git a/docs/docs/reference/contextual/using-clauses.md b/docs/docs/reference/contextual/using-clauses.md index 4f98c760ffef..e8a077ccdc0a 100644 --- a/docs/docs/reference/contextual/using-clauses.md +++ b/docs/docs/reference/contextual/using-clauses.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Using Clauses" -type: section -num: 16 -previous-page: /scala3/reference/contextual/givens -next-page: /scala3/reference/contextual/context-bounds +movedTo: https://docs.scala-lang.org/scala3/reference/contextual/using-clauses.html --- Functional programming tends to express most dependencies as simple function parameterization. @@ -11,7 +9,7 @@ This is clean and powerful, but it sometimes leads to functions that take many p functions. Context parameters can help here since they enable the compiler to synthesize repetitive arguments instead of the programmer having to write them explicitly. -For example, with the [given instances](./givens.html) defined previously, +For example, with the [given instances](./givens.md) defined previously, a `max` function that works for any arguments for which an ordering exists can be defined as follows: ```scala @@ -66,7 +64,7 @@ class GivenIntBox2(using givenInt: Int): //def n = summon[Int] // ambiguous ``` -The `given` member is importable as explained in the section on [importing `given`s](./given-imports.html): +The `given` member is importable as explained in the section on [importing `given`s](./given-imports.md): ```scala val b = GivenIntBox(using 23) @@ -144,7 +142,7 @@ def summon[T](using x: T): x.type = x ## Syntax -Here is the new syntax of parameters and arguments seen as a delta from the [standard context free syntax of Scala 3](../syntax.html). `using` is a soft keyword, recognized only at the start of a parameter or argument list. It can be used as a normal identifier everywhere else. +Here is the new syntax of parameters and arguments seen as a delta from the [standard context free syntax of Scala 3](../syntax.md). `using` is a soft keyword, recognized only at the start of a parameter or argument list. It can be used as a normal identifier everywhere else. ``` ClsParamClause ::= ... | UsingClsParamClause diff --git a/docs/docs/reference/dropped-features.md b/docs/docs/reference/dropped-features.md index 6ccff5c40425..f4cd72942949 100644 --- a/docs/docs/reference/dropped-features.md +++ b/docs/docs/reference/dropped-features.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped Features" -type: chapter -num: 71 -previous-page: /scala3/reference/changed-features/main-functions -next-page: /scala3/reference/dropped-features/delayed-init +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features.html --- The following pages document the features of Scala 2 that have been dropped in Scala 3. diff --git a/docs/docs/reference/dropped-features/auto-apply.md b/docs/docs/reference/dropped-features/auto-apply.md index 6696bd8165d8..c5424ffff22d 100644 --- a/docs/docs/reference/dropped-features/auto-apply.md +++ b/docs/docs/reference/dropped-features/auto-apply.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Auto-Application" -type: section -num: 84 -previous-page: /scala3/reference/dropped-features/symlits -next-page: /scala3/reference/dropped-features/weak-conformance +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/auto-apply.html --- Previously an empty argument list `()` was implicitly inserted when diff --git a/docs/docs/reference/dropped-features/class-shadowing-spec.md b/docs/docs/reference/dropped-features/class-shadowing-spec.md index d1d5d4b34bb4..98acff828cd3 100644 --- a/docs/docs/reference/dropped-features/class-shadowing-spec.md +++ b/docs/docs/reference/dropped-features/class-shadowing-spec.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Dropped: Class Shadowing - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/class-shadowing-spec.html --- Spec diff: in section [5.1.4 Overriding](https://www.scala-lang.org/files/archive/spec/2.13/05-classes-and-objects.html#Overriding), add *M' must not be a class*. diff --git a/docs/docs/reference/dropped-features/class-shadowing.md b/docs/docs/reference/dropped-features/class-shadowing.md index 50101bf1d0b4..839b40253169 100644 --- a/docs/docs/reference/dropped-features/class-shadowing.md +++ b/docs/docs/reference/dropped-features/class-shadowing.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Class Shadowing" -type: section -num: 80 -previous-page: /scala3/reference/dropped-features/early-initializers -next-page: /scala3/reference/dropped-features/limit22 +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/class-shadowing.html --- Scala 2 so far allowed patterns like this: @@ -32,4 +30,4 @@ other, but classes in Scala 2 cannot be overridden. To keep things clean (and its internal operations consistent) the Scala 3 compiler forces you to rename the inner classes so that their names are different. -[More details](./class-shadowing-spec.html) +[More details](./class-shadowing-spec.md) diff --git a/docs/docs/reference/dropped-features/delayed-init.md b/docs/docs/reference/dropped-features/delayed-init.md index f0b65a242c1a..875ccec5132e 100644 --- a/docs/docs/reference/dropped-features/delayed-init.md +++ b/docs/docs/reference/dropped-features/delayed-init.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: DelayedInit" -type: section -num: 72 -previous-page: /scala3/reference/dropped-features -next-page: /scala3/reference/dropped-features/macros +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/delayed-init.html --- The special handling of the `DelayedInit` trait is no longer supported. @@ -29,4 +27,4 @@ object Hello: ``` On the other hand, Scala 3 offers a convenient alternative to such "program" objects -with [`@main` methods](../changed-features/main-functions.html). +with [`@main` methods](../changed-features/main-functions.md). diff --git a/docs/docs/reference/dropped-features/do-while.md b/docs/docs/reference/dropped-features/do-while.md index 7bc3b73e0091..5f5ca5feeea2 100644 --- a/docs/docs/reference/dropped-features/do-while.md +++ b/docs/docs/reference/dropped-features/do-while.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Do-While" -type: section -num: 76 -previous-page: /scala3/reference/dropped-features/type-projection -next-page: /scala3/reference/dropped-features/procedure-syntax +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/do-while.html --- The syntax construct @@ -40,4 +38,4 @@ do print(".") ### Why Drop The Construct? - `do-while` is used relatively rarely and it can be expressed faithfully using just `while`. So there seems to be little point in having it as a separate syntax construct. - - Under the [new syntax rules](../other-new-features/control-syntax.html) `do` is used as a statement continuation, which would clash with its meaning as a statement introduction. + - Under the [new syntax rules](../other-new-features/control-syntax.md) `do` is used as a statement continuation, which would clash with its meaning as a statement introduction. diff --git a/docs/docs/reference/dropped-features/early-initializers.md b/docs/docs/reference/dropped-features/early-initializers.md index 234de159c30c..cb2ffea94376 100644 --- a/docs/docs/reference/dropped-features/early-initializers.md +++ b/docs/docs/reference/dropped-features/early-initializers.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Early Initializers" -type: section -num: 79 -previous-page: /scala3/reference/dropped-features/package-objects -next-page: /scala3/reference/dropped-features/class-shadowing +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/early-initializers.html --- Early initializers of the form @@ -13,6 +11,6 @@ class C extends { ... } with SuperClass ... ``` have been dropped. They were rarely used, and mostly to compensate for the lack of -[trait parameters](../other-new-features/trait-parameters.html), which are now directly supported in Scala 3. +[trait parameters](../other-new-features/trait-parameters.md), which are now directly supported in Scala 3. For more information, see [SLS §5.1.6](https://www.scala-lang.org/files/archive/spec/2.13/05-classes-and-objects.html#early-definitions). diff --git a/docs/docs/reference/dropped-features/existential-types.md b/docs/docs/reference/dropped-features/existential-types.md index ea176659fd77..4d7d9e2f8c10 100644 --- a/docs/docs/reference/dropped-features/existential-types.md +++ b/docs/docs/reference/dropped-features/existential-types.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Existential Types" -type: section -num: 74 -previous-page: /scala3/reference/dropped-features/macros -next-page: /scala3/reference/dropped-features/type-projection +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/existential-types.html --- Existential types using `forSome` (as in diff --git a/docs/docs/reference/dropped-features/limit22.md b/docs/docs/reference/dropped-features/limit22.md index 1c2bb0e2882a..514120fd2ce9 100644 --- a/docs/docs/reference/dropped-features/limit22.md +++ b/docs/docs/reference/dropped-features/limit22.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Limit 22" -type: section -num: 81 -previous-page: /scala3/reference/dropped-features/class-shadowing -next-page: /scala3/reference/dropped-features/xml +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/limit22.html --- The limits of 22 for the maximal number of parameters of function types and the @@ -13,7 +11,7 @@ maximal number of fields in tuple types have been dropped. [`scala.Function22`](https://www.scala-lang.org/api/current/scala/Function22.html) are erased to a new trait [`scala.runtime.FunctionXXL`](https://scala-lang.org/api/3.x/scala/runtime/FunctionXXL.html). * Tuples can also have an arbitrary number of fields. Tuples beyond [`scala.Tuple22`](https://www.scala-lang.org/api/current/scala/Tuple22.html) - are erased to a new class [`scala.runtime.TupleXXL`](https://scala-lang.org/api/3.x/scala/runtime/TupleXXL.html) (which extends the trait [`scala.Product`](https://scala-lang.org/api/3.x/scala/Product.html)). Furthermore, they support generic + are erased to a new class [`scala.runtime.TupleXXL`](https://scala-lang.org/api/3.x/scala/runtime/TupleXXL.html) (which extends the trait [`scala.Product`](https://scala-lang.org/api/3.x/scala/Product.md)). Furthermore, they support generic operation such as concatenation and indexing. Both of these are implemented using arrays. diff --git a/docs/docs/reference/dropped-features/macros.md b/docs/docs/reference/dropped-features/macros.md index 8208e8ee630c..e71bf120fe13 100644 --- a/docs/docs/reference/dropped-features/macros.md +++ b/docs/docs/reference/dropped-features/macros.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Scala 2 Macros" -type: section -num: 73 -previous-page: /scala3/reference/dropped-features/delayed-init -next-page: /scala3/reference/dropped-features/existential-types +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/macros.html --- The previous, experimental macro system has been dropped. @@ -13,6 +11,6 @@ Instead, there is a cleaner, more restricted system based on two complementary c In this setting, a definition marked as inlined containing a `${ ... }` is a macro, the code inside the `${ ... }` is executed at compile-time and produces code in the form of `'{ ... }`. Additionally, the contents of code can be inspected and created with a more complex reflection API as an extension of `'{ ... }`/`${ ... }` framework. -* `inline` has been [implemented](../metaprogramming/inline.html) in Scala 3. -* Quotes `'{ ... }` and splices `${ ... }` has been [implemented](../metaprogramming/macros.html) in Scala 3. -* [TASTy reflect](../metaprogramming/reflection.html) provides more complex tree based APIs to inspect or create quoted code. +* `inline` has been [implemented](../metaprogramming/inline.md) in Scala 3. +* Quotes `'{ ... }` and splices `${ ... }` has been [implemented](../metaprogramming/macros.md) in Scala 3. +* [TASTy reflect](../metaprogramming/reflection.md) provides more complex tree based APIs to inspect or create quoted code. diff --git a/docs/docs/reference/dropped-features/nonlocal-returns.md b/docs/docs/reference/dropped-features/nonlocal-returns.md index 89b244f122b4..99cdcdf0cd03 100644 --- a/docs/docs/reference/dropped-features/nonlocal-returns.md +++ b/docs/docs/reference/dropped-features/nonlocal-returns.md @@ -1,7 +1,8 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Deprecated: Nonlocal Returns" + +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/nonlocal-returns.html --- Returning from nested anonymous functions has been deprecated. diff --git a/docs/docs/reference/dropped-features/package-objects.md b/docs/docs/reference/dropped-features/package-objects.md index 12004c37dea3..e98c6c787a89 100644 --- a/docs/docs/reference/dropped-features/package-objects.md +++ b/docs/docs/reference/dropped-features/package-objects.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Package Objects" -type: section -num: 78 -previous-page: /scala3/reference/dropped-features/procedure-syntax -next-page: /scala3/reference/dropped-features/early-initializers +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/package-objects.html --- Package objects diff --git a/docs/docs/reference/dropped-features/procedure-syntax.md b/docs/docs/reference/dropped-features/procedure-syntax.md index d7a33cf374f8..cc82636d370d 100644 --- a/docs/docs/reference/dropped-features/procedure-syntax.md +++ b/docs/docs/reference/dropped-features/procedure-syntax.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Procedure Syntax" -type: section -num: 77 -previous-page: /scala3/reference/dropped-features/do-while -next-page: /scala3/reference/dropped-features/package-objects +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/procedure-syntax.html --- Procedure syntax diff --git a/docs/docs/reference/dropped-features/symlits.md b/docs/docs/reference/dropped-features/symlits.md index 1c71608f40fa..33c3e6ee0c39 100644 --- a/docs/docs/reference/dropped-features/symlits.md +++ b/docs/docs/reference/dropped-features/symlits.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Symbol Literals" -type: section -num: 83 -previous-page: /scala3/reference/dropped-features/xml -next-page: /scala3/reference/dropped-features/auto-apply +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/symlits.html --- Symbol literals are no longer supported. diff --git a/docs/docs/reference/dropped-features/this-qualifier.md b/docs/docs/reference/dropped-features/this-qualifier.md index baec0ae454f6..e1814e1d194e 100644 --- a/docs/docs/reference/dropped-features/this-qualifier.md +++ b/docs/docs/reference/dropped-features/this-qualifier.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: private[this] and protected[this]" -type: section -num: 86 -previous-page: /scala3/reference/dropped-features/weak-conformance -next-page: /scala3/reference/dropped-features/wildcard-init +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/this-qualifier.html --- The `private[this]` and `protected[this]` access modifiers are deprecated and will be phased out. @@ -33,5 +31,3 @@ This can cause problems if a program tries to access the missing private field v ``` - - diff --git a/docs/docs/reference/dropped-features/type-projection.md b/docs/docs/reference/dropped-features/type-projection.md index f2d2f215ed21..f45eff5c423f 100644 --- a/docs/docs/reference/dropped-features/type-projection.md +++ b/docs/docs/reference/dropped-features/type-projection.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: General Type Projection" -type: section -num: 75 -previous-page: /scala3/reference/dropped-features/existential-types -next-page: /scala3/reference/dropped-features/do-while +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/type-projection.html --- Scala so far allowed general type projection `T#A` where `T` is an arbitrary type diff --git a/docs/docs/reference/dropped-features/weak-conformance-spec.md b/docs/docs/reference/dropped-features/weak-conformance-spec.md index 147298f5573a..1432782a8e38 100644 --- a/docs/docs/reference/dropped-features/weak-conformance-spec.md +++ b/docs/docs/reference/dropped-features/weak-conformance-spec.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Dropped: Weak Conformance - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/weak-conformance-spec.html --- To simplify the underlying type theory, Scala 3 drops the notion of diff --git a/docs/docs/reference/dropped-features/weak-conformance.md b/docs/docs/reference/dropped-features/weak-conformance.md index 1b6db185fad8..c2dabe39e7c7 100644 --- a/docs/docs/reference/dropped-features/weak-conformance.md +++ b/docs/docs/reference/dropped-features/weak-conformance.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Weak Conformance" -type: section -num: 85 -previous-page: /scala3/reference/dropped-features/auto-apply -next-page: /scala3/reference/dropped-features/this-qualifier +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/weak-conformance.html --- In some situations, Scala used a _weak conformance_ relation when @@ -46,4 +44,4 @@ Therefore, Scala 3 drops the general notion of weak conformance, and instead keeps one rule: `Int` literals are adapted to other numeric types if necessary. -[More details](weak-conformance-spec.html) +[More details](weak-conformance-spec.md) diff --git a/docs/docs/reference/dropped-features/wildcard-init.md b/docs/docs/reference/dropped-features/wildcard-init.md index 078ec138b3bb..c4b89674b11d 100644 --- a/docs/docs/reference/dropped-features/wildcard-init.md +++ b/docs/docs/reference/dropped-features/wildcard-init.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: Wildcard Initializer" -type: section -num: 87 -previous-page: /scala3/reference/dropped-features/this-qualifier -next-page: /scala3/reference/syntax +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/wildcard-init.html --- The syntax diff --git a/docs/docs/reference/dropped-features/xml.md b/docs/docs/reference/dropped-features/xml.md index c094408909f4..9de06ca30f2e 100644 --- a/docs/docs/reference/dropped-features/xml.md +++ b/docs/docs/reference/dropped-features/xml.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dropped: XML Literals" -type: section -num: 82 -previous-page: /scala3/reference/dropped-features/limit22 -next-page: /scala3/reference/dropped-features/symlits +movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/xml.html --- XML Literals are still supported, but will be dropped in the near future, to diff --git a/docs/docs/reference/enums.md b/docs/docs/reference/enums.md index e8c63c237704..794c0130c9ec 100644 --- a/docs/docs/reference/enums.md +++ b/docs/docs/reference/enums.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Enums" -type: chapter -num: 9 -previous-page: /scala3/reference/new-types/polymorphic-function-types -next-page: /scala3/reference/enums/enums +movedTo: https://docs.scala-lang.org/scala3/reference/enums.html --- This chapter documents enums in Scala 3. diff --git a/docs/docs/reference/enums/adts.md b/docs/docs/reference/enums/adts.md index 10558707b543..6fc5be78d7b8 100644 --- a/docs/docs/reference/enums/adts.md +++ b/docs/docs/reference/enums/adts.md @@ -1,12 +1,10 @@ --- +layout: doc-page title: "Algebraic Data Types" -type: section -num: 11 -previous-page: /scala3/reference/enums/enums -next-page: /scala3/reference/enums/desugarEnums +movedTo: https://docs.scala-lang.org/scala3/reference/enums/adts.html --- -The [`enum` concept](./enums.html) is general enough to also support algebraic data +The [`enum` concept](./enums.md) is general enough to also support algebraic data types (ADTs) and their generalized version (GADTs). Here is an example how an `Option` type can be represented as an ADT: @@ -152,7 +150,7 @@ enum View[-T, +U] extends (T => U): ### Syntax of Enums Changes to the syntax fall in two categories: enum definitions and cases inside enums. -The changes are specified below as deltas with respect to the Scala syntax given [here](../syntax.html) +The changes are specified below as deltas with respect to the Scala syntax given [here](../syntax.md) 1. Enum definitions are defined as follows: diff --git a/docs/docs/reference/enums/desugarEnums.md b/docs/docs/reference/enums/desugarEnums.md index efcc41d5b2f6..95df1a7513ce 100644 --- a/docs/docs/reference/enums/desugarEnums.md +++ b/docs/docs/reference/enums/desugarEnums.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Translation of Enums and ADTs" -type: section -num: 12 -previous-page: /scala3/reference/enums/adts -next-page: /scala3/reference/contextual +movedTo: https://docs.scala-lang.org/scala3/reference/enums/desugarEnums.html --- The compiler expands enums and their cases to code that only uses @@ -157,7 +155,7 @@ map into `case class`es or `val`s. case C(ps) extends P1, ..., Pn ``` are treated specially. A call `C(ts)` of the apply method is ascribed the underlying type - `P1 & ... & Pn` (dropping any [transparent traits](../other-new-features/transparent-traits.html)) + `P1 & ... & Pn` (dropping any [transparent traits](../other-new-features/transparent-traits.md)) as long as that type is still compatible with the expected type at the point of application. A call `t.copy(ts)` of `C`'s `copy` method is treated in the same way. diff --git a/docs/docs/reference/enums/enums.md b/docs/docs/reference/enums/enums.md index 96d11e874212..e68f54fa0dd1 100644 --- a/docs/docs/reference/enums/enums.md +++ b/docs/docs/reference/enums/enums.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Enumerations" -type: section -num: 10 -previous-page: /scala3/reference/enums -next-page: /scala3/reference/enums/adts +movedTo: https://docs.scala-lang.org/scala3/reference/enums/enums.html --- An enumeration is used to define a type consisting of a set of named values. @@ -133,7 +131,7 @@ object Planet { } ``` -We could imagine that a library may use [type class derivation](../contextual/derivation.html) to automatically provide an instance for `Deprecations`. +We could imagine that a library may use [type class derivation](../contextual/derivation.md) to automatically provide an instance for `Deprecations`. ### Compatibility with Java Enums diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md index df92676831d2..1d89b0d73583 100644 --- a/docs/docs/reference/experimental/canthrow.md +++ b/docs/docs/reference/experimental/canthrow.md @@ -1,8 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "CanThrow Abilities" -author: Martin Odersky +movedTo: https://docs.scala-lang.org/scala3/reference/experimental/canthrow.html --- This page describes experimental support for exception checking in Scala 3. It is enabled by the language import @@ -276,4 +275,3 @@ And it would have many other applications besides: Exceptions are a special case But even without these additional mechanisms, exception checking is already useful as it is. It gives a clear path forward to make code that uses exceptions safer, better documented, and easier to refactor. The only loophole arises for scoped capabilities - here we have to verify manually that these capabilities do not escape. Specifically, a `try` always has to be placed in the same computation stage as the throws that it enables. Put another way: If the status quo is 0% static checking since 100% is too painful, then an alternative that gives you 95% static checking with great ergonomics looks like a win. And we might still get to 100% in the future. - diff --git a/docs/docs/reference/experimental/erased-defs-spec.md b/docs/docs/reference/experimental/erased-defs-spec.md index 7905e4776fed..dc7922ddb10f 100644 --- a/docs/docs/reference/experimental/erased-defs-spec.md +++ b/docs/docs/reference/experimental/erased-defs-spec.md @@ -1,7 +1,8 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Erased Definitions: More Details" + +movedTo: https://docs.scala-lang.org/scala3/reference/experimental/erased-defs-spec.html --- TODO: complete @@ -62,4 +63,3 @@ TODO: complete 7. Overriding * Member definitions overriding each other must both be `erased` or not be `erased` * `def foo(x: T): U` cannot be overridden by `def foo(erased x: T): U` and vice-versa - diff --git a/docs/docs/reference/experimental/erased-defs.md b/docs/docs/reference/experimental/erased-defs.md index 47d25583b34c..4eb02b7b1de1 100644 --- a/docs/docs/reference/experimental/erased-defs.md +++ b/docs/docs/reference/experimental/erased-defs.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Erased Definitions" +movedTo: https://docs.scala-lang.org/scala3/reference/experimental/erased-defs.html --- `erased` is a modifier that expresses that some definition or expression is erased by the compiler instead of being represented in the compiled output. It is not yet part of the Scala language standard. To enable `erased`, turn on the language feature @@ -161,7 +161,7 @@ object Machine: // State must be Off ``` -Note that in [Inline](../metaprogramming/inline.html) we discussed `erasedValue` and inline +Note that in [Inline](../metaprogramming/inline.md) we discussed `erasedValue` and inline matches. `erasedValue` is implemented with `erased`, so the state machine above can be encoded as follows: @@ -228,4 +228,4 @@ val err: Any = CanRead() // error: illegal reference to erased class CanRead ``` Here, the type of `err` is `Any`, so `err` is not considered erased. Yet its initializing value is a reference to the erased class `CanRead`. -[More Details](./erased-defs-spec.html) +[More Details](./erased-defs-spec.md) diff --git a/docs/docs/reference/experimental/named-typeargs-spec.md b/docs/docs/reference/experimental/named-typeargs-spec.md index ddd808559825..e12743fe4656 100644 --- a/docs/docs/reference/experimental/named-typeargs-spec.md +++ b/docs/docs/reference/experimental/named-typeargs-spec.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Named Type Arguments - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/experimental/named-typeargs-spec.html --- ## Syntax diff --git a/docs/docs/reference/experimental/named-typeargs.md b/docs/docs/reference/experimental/named-typeargs.md index 5e80a755293c..b9b4f7f33d69 100644 --- a/docs/docs/reference/experimental/named-typeargs.md +++ b/docs/docs/reference/experimental/named-typeargs.md @@ -1,8 +1,8 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Named Type Arguments" redirectFrom: reference/other-new-features/named-typeargs.html +movedTo: https://docs.scala-lang.org/scala3/reference/experimental/named-typeargs.html --- **Note:** This feature is implemented in Scala 3, but is not expected to be part of Scala 3.0. diff --git a/docs/docs/reference/experimental/numeric-literals.md b/docs/docs/reference/experimental/numeric-literals.md index da4a267784d1..40383787a2d0 100644 --- a/docs/docs/reference/experimental/numeric-literals.md +++ b/docs/docs/reference/experimental/numeric-literals.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Numeric Literals" +movedTo: https://docs.scala-lang.org/scala3/reference/experimental/numeric-literals.html --- **Note**: This feature is not yet part of the Scala 3 language definition. It can be made available by a language import: diff --git a/docs/docs/reference/experimental/overview.md b/docs/docs/reference/experimental/overview.md index a1dbde49f1cb..fdd44832fd8f 100644 --- a/docs/docs/reference/experimental/overview.md +++ b/docs/docs/reference/experimental/overview.md @@ -1,8 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Experimental language features" -author: Nicolas Stucki +movedTo: https://docs.scala-lang.org/scala3/reference/experimental/overview.html --- ### Experimental language features diff --git a/docs/docs/reference/features-classification.md b/docs/docs/reference/features-classification.md index 528b2ffccd70..21da1dfc065a 100644 --- a/docs/docs/reference/features-classification.md +++ b/docs/docs/reference/features-classification.md @@ -1,9 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "A Classification of Proposed Language Features" -date: April 6, 2019 -author: Martin Odersky +movedTo: https://docs.scala-lang.org/scala3/reference/features-classification.html --- This document provides an overview of the constructs proposed for Scala 3 with the aim to facilitate the discussion what to include and when to include it. It classifies features into eight groups: (1) essential foundations, (2) simplifications, (3) restrictions, (4) dropped features, (5) changed features, (6) new features, (7) features oriented towards metaprogramming with the aim to replace existing macros, and (8) changes to type checking and inference. @@ -17,11 +15,11 @@ The current document reflects the state of things as of April, 2019. It will be These new constructs directly model core features of [DOT](https://www.scala-lang.org/blog/2016/02/03/essence-of-scala.html), higher-kinded types, and the [SI calculus for implicit resolution](https://infoscience.epfl.ch/record/229878/files/simplicitly_1.pdf). - - [Intersection types](new-types/intersection-types.html), replacing compound types, - - [Union types](new-types/union-types.html), - - [Type lambdas](new-types/type-lambdas.html), + - [Intersection types](new-types/intersection-types.md), replacing compound types, + - [Union types](new-types/union-types.md), + - [Type lambdas](new-types/type-lambdas.md), replacing encodings using structural types and type projection. - - [Context functions](contextual/context-functions.html) offering abstraction over given parameters. + - [Context functions](contextual/context-functions.md) offering abstraction over given parameters. **Status: essential** @@ -35,19 +33,19 @@ Since these are additions, there's generally no migration cost for old code. An These constructs replace existing constructs with the aim of making the language safer and simpler to use, and to promote uniformity in code style. - - [Trait parameters](other-new-features/trait-parameters.html) replace [early initializers](dropped-features/early-initializers.html) with a more generally useful construct. - - [Given instances](contextual/givens.html) + - [Trait parameters](other-new-features/trait-parameters.md) replace [early initializers](dropped-features/early-initializers.md) with a more generally useful construct. + - [Given instances](contextual/givens.md) replace implicit objects and defs, focussing on intent over mechanism. - - [Using clauses](contextual/using-clauses.html) replace implicit parameters, avoiding their ambiguities. - - [Extension methods](contextual/extension-methods.html) replace implicit classes with a clearer and simpler mechanism. - - [Opaque type aliases](other-new-features/opaques.html) replace most uses + - [Using clauses](contextual/using-clauses.md) replace implicit parameters, avoiding their ambiguities. + - [Extension methods](contextual/extension-methods.md) replace implicit classes with a clearer and simpler mechanism. + - [Opaque type aliases](other-new-features/opaques.md) replace most uses of value classes while guaranteeing absence of boxing. - - [Top-level definitions](dropped-features/package-objects.html) replace package objects, dropping syntactic boilerplate. - - [Export clauses](other-new-features/export.html) + - [Top-level definitions](dropped-features/package-objects.md) replace package objects, dropping syntactic boilerplate. + - [Export clauses](other-new-features/export.md) provide a simple and general way to express aggregation, which can replace the previous facade pattern of package objects inheriting from classes. - - [Vararg splices](changed-features/vararg-splices.html) now use the form `*` instead of `@ _*`, mirroring vararg expressions, - - [Creator applications](other-new-features/creator-applications.html) allow using simple function call syntax + - [Vararg splices](changed-features/vararg-splices.md) now use the form `*` instead of `@ _*`, mirroring vararg expressions, + - [Creator applications](other-new-features/creator-applications.md) allow using simple function call syntax instead of `new` expressions. `new` expressions stay around as a fallback for the cases where creator applications cannot be used. @@ -70,10 +68,10 @@ For the next several versions, old features will remain available and deprecatio These constructs are restricted to make the language safer. - - [Implicit Conversions](contextual/conversions.html): there is only one way to define implicit conversions instead of many, and potentially surprising implicit conversions require a language import. - - [Given Imports](contextual/given-imports.html): implicits now require a special form of import, to make the import clearly visible. - - [Type Projection](dropped-features/type-projection.html): only classes can be used as prefix `C` of a type projection `C#A`. Type projection on abstract types is no longer supported since it is unsound. - - [Multiversal equality](contextual/multiversal-equality.html) implements an "opt-in" scheme to rule out nonsensical comparisons with `==` and `!=`. + - [Implicit Conversions](contextual/conversions.md): there is only one way to define implicit conversions instead of many, and potentially surprising implicit conversions require a language import. + - [Given Imports](contextual/given-imports.md): implicits now require a special form of import, to make the import clearly visible. + - [Type Projection](dropped-features/type-projection.md): only classes can be used as prefix `C` of a type projection `C#A`. Type projection on abstract types is no longer supported since it is unsound. + - [Multiversal equality](contextual/multiversal-equality.md) implements an "opt-in" scheme to rule out nonsensical comparisons with `==` and `!=`. - [infix](https://github.com/lampepfl/dotty/pull/5975) makes method application syntax uniform across code bases. @@ -93,15 +91,15 @@ These are essential restrictions. If we decide to adopt them, we should do it fo These constructs are proposed to be dropped without a new construct replacing them. The motivation for dropping these constructs is to simplify the language and its implementation. - - [DelayedInit](dropped-features/delayed-init.html), - - [Existential types](dropped-features/existential-types.html), - - [Procedure syntax](dropped-features/procedure-syntax.html), - - [Class shadowing](dropped-features/class-shadowing.html), - - [XML literals](dropped-features/xml.html), - - [Symbol literals](dropped-features/symlits.html), - - [Auto application](dropped-features/auto-apply.html), - - [Weak conformance](dropped-features/weak-conformance.html), - - [Compound types](new-types/intersection-types.html), + - [DelayedInit](dropped-features/delayed-init.md), + - [Existential types](dropped-features/existential-types.md), + - [Procedure syntax](dropped-features/procedure-syntax.md), + - [Class shadowing](dropped-features/class-shadowing.md), + - [XML literals](dropped-features/xml.md), + - [Symbol literals](dropped-features/symlits.md), + - [Auto application](dropped-features/auto-apply.md), + - [Weak conformance](dropped-features/weak-conformance.md), + - [Compound types](new-types/intersection-types.md), - [Auto tupling](https://github.com/lampepfl/dotty/pull/4311) (implemented, but not merged). The date when these constructs are dropped varies. The current status is: @@ -128,10 +126,10 @@ and sometimes need to be manual (e.g. class shadowing, auto tupling). Sometimes These constructs have undergone changes to make them more regular and useful. - - [Structural Types](changed-features/structural-types.html): They now allow pluggable implementations, which greatly increases their usefulness. Some usage patterns are restricted compared to the status quo. - - [Name-based pattern matching](changed-features/pattern-matching.html): The existing undocumented Scala 2 implementation has been codified in a slightly simplified form. - - [Eta expansion](changed-features/eta-expansion.html) is now performed universally also in the absence of an expected type. The postfix `_` operator is thus made redundant. It will be deprecated and dropped after Scala 3.0. - - [Implicit Resolution](changed-features/implicit-resolution.html): The implicit resolution rules have been cleaned up to make them more useful and less surprising. Implicit scope is restricted to no longer include package prefixes. + - [Structural Types](changed-features/structural-types.md): They now allow pluggable implementations, which greatly increases their usefulness. Some usage patterns are restricted compared to the status quo. + - [Name-based pattern matching](changed-features/pattern-matching.md): The existing undocumented Scala 2 implementation has been codified in a slightly simplified form. + - [Eta expansion](changed-features/eta-expansion.md) is now performed universally also in the absence of an expected type. The postfix `_` operator is thus made redundant. It will be deprecated and dropped after Scala 3.0. + - [Implicit Resolution](changed-features/implicit-resolution.md): The implicit resolution rules have been cleaned up to make them more useful and less surprising. Implicit scope is restricted to no longer include package prefixes. Most aspects of old-style implicit resolution are still available under `-source 3.0-migration`. The other changes in this list are applied unconditionally. @@ -147,11 +145,11 @@ Only a few programs should require changes, but some necessary changes might be These are additions to the language that make it more powerful or pleasant to use. - - [Enums](enums/enums.html) provide concise syntax for enumerations and [algebraic data types](enums/adts.html). - - [Parameter untupling](other-new-features/parameter-untupling.html) avoids having to use `case` for tupled parameter destructuring. - - [Dependent function types](new-types/dependent-function-types.html) generalize dependent methods to dependent function values and types. + - [Enums](enums/enums.md) provide concise syntax for enumerations and [algebraic data types](enums/adts.md). + - [Parameter untupling](other-new-features/parameter-untupling.md) avoids having to use `case` for tupled parameter destructuring. + - [Dependent function types](new-types/dependent-function-types.md) generalize dependent methods to dependent function values and types. - [Polymorphic function types](https://github.com/lampepfl/dotty/pull/4672) generalize polymorphic methods to dependent function values and types. _Current status_: There is a proposal, and a prototype implementation, but the implementation has not been finalized or merged yet. - - [Kind polymorphism](other-new-features/kind-polymorphism.html) allows the definition of operators working equally on types and type constructors. + - [Kind polymorphism](other-new-features/kind-polymorphism.md) allows the definition of operators working equally on types and type constructors. **Status: mixed** @@ -169,12 +167,12 @@ It's worth noting that macros were never included in the [Scala 2 language speci To enable porting most uses of macros, we are experimenting with the advanced language constructs listed below. These designs are more provisional than the rest of the proposed language constructs for Scala 3.0. There might still be some changes until the final release. Stabilizing the feature set needed for metaprogramming is our first priority. -- [Match types](new-types/match-types.html) allow computation on types. -- [Inline](metaprogramming/inline.html) provides +- [Match types](new-types/match-types.md) allow computation on types. +- [Inline](metaprogramming/inline.md) provides by itself a straightforward implementation of some simple macros and is at the same time an essential building block for the implementation of complex macros. -- [Quotes and splices](metaprogramming/macros.html) provide a principled way to express macros and staging with a unified set of abstractions. -- [Type class derivation](contextual/derivation.html) provides an in-language implementation of the `Gen` macro in Shapeless and other foundational libraries. The new implementation is more robust, efficient and easier to use than the macro. -- [Implicit by-name parameters](contextual/by-name-context-parameters.html) provide a more robust in-language implementation of the `Lazy` macro in Shapeless. +- [Quotes and splices](metaprogramming/macros.md) provide a principled way to express macros and staging with a unified set of abstractions. +- [Type class derivation](contextual/derivation.md) provides an in-language implementation of the `Gen` macro in Shapeless and other foundational libraries. The new implementation is more robust, efficient and easier to use than the macro. +- [Implicit by-name parameters](contextual/by-name-context-parameters.md) provide a more robust in-language implementation of the `Lazy` macro in Shapeless. **Status: not yet settled** diff --git a/docs/docs/reference/language-versions.md b/docs/docs/reference/language-versions.md index a17a567d7362..67659d1fe109 100644 --- a/docs/docs/reference/language-versions.md +++ b/docs/docs/reference/language-versions.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Language Versions" -type: chapter -description: This page lists the different flavours of language supported by the Scala 3 compiler. -num: 101 -previous-page: overview +movedTo: https://docs.scala-lang.org/scala3/reference/language-versions.html --- The default Scala language version currently supported by the Dotty compiler is `3.0`. There are also other language versions that can be specified instead: diff --git a/docs/docs/reference/metaprogramming.md b/docs/docs/reference/metaprogramming.md index 18664703a079..1d8fa83bae20 100644 --- a/docs/docs/reference/metaprogramming.md +++ b/docs/docs/reference/metaprogramming.md @@ -1,15 +1,13 @@ --- +layout: doc-page title: "Metaprogramming" -type: chapter -num: 27 -previous-page: /scala3/reference/contextual/relationship-implicits -next-page: /scala3/reference/metaprogramming/inline +movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming.html --- The following pages introduce the redesign of metaprogramming in Scala. They introduce the following fundamental facilities: -1. [`inline`](./metaprogramming/inline.html) is a new modifier that guarantees that +1. [`inline`](./metaprogramming/inline.md) is a new modifier that guarantees that a definition will be inlined at the point of use. The primary motivation behind inline is to reduce the overhead behind function calls and access to values. The expansion will be performed by the Scala compiler during the @@ -20,10 +18,10 @@ introduce the following fundamental facilities: programming), macros (enabling compile-time, generative, metaprogramming) and runtime code generation (multi-stage programming). -2. [Compile-time ops](./metaprogramming/compiletime-ops.html) are helper definitions in the +2. [Compile-time ops](./metaprogramming/compiletime-ops.md) are helper definitions in the standard library that provide support for compile-time operations over values and types. -3. [Macros](./metaprogramming/macros.html) are built on two well-known fundamental +3. [Macros](./metaprogramming/macros.md) are built on two well-known fundamental operations: quotation and splicing. Quotation converts program code to data, specifically, a (tree-like) representation of this code. It is expressed as `'{...}` for expressions and as `'[...]` for types. Splicing, @@ -31,19 +29,19 @@ introduce the following fundamental facilities: to program code. Together with `inline`, these two abstractions allow to construct program code programmatically. -4. [Runtime Staging](./metaprogramming/staging.html) Where macros construct code at _compile-time_, +4. [Runtime Staging](./metaprogramming/staging.md) Where macros construct code at _compile-time_, staging lets programs construct new code at _runtime_. That way, code generation can depend not only on static data but also on data available at runtime. This splits the evaluation of the program in two or more phases or ... stages. Consequently, this method of generative programming is called "Multi-Stage Programming". Staging is built on the same foundations as macros. It uses quotes and splices, but leaves out `inline`. -5. [Reflection](./metaprogramming/reflection.html) Quotations are a "black-box" +5. [Reflection](./metaprogramming/reflection.md) Quotations are a "black-box" representation of code. They can be parameterized and composed using splices, but their structure cannot be analyzed from the outside. TASTy reflection gives a way to analyze code structure by partly revealing the representation type of a piece of code in a standard API. The representation type is a form of typed abstract syntax tree, which gives rise to the `TASTy` moniker. -6. [TASTy Inspection](./metaprogramming/tasty-inspect.html) Typed abstract syntax trees are serialized +6. [TASTy Inspection](./metaprogramming/tasty-inspect.md) Typed abstract syntax trees are serialized in a custom compressed binary format stored in `.tasty` files. TASTy inspection allows to load these files and analyze their content's tree structure. diff --git a/docs/docs/reference/metaprogramming/compiletime-ops.md b/docs/docs/reference/metaprogramming/compiletime-ops.md index 9bf0bc537930..944cdac5389a 100644 --- a/docs/docs/reference/metaprogramming/compiletime-ops.md +++ b/docs/docs/reference/metaprogramming/compiletime-ops.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Compile-time operations" -type: section -num: 29 -previous-page: /scala3/reference/metaprogramming/inline -next-page: /scala3/reference/metaprogramming/macros +movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/compiletime-ops.html --- ## The `scala.compiletime` Package diff --git a/docs/docs/reference/metaprogramming/inline.md b/docs/docs/reference/metaprogramming/inline.md index 2e55b8e63cd0..8ccef49872b7 100644 --- a/docs/docs/reference/metaprogramming/inline.md +++ b/docs/docs/reference/metaprogramming/inline.md @@ -1,14 +1,12 @@ --- +layout: doc-page title: Inline -type: section -num: 28 -previous-page: /scala3/reference/metaprogramming -next-page: /scala3/reference/metaprogramming/compiletime-ops +movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/inline.html --- ## Inline Definitions -`inline` is a new [soft modifier](../soft-modifier.html) that guarantees that a +`inline` is a new [soft modifier](../soft-modifier.md) that guarantees that a definition will be inlined at the point of use. Example: ```scala diff --git a/docs/docs/reference/metaprogramming/macros-spec.md b/docs/docs/reference/metaprogramming/macros-spec.md index aa819c5ecb52..d152377e6d62 100644 --- a/docs/docs/reference/metaprogramming/macros-spec.md +++ b/docs/docs/reference/metaprogramming/macros-spec.md @@ -1,14 +1,14 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Macros Spec" +movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/macros-spec.html --- ## Implementation ### Syntax -Compared to the [Scala 3 reference grammar](../syntax.html) +Compared to the [Scala 3 reference grammar](../syntax.md) there are the following syntax changes: ``` SimpleExpr ::= ... @@ -159,7 +159,7 @@ environments and terms. Es |- 't: expr T ``` The meta theory of a slightly simplified 2-stage variant of this calculus -is studied [separately](./simple-smp.html). +is studied [separately](./simple-smp.md). ## Going Further diff --git a/docs/docs/reference/metaprogramming/macros.md b/docs/docs/reference/metaprogramming/macros.md index 9d70230c1356..e1267ea82a59 100644 --- a/docs/docs/reference/metaprogramming/macros.md +++ b/docs/docs/reference/metaprogramming/macros.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Macros" -type: section -num: 30 -previous-page: /scala3/reference/metaprogramming/compiletime-ops -next-page: /scala3/reference/metaprogramming/staging +movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/macros.html --- > When developing macros enable `-Xcheck-macros` scalac option flag to have extra runtime checks. @@ -505,7 +503,7 @@ and allow for undefined compiler behavior if they are not. This is analogous to the status of pattern guards in Scala, which are also required, but not verified, to be pure. -[Multi-Stage Programming](./staging.html) introduces one additional method where +[Multi-Stage Programming](./staging.md) introduces one additional method where you can expand code at runtime with a method `run`. There is also a problem with that invocation of `run` in splices. Consider the following expression: @@ -627,7 +625,7 @@ def setForExpr[T: Type](using Quotes): Expr[Set[T]] = ## Relationship with Transparent Inline -[Inline](./inline.html) documents inlining. The code below introduces a transparent +[Inline](./inline.md) documents inlining. The code below introduces a transparent inline method that can calculate either a value of type `Int` or a value of type `String`. @@ -822,4 +820,4 @@ To match an actual application we can use braces on the function part `${b}(a1, ## More details -[More details](./macros-spec.html) +[More details](./macros-spec.md) diff --git a/docs/docs/reference/metaprogramming/reflection.md b/docs/docs/reference/metaprogramming/reflection.md index a7c65cff680a..74bb4f693e1b 100644 --- a/docs/docs/reference/metaprogramming/reflection.md +++ b/docs/docs/reference/metaprogramming/reflection.md @@ -1,22 +1,20 @@ --- +layout: doc-page title: "Reflection" -type: section -num: 32 -previous-page: /scala3/reference/metaprogramming/staging -next-page: /scala3/reference/metaprogramming/tasty-inspect +movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/reflection.html --- Reflection enables inspection and construction of Typed Abstract Syntax Trees (Typed-AST). It may be used on quoted expressions (`quoted.Expr`) and quoted -types (`quoted.Type`) from [Macros](./macros.html) or on full TASTy files. +types (`quoted.Type`) from [Macros](./macros.md) or on full TASTy files. -If you are writing macros, please first read [Macros](./macros.html). +If you are writing macros, please first read [Macros](./macros.md). You may find all you need without using quote reflection. ## API: From quotes and splices to TASTy reflect trees and back With `quoted.Expr` and `quoted.Type` we can compute code but also analyze code -by inspecting the ASTs. [Macros](./macros.html) provide the guarantee that the +by inspecting the ASTs. [Macros](./macros.md) provide the guarantee that the generation of code will be type-correct. Using quote reflection will break these guarantees and may fail at macro expansion time, hence additional explicit checks must be done. diff --git a/docs/docs/reference/metaprogramming/simple-smp.md b/docs/docs/reference/metaprogramming/simple-smp.md index 6a7e2c0fbae1..78277987c874 100644 --- a/docs/docs/reference/metaprogramming/simple-smp.md +++ b/docs/docs/reference/metaprogramming/simple-smp.md @@ -1,11 +1,11 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "The Meta-theory of Symmetric Metaprogramming" +movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/simple-smp.html --- This note presents a simplified variant of -[principled metaprogramming](./macros.html) +[principled metaprogramming](./macros.md) and sketches its soundness proof. The variant treats only dialogues between two stages. A program can have quotes which can contain splices (which can contain quotes, which can contain splices, and so diff --git a/docs/docs/reference/metaprogramming/staging.md b/docs/docs/reference/metaprogramming/staging.md index 0e90966c85b2..2b76df3f5fd5 100644 --- a/docs/docs/reference/metaprogramming/staging.md +++ b/docs/docs/reference/metaprogramming/staging.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Runtime Multi-Stage Programming" -type: section -num: 31 -previous-page: /scala3/reference/metaprogramming/macros -next-page: /scala3/reference/metaprogramming/reflection +movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/staging.html --- The framework expresses at the same time compile-time metaprogramming and @@ -99,7 +97,7 @@ scala -with-compiler -classpath out Test ## Example -Now take exactly the same example as in [Macros](./macros.html). Assume that we +Now take exactly the same example as in [Macros](./macros.md). Assume that we do not want to pass an array statically but generate code at run-time and pass the value, also at run-time. Note, how we make a future-stage function of type `Expr[Array[Int] => Int]` in line 6 below. Using `staging.run { ... }` we can evaluate an diff --git a/docs/docs/reference/metaprogramming/tasty-inspect.md b/docs/docs/reference/metaprogramming/tasty-inspect.md index 32bc2efa4313..2ab2ce84c354 100644 --- a/docs/docs/reference/metaprogramming/tasty-inspect.md +++ b/docs/docs/reference/metaprogramming/tasty-inspect.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "TASTy Inspection" -type: section -num: 33 -previous-page: /scala3/reference/metaprogramming/reflection -next-page: /scala3/reference/other-new-features +movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming/tasty-inspect.html --- ```scala diff --git a/docs/docs/reference/new-types.md b/docs/docs/reference/new-types.md index 61368808406e..dd2d1036d2e6 100644 --- a/docs/docs/reference/new-types.md +++ b/docs/docs/reference/new-types.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "New Types" -type: chapter -num: 2 -previous-page: /scala3/reference/overview -next-page: /scala3/reference/new-types/intersection-types +movedTo: https://docs.scala-lang.org/scala3/reference/new-types.html --- This chapter documents the new types introduced in Scala 3. diff --git a/docs/docs/reference/new-types/dependent-function-types-spec.md b/docs/docs/reference/new-types/dependent-function-types-spec.md index 07a07b74287c..aeca72fbe302 100644 --- a/docs/docs/reference/new-types/dependent-function-types-spec.md +++ b/docs/docs/reference/new-types/dependent-function-types-spec.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Dependent Function Types - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/new-types/dependent-function-types-spec.html --- Initial implementation in [PR #3464](https://github.com/lampepfl/dotty/pull/3464). @@ -39,7 +39,7 @@ dependent function types for methods with dependent result types. Dependent functions can be implicit, and generalize to arity `N > 22` in the same way that other functions do, see -[the corresponding documentation](../dropped-features/limit22.html). +[the corresponding documentation](../dropped-features/limit22.md). ## Examples diff --git a/docs/docs/reference/new-types/dependent-function-types.md b/docs/docs/reference/new-types/dependent-function-types.md index ffa9012c4ad3..33f677276aac 100644 --- a/docs/docs/reference/new-types/dependent-function-types.md +++ b/docs/docs/reference/new-types/dependent-function-types.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Dependent Function Types" -type: section -num: 7 -previous-page: /scala3/reference/new-types/match-types -next-page: /scala3/reference/new-types/polymorphic-function-types +movedTo: https://docs.scala-lang.org/scala3/reference/new-types/dependent-function-types.html --- A dependent function type is a function type whose result depends @@ -48,4 +46,4 @@ Function1[Entry, Entry#Key]: def apply(e: Entry): e.Key ``` -[More details](./dependent-function-types-spec.html) +[More details](./dependent-function-types-spec.md) diff --git a/docs/docs/reference/new-types/intersection-types-spec.md b/docs/docs/reference/new-types/intersection-types-spec.md index aeceeac04868..4d236c37dcc3 100644 --- a/docs/docs/reference/new-types/intersection-types-spec.md +++ b/docs/docs/reference/new-types/intersection-types-spec.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Intersection Types - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/new-types/intersection-types-spec.html --- ## Syntax diff --git a/docs/docs/reference/new-types/intersection-types.md b/docs/docs/reference/new-types/intersection-types.md index e912ec699457..1854ce847896 100644 --- a/docs/docs/reference/new-types/intersection-types.md +++ b/docs/docs/reference/new-types/intersection-types.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: Intersection Types -type: section -num: 3 -previous-page: /scala3/reference/new-types -next-page: /scala3/reference/new-types/union-types +movedTo: https://docs.scala-lang.org/scala3/reference/new-types/intersection-types.html --- Used on types, the `&` operator creates an intersection type. @@ -67,4 +65,4 @@ class C extends A, B: ``` -[More details](./intersection-types-spec.html) +[More details](./intersection-types-spec.md) diff --git a/docs/docs/reference/new-types/match-types.md b/docs/docs/reference/new-types/match-types.md index 804545fbff61..a2a086f3819e 100644 --- a/docs/docs/reference/new-types/match-types.md +++ b/docs/docs/reference/new-types/match-types.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Match Types" -type: section -num: 6 -previous-page: /scala3/reference/new-types/type-lambdas -next-page: /scala3/reference/new-types/dependent-function-types +movedTo: https://docs.scala-lang.org/scala3/reference/new-types/match-types.html --- A match type reduces to one of its right-hand sides, depending on the type of diff --git a/docs/docs/reference/new-types/polymorphic-function-types.md b/docs/docs/reference/new-types/polymorphic-function-types.md index 58224ef0de43..2a803f5e65db 100644 --- a/docs/docs/reference/new-types/polymorphic-function-types.md +++ b/docs/docs/reference/new-types/polymorphic-function-types.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Polymorphic Function Types" -type: section -num: 8 -previous-page: /scala3/reference/new-types/dependent-function-types -next-page: /scala3/reference/enums +movedTo: https://docs.scala-lang.org/scala3/reference/new-types/polymorphic-function-types.html --- A polymorphic function type is a function type which accepts type parameters. @@ -83,7 +81,7 @@ println(e1) // Apply(Apply(Var(wrap),Var(f)),Apply(Var(wrap),Var(a))) ## Relationship With Type Lambdas Polymorphic function types are not to be confused with -[_type lambdas_](type-lambdas.html). +[_type lambdas_](type-lambdas.md). While the former describes the _type_ of a polymorphic _value_, the latter is an actual function value _at the type level_. diff --git a/docs/docs/reference/new-types/type-lambdas-spec.md b/docs/docs/reference/new-types/type-lambdas-spec.md index 06bd314512c4..09fb9c76d6cf 100644 --- a/docs/docs/reference/new-types/type-lambdas-spec.md +++ b/docs/docs/reference/new-types/type-lambdas-spec.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Type Lambdas - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/new-types/type-lambdas-spec.html --- ## Syntax @@ -105,7 +105,7 @@ would be treated as covariant, `X` is used covariantly on its right-hand side. **Note**: The decision to treat `Nothing` as universal bottom type is provisional, and might be changed after further discussion. -**Note**: Scala 2 and 3 differ in that Scala 2 also treats `Any` as universal top-type. This is not done in Scala 3. See also the discussion on [kind polymorphism](../other-new-features/kind-polymorphism.html) +**Note**: Scala 2 and 3 differ in that Scala 2 also treats `Any` as universal top-type. This is not done in Scala 3. See also the discussion on [kind polymorphism](../other-new-features/kind-polymorphism.md) ## Curried Type Parameters @@ -115,5 +115,3 @@ type TL = [X] =>> [Y] =>> (X, Y) ``` Currently, no special provision is made to infer type arguments to such curried type lambdas. This is left for future work. - - diff --git a/docs/docs/reference/new-types/type-lambdas.md b/docs/docs/reference/new-types/type-lambdas.md index 8b12fbcece57..8ede3f9305c7 100644 --- a/docs/docs/reference/new-types/type-lambdas.md +++ b/docs/docs/reference/new-types/type-lambdas.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Type Lambdas" -type: section -num: 5 -previous-page: /scala3/reference/new-types/union-types -next-page: /scala3/reference/new-types/match-types +movedTo: https://docs.scala-lang.org/scala3/reference/new-types/type-lambdas.html --- A _type lambda_ lets one express a higher-kinded type directly, without @@ -16,4 +14,4 @@ a type definition. For instance, the type above defines a binary type constructor, which maps arguments `X` and `Y` to `Map[Y, X]`. Type parameters of type lambdas can have bounds, but they cannot carry `+` or `-` variance annotations. -[More details](./type-lambdas-spec.html) +[More details](./type-lambdas-spec.md) diff --git a/docs/docs/reference/new-types/union-types-spec.md b/docs/docs/reference/new-types/union-types-spec.md index 9cfa27f619c3..042dedea6954 100644 --- a/docs/docs/reference/new-types/union-types-spec.md +++ b/docs/docs/reference/new-types/union-types-spec.md @@ -1,13 +1,13 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Union Types - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/new-types/union-types-spec.html --- ## Syntax Syntactically, unions follow the same rules as intersections, but have a lower precedence, see -[Intersection Types - More Details](./intersection-types-spec.html). +[Intersection Types - More Details](./intersection-types-spec.md). ### Interaction with pattern matching syntax `|` is also used in pattern matching to separate pattern alternatives and has @@ -140,7 +140,7 @@ On the other hand, the following would be allowed ```scala trait C { def hello: String } -trait A extends C with D +trait A extends C with D trait B extends C with E def test(x: A | B) = x.hello // ok as `hello` is a member of the join of A | B which is C diff --git a/docs/docs/reference/new-types/union-types.md b/docs/docs/reference/new-types/union-types.md index 7b2922fe3415..9c52cff3864d 100644 --- a/docs/docs/reference/new-types/union-types.md +++ b/docs/docs/reference/new-types/union-types.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Union Types" -type: section -num: 4 -previous-page: /scala3/reference/new-types/intersection-types -next-page: /scala3/reference/new-types/type-lambdas +movedTo: https://docs.scala-lang.org/scala3/reference/new-types/union-types.html --- A union type `A | B` has as values all values of type `A` and also all values of type `B`. @@ -45,4 +43,4 @@ The type of `res2` is `Object & Product`, which is a supertype of UserName`. If we want the least supertype, we have to give it explicitly, as is done for the type of `either`. -[More details](./union-types-spec.html) +[More details](./union-types-spec.md) diff --git a/docs/docs/reference/other-new-features.md b/docs/docs/reference/other-new-features.md index faa2aefc6a91..85e768833a71 100644 --- a/docs/docs/reference/other-new-features.md +++ b/docs/docs/reference/other-new-features.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Other New Features" -type: chapter -num: 34 -previous-page: /scala3/reference/metaprogramming/tasty-inspect -next-page: /scala3/reference/other-new-features/trait-parameters +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features.html --- The following pages document new features of Scala 3. diff --git a/docs/docs/reference/other-new-features/control-syntax.md b/docs/docs/reference/other-new-features/control-syntax.md index 0fefba262bf5..2f0bbde41331 100644 --- a/docs/docs/reference/other-new-features/control-syntax.md +++ b/docs/docs/reference/other-new-features/control-syntax.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: New Control Syntax -type: section -num: 46 -previous-page: /scala3/reference/other-new-features/targetName -next-page: /scala3/reference/other-new-features/indentation +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/control-syntax.html --- Scala 3 has a new "quiet" syntax for control expressions that does not rely on diff --git a/docs/docs/reference/other-new-features/creator-applications.md b/docs/docs/reference/other-new-features/creator-applications.md index 0422bbfac77c..17bc1574f763 100644 --- a/docs/docs/reference/other-new-features/creator-applications.md +++ b/docs/docs/reference/other-new-features/creator-applications.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Universal Apply Methods" -type: section -num: 37 -previous-page: /scala3/reference/other-new-features/transparent-traits -next-page: /scala3/reference/other-new-features/export +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/creator-applications.html --- Scala case classes generate apply methods, so that values of case classes can be created using simple diff --git a/docs/docs/reference/other-new-features/experimental-defs.md b/docs/docs/reference/other-new-features/experimental-defs.md index 5060ffb889d5..a5c0bff378cd 100644 --- a/docs/docs/reference/other-new-features/experimental-defs.md +++ b/docs/docs/reference/other-new-features/experimental-defs.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Experimental definitions" -type: section -num: 51 -previous-page: /scala3/reference/other-new-features/type-test -next-page: /scala3/reference/changed-features +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/experimental-defs.html --- diff --git a/docs/docs/reference/other-new-features/explicit-nulls.md b/docs/docs/reference/other-new-features/explicit-nulls.md index a0dac187ae60..c1afe6a4e067 100644 --- a/docs/docs/reference/other-new-features/explicit-nulls.md +++ b/docs/docs/reference/other-new-features/explicit-nulls.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Explicit Nulls" -type: section -num: 48 -previous-page: /scala3/reference/other-new-features/indentation -next-page: /scala3/reference/other-new-features/safe-initialization +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/explicit-nulls.html --- Explicit nulls is an opt-in feature that modifies the Scala type system, which makes reference types @@ -15,7 +13,7 @@ This means the following code will no longer typecheck: val x: String = null // error: found `Null`, but required `String` ``` -Instead, to mark a type as nullable we use a [union type](../new-types/union-types.html) +Instead, to mark a type as nullable we use a [union type](../new-types/union-types.md) ```scala val x: String | Null = null // ok @@ -38,7 +36,7 @@ When explicit nulls are enabled, the type hierarchy changes so that `Null` is on This is the new type hierarchy: -!["Type Hierarchy for Explicit Nulls"](/resources/images/scala3/explicit-nulls/explicit-nulls-type-hierarchy.png) +!["Type Hierarchy for Explicit Nulls"](images/explicit-nulls/explicit-nulls-type-hierarchy.png) After erasure, `Null` remains a subtype of all reference types (as forced by the JVM). @@ -83,7 +81,7 @@ val c = new C() ``` The unsoundness above can be caught by the compiler with the option `-Ysafe-init`. -More details can be found in [safe initialization](./safe-initialization.html). +More details can be found in [safe initialization](./safe-initialization.md). ## Equality diff --git a/docs/docs/reference/other-new-features/export.md b/docs/docs/reference/other-new-features/export.md index 49a190c4c923..d21f6ed6d4cb 100644 --- a/docs/docs/reference/other-new-features/export.md +++ b/docs/docs/reference/other-new-features/export.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Export Clauses" -type: section -num: 38 -previous-page: /scala3/reference/other-new-features/creator-applications -next-page: /scala3/reference/other-new-features/opaques +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/export.html --- An export clause defines aliases for selected members of an object. Example: diff --git a/docs/docs/reference/other-new-features/indentation-experimental.md b/docs/docs/reference/other-new-features/indentation-experimental.md index 389219d8e877..cbdd41eeaf12 100644 --- a/docs/docs/reference/other-new-features/indentation-experimental.md +++ b/docs/docs/reference/other-new-features/indentation-experimental.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Fewer Braces" +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/indentation-experimental.html --- By and large, the possible indentation regions coincide with those regions where braces `{...}` are also legal, no matter whether the braces enclose an expression or a set of definitions. There is one exception, though: Arguments to function can be enclosed in braces but they cannot be simply indented instead. Making indentation always significant for function arguments would be too restrictive and fragile. diff --git a/docs/docs/reference/other-new-features/indentation.md b/docs/docs/reference/other-new-features/indentation.md index 6a71e351f3c1..c7a6fdbb7453 100644 --- a/docs/docs/reference/other-new-features/indentation.md +++ b/docs/docs/reference/other-new-features/indentation.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Optional Braces" -type: section -num: 47 -previous-page: /scala3/reference/other-new-features/control-syntax -next-page: /scala3/reference/other-new-features/explicit-nulls +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/indentation.html --- Scala 3 enforces some rules on indentation and allows some occurrences of braces `{...}` to be optional: @@ -87,7 +85,7 @@ There are two rules: then else do catch finally yield match ``` - if the first token on the next line is a - [leading infix operator](../changed-features/operators.html). + [leading infix operator](../changed-features/operators.md). then its indentation width is less then the current indentation width, and it either matches a previous indentation width or is also less than the enclosing indentation width. @@ -411,7 +409,7 @@ Significant indentation is enabled by default. It can be turned off by giving an The Scala 3 compiler can rewrite source code to indented code and back. When invoked with options `-rewrite -indent` it will rewrite braces to indented regions where possible. When invoked with options `-rewrite -no-indent` it will rewrite in the reverse direction, inserting braces for indentation regions. -The `-indent` option only works on [new-style syntax](./control-syntax.html). So to go from old-style syntax to new-style indented code one has to invoke the compiler twice, first with options `-rewrite -new-syntax`, then again with options +The `-indent` option only works on [new-style syntax](./control-syntax.md). So to go from old-style syntax to new-style indented code one has to invoke the compiler twice, first with options `-rewrite -new-syntax`, then again with options `-rewrite -indent`. To go in the opposite direction, from indented code to old-style syntax, it's `-rewrite -no-indent`, followed by `-rewrite -old-syntax`. ### Variant: Indentation Marker `:` diff --git a/docs/docs/reference/other-new-features/kind-polymorphism.md b/docs/docs/reference/other-new-features/kind-polymorphism.md index 7e69bca4ea51..7dbcf3e96927 100644 --- a/docs/docs/reference/other-new-features/kind-polymorphism.md +++ b/docs/docs/reference/other-new-features/kind-polymorphism.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Kind Polymorphism" -type: section -num: 42 -previous-page: /scala3/reference/other-new-features/parameter-untupling -next-page: /scala3/reference/other-new-features/matchable +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/kind-polymorphism.html --- Normally type parameters in Scala are partitioned into _kinds_. First-level types are types of values. Higher-kinded types are type constructors diff --git a/docs/docs/reference/other-new-features/matchable.md b/docs/docs/reference/other-new-features/matchable.md index 12b33e63f17d..fdce97dab8f0 100644 --- a/docs/docs/reference/other-new-features/matchable.md +++ b/docs/docs/reference/other-new-features/matchable.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "The Matchable Trait" -type: section -num: 43 -previous-page: /scala3/reference/other-new-features/kind-polymorphism -next-page: /scala3/reference/other-new-features/threadUnsafe-annotation +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/matchable.html --- A new trait `Matchable` controls the ability to pattern match. @@ -134,7 +132,7 @@ Here, universal `equals` will return true for Meter(10).equals(Second(10)) ``` -even though this is clearly false mathematically. With [multiversal equality](../contextual/multiversal-equality.html) one can mitigate that problem somewhat by turning +even though this is clearly false mathematically. With [multiversal equality](../contextual/multiversal-equality.md) one can mitigate that problem somewhat by turning ```scala Meter(10) == Second(10) diff --git a/docs/docs/reference/other-new-features/opaques-details.md b/docs/docs/reference/other-new-features/opaques-details.md index b7891a86c081..ecfb78db48b7 100644 --- a/docs/docs/reference/other-new-features/opaques-details.md +++ b/docs/docs/reference/other-new-features/opaques-details.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Opaque Type Aliases: More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/opaques-details.html --- ### Syntax @@ -11,7 +11,7 @@ Modifier ::= ... | ‘opaque’ ``` -`opaque` is a [soft modifier](../soft-modifier.html). It can still be used as a normal identifier when it is not in front of a definition keyword. +`opaque` is a [soft modifier](../soft-modifier.md). It can still be used as a normal identifier when it is not in front of a definition keyword. Opaque type aliases must be members of classes, traits, or objects, or they are defined at the top-level. They cannot be defined in local blocks. diff --git a/docs/docs/reference/other-new-features/opaques.md b/docs/docs/reference/other-new-features/opaques.md index cb4cf635678b..402440bad90c 100644 --- a/docs/docs/reference/other-new-features/opaques.md +++ b/docs/docs/reference/other-new-features/opaques.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Opaque Type Aliases" -type: section -num: 39 -previous-page: /scala3/reference/other-new-features/export -next-page: /scala3/reference/other-new-features/open-classes +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/opaques.html --- Opaque types aliases provide type abstraction without any overhead. Example: @@ -166,4 +164,4 @@ l1.mul(x, z) // error: found l2.Logarithm, required l1.Logarithm ``` In general, one can think of an opaque type as being only transparent in the scope of `private[this]`. -[More details](opaques-details.html) +[More details](opaques-details.md) diff --git a/docs/docs/reference/other-new-features/open-classes.md b/docs/docs/reference/other-new-features/open-classes.md index 342faed61ad4..f1ddcf8c190f 100644 --- a/docs/docs/reference/other-new-features/open-classes.md +++ b/docs/docs/reference/other-new-features/open-classes.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Open Classes" -type: section -num: 40 -previous-page: /scala3/reference/other-new-features/opaques -next-page: /scala3/reference/other-new-features/parameter-untupling +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/open-classes.html --- An `open` modifier on a class signals that the class is planned for extensions. Example: diff --git a/docs/docs/reference/other-new-features/parameter-untupling-spec.md b/docs/docs/reference/other-new-features/parameter-untupling-spec.md index dbabf9d5d7d7..feedb77aa774 100644 --- a/docs/docs/reference/other-new-features/parameter-untupling-spec.md +++ b/docs/docs/reference/other-new-features/parameter-untupling-spec.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Parameter Untupling - More Details" +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/parameter-untupling-spec.html --- ## Motivation diff --git a/docs/docs/reference/other-new-features/parameter-untupling.md b/docs/docs/reference/other-new-features/parameter-untupling.md index de58f8c61fd0..1beed4968d4f 100644 --- a/docs/docs/reference/other-new-features/parameter-untupling.md +++ b/docs/docs/reference/other-new-features/parameter-untupling.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Parameter Untupling" -type: section -num: 41 -previous-page: /scala3/reference/other-new-features/open-classes -next-page: /scala3/reference/other-new-features/kind-polymorphism +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/parameter-untupling.html --- Say you have a list of pairs @@ -44,5 +42,5 @@ function type of the form `((T_1, ..., T_n)) => U`. For more information see: -* [More details](./parameter-untupling-spec.html) +* [More details](./parameter-untupling-spec.md) * [Issue #897](https://github.com/lampepfl/dotty/issues/897). diff --git a/docs/docs/reference/other-new-features/safe-initialization.md b/docs/docs/reference/other-new-features/safe-initialization.md index 7ecafb9a2888..e56c640dd26b 100644 --- a/docs/docs/reference/other-new-features/safe-initialization.md +++ b/docs/docs/reference/other-new-features/safe-initialization.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Safe Initialization" -type: section -num: 49 -previous-page: /scala3/reference/other-new-features/explicit-nulls -next-page: /scala3/reference/other-new-features/type-test +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/safe-initialization.html --- Scala 3 implements experimental safe initialization check, which can be enabled by the compiler option `-Ysafe-init`. @@ -221,7 +219,7 @@ superclass is defined in another project, the crossing of project boundary cannot be avoided for soundness of the analysis. Meanwhile, inheritance across project boundary has been under scrutiny and the -introduction of [open classes](./open-classes.html) mitigate the concern here. +introduction of [open classes](./open-classes.md) mitigate the concern here. For example, the initialization check could enforce that the constructors of open classes may not contain method calls on `this` or introduce annotations as a contract. diff --git a/docs/docs/reference/other-new-features/targetName.md b/docs/docs/reference/other-new-features/targetName.md index 377bd2db10b0..a83c4247c1ef 100644 --- a/docs/docs/reference/other-new-features/targetName.md +++ b/docs/docs/reference/other-new-features/targetName.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "The @targetName annotation" -type: section -num: 45 -previous-page: /scala3/reference/other-new-features/threadUnsafe-annotation -next-page: /scala3/reference/other-new-features/control-syntax +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/targetName.html --- A `@targetName` annotation on a definition defines an alternate name for the implementation of that definition. Example: diff --git a/docs/docs/reference/other-new-features/threadUnsafe-annotation.md b/docs/docs/reference/other-new-features/threadUnsafe-annotation.md index 0916f6ff9b7b..99a16413f310 100644 --- a/docs/docs/reference/other-new-features/threadUnsafe-annotation.md +++ b/docs/docs/reference/other-new-features/threadUnsafe-annotation.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "The @threadUnsafe annotation" -type: section -num: 44 -previous-page: /scala3/reference/other-new-features/matchable -next-page: /scala3/reference/other-new-features/targetName +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/threadUnsafe-annotation.html --- A new annotation `@threadUnsafe` can be used on a field which defines diff --git a/docs/docs/reference/other-new-features/trait-parameters.md b/docs/docs/reference/other-new-features/trait-parameters.md index a3a692f91cc7..4013e87237dd 100644 --- a/docs/docs/reference/other-new-features/trait-parameters.md +++ b/docs/docs/reference/other-new-features/trait-parameters.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Trait Parameters" -type: section -num: 35 -previous-page: /scala3/reference/other-new-features -next-page: /scala3/reference/other-new-features/transparent-traits +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/trait-parameters.html --- Scala 3 allows traits to have parameters, just like classes have parameters. diff --git a/docs/docs/reference/other-new-features/transparent-traits.md b/docs/docs/reference/other-new-features/transparent-traits.md index 236f0c64d7b8..8f37f24174e1 100644 --- a/docs/docs/reference/other-new-features/transparent-traits.md +++ b/docs/docs/reference/other-new-features/transparent-traits.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "Transparent Traits" -type: section -num: 36 -previous-page: /scala3/reference/other-new-features/trait-parameters -next-page: /scala3/reference/other-new-features/creator-applications +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/transparent-traits.html --- Traits are used in two roles: @@ -22,7 +20,7 @@ val x = Set(if condition then Val else Var) Here, the inferred type of `x` is `Set[Kind & Product & Serializable]` whereas one would have hoped it to be `Set[Kind]`. The reasoning for this particular type to be inferred is as follows: -- The type of the conditional above is the [union type](../new-types/union-types.html) `Val | Var`. +- The type of the conditional above is the [union type](../new-types/union-types.md) `Val | Var`. - A union type is widened in type inference to the least supertype that is not a union type. In the example, this type is `Kind & Product & Serializable` since all three traits are traits of both `Val` and `Var`. So that type becomes the inferred element type of the set. diff --git a/docs/docs/reference/other-new-features/type-test.md b/docs/docs/reference/other-new-features/type-test.md index 62b8d59eec6d..da9fa6a1c2b3 100644 --- a/docs/docs/reference/other-new-features/type-test.md +++ b/docs/docs/reference/other-new-features/type-test.md @@ -1,9 +1,7 @@ --- +layout: doc-page title: "TypeTest" -type: section -num: 50 -previous-page: /scala3/reference/other-new-features/safe-initialization -next-page: /scala3/reference/other-new-features/experimental-defs +movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/type-test.html --- ## TypeTest diff --git a/docs/docs/reference/overview.md b/docs/docs/reference/overview.md index 8366ec10ddc2..051ba4b124cc 100644 --- a/docs/docs/reference/overview.md +++ b/docs/docs/reference/overview.md @@ -1,8 +1,7 @@ --- +layout: doc-page title: "Overview" -type: chapter -num: 1 -next-page: /scala3/reference/new-types +movedTo: https://docs.scala-lang.org/scala3/reference/overview.html --- Scala 3 implements many language changes and improvements over Scala 2. @@ -21,43 +20,43 @@ The language redesign was guided by three main goals: - Further improve the consistency and expressiveness of Scala's language constructs. Corresponding to these goals, the language changes fall into seven categories: -(1) Core constructs to strengthen foundations, (2) simplifications and (3) [restrictions](#restrictions), to make the language easier and safer to use, (4) [dropped constructs](#dropped-constructs) to make the language smaller and more regular, (5) [changed constructs](#changes) to remove warts, and increase consistency and usability, (6) [new constructs](#new-constructs) to fill gaps and increase expressiveness, (7) a new, principled approach to metaprogramming that replaces [Scala 2 experimental macros](https://docs.scala-lang.org/overviews/macros/overview.html). +(1) Core constructs to strengthen foundations, (2) simplifications and (3) [restrictions](#restrictions), to make the language easier and safer to use, (4) [dropped constructs](#dropped-constructs) to make the language smaller and more regular, (5) [changed constructs](#changes) to remove warts, and increase consistency and usability, (6) [new constructs](#new-constructs) to fill gaps and increase expressiveness, (7) a new, principled approach to metaprogramming that replaces [Scala 2 experimental macros](https://docs.scala-lang.org/overviews/macros/overview.md). ## Essential Foundations These new constructs directly model core features of DOT, higher-kinded types, and the [SI calculus for implicit resolution](https://infoscience.epfl.ch/record/229878/files/simplicitly_1.pdf). -- [Intersection types](new-types/intersection-types.html), replacing compound types, -- [Union types](new-types/union-types.html), -- [Type lambdas](new-types/type-lambdas.html), replacing encodings using structural types and type projection. -- [Context functions](contextual/context-functions.html), offering abstraction over given parameters. +- [Intersection types](new-types/intersection-types.md), replacing compound types, +- [Union types](new-types/union-types.md), +- [Type lambdas](new-types/type-lambdas.md), replacing encodings using structural types and type projection. +- [Context functions](contextual/context-functions.md), offering abstraction over given parameters. ## Simplifications These constructs replace existing constructs with the aim of making the language safer and simpler to use, and to promote uniformity in code style. -- [Trait parameters](other-new-features/trait-parameters.html) - replace [early initializers](dropped-features/early-initializers.html) with a more generally useful construct. -- [Given instances](contextual/givens.html) +- [Trait parameters](other-new-features/trait-parameters.md) + replace [early initializers](dropped-features/early-initializers.md) with a more generally useful construct. +- [Given instances](contextual/givens.md) replace implicit objects and defs, focussing on intent over mechanism. -- [Using clauses](contextual/using-clauses.html) +- [Using clauses](contextual/using-clauses.md) replace implicit parameters, avoiding their ambiguities. -- [Extension methods](contextual/extension-methods.html) +- [Extension methods](contextual/extension-methods.md) replace implicit classes with a clearer and simpler mechanism. -- [Opaque type aliases](other-new-features/opaques.html) +- [Opaque type aliases](other-new-features/opaques.md) replace most uses of value classes while guaranteeing absence of boxing. -- [Top-level definitions](dropped-features/package-objects.html) +- [Top-level definitions](dropped-features/package-objects.md) replace package objects, dropping syntactic boilerplate. -- [Export clauses](other-new-features/export.html) +- [Export clauses](other-new-features/export.md) provide a simple and general way to express aggregation, which can replace the previous facade pattern of package objects inheriting from classes. -- [Vararg splices](changed-features/vararg-splices.html) +- [Vararg splices](changed-features/vararg-splices.md) now use the form `xs*` in function arguments and patterns instead of `xs: _*` and `xs @ _*`, -- [Universal apply methods](other-new-features/creator-applications.html) +- [Universal apply methods](other-new-features/creator-applications.md) allow using simple function call syntax instead of `new` expressions. `new` expressions stay around as a fallback for the cases where creator applications cannot be used. -With the exception of [early initializers](dropped-features/early-initializers.html) and old-style vararg patterns, all superseded constructs continue to be available in Scala 3.0. The plan is to deprecate and phase them out later. +With the exception of [early initializers](dropped-features/early-initializers.md) and old-style vararg patterns, all superseded constructs continue to be available in Scala 3.0. The plan is to deprecate and phase them out later. Value classes (superseded by opaque type aliases) are a special case. There are currently no deprecation plans for value classes, since we might bring them back in a more general form if they are supported natively by the JVM as is planned by [project Valhalla](https://openjdk.java.net/projects/valhalla/). @@ -65,15 +64,15 @@ Value classes (superseded by opaque type aliases) are a special case. There are These constructs are restricted to make the language safer. -- [Implicit Conversions](contextual/conversions.html): +- [Implicit Conversions](contextual/conversions.md): there is only one way to define implicit conversions instead of many, and potentially surprising implicit conversions require a language import. -- [Given Imports](contextual/given-imports.html): +- [Given Imports](contextual/given-imports.md): implicits now require a special form of import, to make the import clearly visible. -- [Type Projection](dropped-features/type-projection.html): +- [Type Projection](dropped-features/type-projection.md): only classes can be used as prefix `C` of a type projection `C#A`. Type projection on abstract types is no longer supported since it is unsound. -- [Multiversal Equality](contextual/multiversal-equality.html): +- [Multiversal Equality](contextual/multiversal-equality.md): implement an "opt-in" scheme to rule out nonsensical comparisons with `==` and `!=`. -- [infix](changed-features/operators.html): +- [infix](changed-features/operators.md): make method application syntax uniform across code bases. Unrestricted implicit conversions continue to be available in Scala 3.0, but will be deprecated and removed later. Unrestricted versions of the other constructs in the list above are available only under `-source 3.0-migration`. @@ -82,15 +81,15 @@ Unrestricted implicit conversions continue to be available in Scala 3.0, but wil These constructs are proposed to be dropped without a new construct replacing them. The motivation for dropping these constructs is to simplify the language and its implementation. -- [DelayedInit](dropped-features/delayed-init.html), -- [Existential types](dropped-features/existential-types.html), -- [Procedure syntax](dropped-features/procedure-syntax.html), -- [Class shadowing](dropped-features/class-shadowing.html), -- [XML literals](dropped-features/xml.html), -- [Symbol literals](dropped-features/symlits.html), -- [Auto application](dropped-features/auto-apply.html), -- [Weak conformance](dropped-features/weak-conformance.html), -- Compound types (replaced by [Intersection types](new-types/intersection-types.html)), +- [DelayedInit](dropped-features/delayed-init.md), +- [Existential types](dropped-features/existential-types.md), +- [Procedure syntax](dropped-features/procedure-syntax.md), +- [Class shadowing](dropped-features/class-shadowing.md), +- [XML literals](dropped-features/xml.md), +- [Symbol literals](dropped-features/symlits.md), +- [Auto application](dropped-features/auto-apply.md), +- [Weak conformance](dropped-features/weak-conformance.md), +- Compound types (replaced by [Intersection types](new-types/intersection-types.md)), - [Auto tupling](https://github.com/lampepfl/dotty/pull/4311) (implemented, but not merged). The date when these constructs are dropped varies. The current status is: @@ -100,19 +99,19 @@ The date when these constructs are dropped varies. The current status is: - Supported under `-source 3.0-migration`: - procedure syntax, class shadowing, symbol literals, auto application, auto tupling in a restricted form. - Supported in 3.0, to be deprecated and phased out later: - - [XML literals](dropped-features/xml.html), compound types. + - [XML literals](dropped-features/xml.md), compound types. ## Changes These constructs have undergone changes to make them more regular and useful. -- [Structural Types](changed-features/structural-types.html): +- [Structural Types](changed-features/structural-types.md): They now allow pluggable implementations, which greatly increases their usefulness. Some usage patterns are restricted compared to the status quo. -- [Name-based pattern matching](changed-features/pattern-matching.html): +- [Name-based pattern matching](changed-features/pattern-matching.md): The existing undocumented Scala 2 implementation has been codified in a slightly simplified form. -- [Automatic Eta expansion](changed-features/eta-expansion.html): +- [Automatic Eta expansion](changed-features/eta-expansion.md): Eta expansion is now performed universally also in the absence of an expected type. The postfix `_` operator is thus made redundant. It will be deprecated and dropped after Scala 3.0. -- [Implicit Resolution](changed-features/implicit-resolution.html): +- [Implicit Resolution](changed-features/implicit-resolution.md): The implicit resolution rules have been cleaned up to make them more useful and less surprising. Implicit scope is restricted to no longer include package prefixes. Most aspects of old-style implicit resolution are still available under `-source 3.0-migration`. The other changes in this list are applied unconditionally. @@ -121,13 +120,13 @@ Most aspects of old-style implicit resolution are still available under `-source These are additions to the language that make it more powerful or pleasant to use. -- [Enums](enums/enums.html) provide concise syntax for enumerations and [algebraic data types](enums/adts.html). -- [Parameter untupling](other-new-features/parameter-untupling.html) avoids having to use `case` for tupled parameter destructuring. -- [Dependent function types](new-types/dependent-function-types.html) generalize dependent methods to dependent function values and types. -- [Polymorphic function types](new-types/polymorphic-function-types.html) generalize polymorphic methods to polymorphic function values and types. +- [Enums](enums/enums.md) provide concise syntax for enumerations and [algebraic data types](enums/adts.md). +- [Parameter untupling](other-new-features/parameter-untupling.md) avoids having to use `case` for tupled parameter destructuring. +- [Dependent function types](new-types/dependent-function-types.md) generalize dependent methods to dependent function values and types. +- [Polymorphic function types](new-types/polymorphic-function-types.md) generalize polymorphic methods to polymorphic function values and types. _Current status_: There is a proposal and a merged prototype implementation, but the implementation has not been finalized (it is notably missing type inference support). -- [Kind polymorphism](other-new-features/kind-polymorphism.html) allows the definition of operators working equally on types and type constructors. -- [`@targetName` annotations](other-new-features/targetName.html) make it easier to interoperate with code written in other languages and give more flexibility for avoiding name clashes. +- [Kind polymorphism](other-new-features/kind-polymorphism.md) allows the definition of operators working equally on types and type constructors. +- [`@targetName` annotations](other-new-features/targetName.md) make it easier to interoperate with code written in other languages and give more flexibility for avoiding name clashes. ## Metaprogramming @@ -137,19 +136,19 @@ It's worth noting that macros were never included in the [Scala 2 language speci To enable porting most uses of macros, we are experimenting with the advanced language constructs listed below. These designs are more provisional than the rest of the proposed language constructs for Scala 3.0. There might still be some changes until the final release. Stabilizing the feature set needed for metaprogramming is our first priority. -- [Match Types](new-types/match-types.html) +- [Match Types](new-types/match-types.md) allow computation on types. -- [Inline](metaprogramming/inline.html) +- [Inline](metaprogramming/inline.md) provides by itself a straightforward implementation of some simple macros and is at the same time an essential building block for the implementation of complex macros. -- [Quotes and Splices](metaprogramming/macros.html) +- [Quotes and Splices](metaprogramming/macros.md) provide a principled way to express macros and staging with a unified set of abstractions. -- [Type class derivation](contextual/derivation.html) +- [Type class derivation](contextual/derivation.md) provides an in-language implementation of the `Gen` macro in Shapeless and other foundational libraries. The new implementation is more robust, efficient and easier to use than the macro. -- [By-name context parameters](contextual/by-name-context-parameters.html) +- [By-name context parameters](contextual/by-name-context-parameters.md) provide a more robust in-language implementation of the `Lazy` macro in [Shapeless](https://github.com/milessabin/shapeless). ## See Also -[A classification of proposed language features](./features-classification.html) is +[A classification of proposed language features](./features-classification.md) is an expanded version of this page that adds the status (i.e. relative importance to be a part of Scala 3, and relative urgency when to decide this) and expected migration cost of each language construct. diff --git a/docs/docs/reference/soft-modifier.md b/docs/docs/reference/soft-modifier.md index 3e9bb73b7586..9706e18e3e5b 100644 --- a/docs/docs/reference/soft-modifier.md +++ b/docs/docs/reference/soft-modifier.md @@ -1,7 +1,7 @@ --- -layout: singlepage-overview -scala3: true +layout: doc-page title: "Soft Keywords" +movedTo: https://docs.scala-lang.org/scala3/reference/soft-modifier.html --- A soft modifier is one of the identifiers `opaque`, `inline`, `open`, `transparent`, and `infix`. diff --git a/docs/docs/reference/syntax.md b/docs/docs/reference/syntax.md index 4561ad7c91b6..0bf2ed86a164 100644 --- a/docs/docs/reference/syntax.md +++ b/docs/docs/reference/syntax.md @@ -1,8 +1,7 @@ --- +layout: doc-page title: "Scala 3 Syntax Summary" -type: chapter -num: 88 -previous-page: /scala3/reference/dropped-features/wildcard-init +movedTo: https://docs.scala-lang.org/scala3/reference/syntax.html --- The following description of Scala tokens uses literal characters `‘c’` when @@ -91,7 +90,7 @@ semi ::= ‘;’ | nl {nl} ## Optional Braces -The lexical analyzer also inserts `indent` and `outdent` tokens that represent regions of indented code [at certain points](./other-new-features/indentation.html). +The lexical analyzer also inserts `indent` and `outdent` tokens that represent regions of indented code [at certain points](./other-new-features/indentation.md). In the context-free productions below we use the notation `<<< ts >>>` to indicate a token sequence `ts` that is either enclosed in a pair of braces `{ ts }` or that constitutes an indented region `indent ts outdent`. Analogously, the @@ -126,7 +125,7 @@ type val var while with yield as derives end extension infix inline opaque open transparent using | * + - ``` -See the [separate section on soft keywords](./soft-modifier.html) for additional +See the [separate section on soft keywords](./soft-modifier.md) for additional details on where a soft keyword is recognized. ## Context-free Syntax diff --git a/docs/docs/usage/ide-support.md b/docs/docs/usage/ide-support.md index 25739b021b78..c0736090e2be 100644 --- a/docs/docs/usage/ide-support.md +++ b/docs/docs/usage/ide-support.md @@ -1,7 +1,6 @@ --- layout: doc-page title: "IDE support for Scala 3" -movedTo: https://docs.scala-lang.org/scala3/getting-started.html --- This page is deprecated. Please go to the [getting-started](https://docs.scala-lang.org/scala3/getting-started.html) diff --git a/docs/docs/usage/scaladoc/blog.md b/docs/docs/usage/scaladoc/blog.md index b80faf9bdb90..85c2d9fa044a 100644 --- a/docs/docs/usage/scaladoc/blog.md +++ b/docs/docs/usage/scaladoc/blog.md @@ -1,12 +1,12 @@ --- -layout: multipage-overview +layout: doc-page title: "Built-in blog" -partof: scala3-scaladoc -num: 5 -previous-page: static-site -next-page: site-versioning + + + --- + Scaladoc allows you to include a simple blog in your documentation. For now, it provides only basic features. In the future, we plan to include more advanced features like tagging or author pages. @@ -25,7 +25,7 @@ All your blogposts must be put under `blog/_posts` directory. │ └── index.html ``` -If you are using yaml [sidebar]({% link _overviews/scala3-scaladoc/static-site.md %}#sidebar) don't forget to place +If you are using yaml [sidebar](./static-site.md#sidebar) don't forget to place ``` sidebar: @@ -38,5 +38,3 @@ somewhere inside the `yaml` tree representing the sidebar sections. Scaladoc wil All the blogpost filenames should start with date in numeric format matching `YYYY-MM-DD`. Example name is `2015-10-23-dotty-compiler-bootstraps.md`. - - diff --git a/docs/docs/usage/scaladoc/docstrings.md b/docs/docs/usage/scaladoc/docstrings.md index 72a8f99c88b5..9935702e10bd 100644 --- a/docs/docs/usage/scaladoc/docstrings.md +++ b/docs/docs/usage/scaladoc/docstrings.md @@ -1,10 +1,6 @@ --- -layout: multipage-overview +layout: doc-page title: "Docstrings - specific Tags and Features" -partof: scala3-scaladoc -num: 2 -previous-page: index -next-page: linking --- This chapter describes how to correctly write docstrings and how to use all the available features of scaladoc. @@ -195,4 +191,4 @@ Further information on the formatting and style recommendations can be found in Scaladoc allows linking to API documentation with Wiki-style links. Linking to `scala.collection.immutable.List` is as simple as -`[[scala.collection.immutable.List]]`. For more information on the exact syntax, see [doc comment documentation]({% link _overviews/scala3-scaladoc/linking.md %}#definition-links). +`[[scala.collection.immutable.List]]`. For more information on the exact syntax, see [doc comment documentation](./linking.md#definition-links). diff --git a/docs/docs/usage/scaladoc/index.md b/docs/docs/usage/scaladoc/index.md index 1aac56b5735e..edb56fc7dea5 100644 --- a/docs/docs/usage/scaladoc/index.md +++ b/docs/docs/usage/scaladoc/index.md @@ -1,11 +1,8 @@ --- -layout: multipage-overview +layout: doc-page title: "Scaladoc" -partof: scala3-scaladoc -num: 1 -next-page: docstrings --- -![scaladoc logo]({{ site.baseurl }}/resources/images/scala3/scaladoc/logo.svg) +![scaladoc logo](images/scaladoc_logo.svg) scaladoc is a tool to generate the API documentation of your Scala 3 projects. It provides similar features to `javadoc` as well as `jekyll` or `docusaurus`. diff --git a/docs/docs/usage/scaladoc/linking.md b/docs/docs/usage/scaladoc/linking.md index bfac8b9cef22..daef312700fc 100644 --- a/docs/docs/usage/scaladoc/linking.md +++ b/docs/docs/usage/scaladoc/linking.md @@ -1,10 +1,6 @@ --- -layout: multipage-overview +layout: doc-page title: "Linking documentation" -partof: scala3-scaladoc -num: 3 -previous-page: docstrings -next-page: static-site --- Scaladoc's main feature is creating API documentation from code comments. diff --git a/docs/docs/usage/scaladoc/search-engine.md b/docs/docs/usage/scaladoc/search-engine.md index 1bac1d37635d..a586c25c0a21 100644 --- a/docs/docs/usage/scaladoc/search-engine.md +++ b/docs/docs/usage/scaladoc/search-engine.md @@ -1,10 +1,6 @@ --- -layout: multipage-overview +layout: doc-page title: "Type-based search" -partof: scala3-scaladoc -num: 7 -previous-page: site-versioning -next-page: settings --- Searching for functions by their symbolic names can be time-consuming. @@ -19,7 +15,7 @@ Instead of searching for `span` we can also search for `IArray[A] => (A => Boole To use this feature, type the signature of the member you are looking for in the scaladoc searchbar. This is how it works: -![]({{ site.baseurl }}/resources/images/scala3/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif) +![]({{ site.baseurl }}images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif) This feature is provided by the [Inkuire](https://github.com/VirtusLab/Inkuire) search engine, which works for Scala 3 and Kotlin. To be up-to-date with the development of this feature, follow the [Inkuire repository](https://github.com/VirtusLab/Inkuire). diff --git a/docs/docs/usage/scaladoc/settings.md b/docs/docs/usage/scaladoc/settings.md index 803330d69eb0..396aef8b76fd 100644 --- a/docs/docs/usage/scaladoc/settings.md +++ b/docs/docs/usage/scaladoc/settings.md @@ -1,9 +1,6 @@ --- -layout: multipage-overview +layout: doc-page title: "Settings" -partof: scala3-scaladoc -num: 8 -previous-page: search-engine --- This chapter lists the configuration options that can be used when calling scaladoc. Some of the information shown here can be found by calling scaladoc with the `-help` flag. diff --git a/docs/docs/usage/scaladoc/site-versioning.md b/docs/docs/usage/scaladoc/site-versioning.md index f7424fc90657..8ce52d21b067 100644 --- a/docs/docs/usage/scaladoc/site-versioning.md +++ b/docs/docs/usage/scaladoc/site-versioning.md @@ -1,10 +1,6 @@ --- -layout: multipage-overview +layout: doc-page title: "Site versioning" -partof: scala3-scaladoc -num: 6 -previous-page: blog -next-page: search-engine --- Scaladoc provides a convenient way to switch between different versions of the documentation. The feature is useful if we want to expose older docs for users that didn't migrate to the new version of our library. @@ -36,4 +32,4 @@ doc / scalacOptions ++= Seq("-versions-dictionary-url", "https://dotty.epfl.ch/v Providing a JSON file via `-versions-dictionary-url` enables scaladoc to link between versions. It is also convenient to be able to change the revision label in the drop-down menu. Everything will change automatically. -![]({{ site.baseurl }}/resources/images/scala3/scaladoc/nightly.gif) +![]({{ site.baseurl }}images/scaladoc/nightly.gif) diff --git a/docs/docs/usage/scaladoc/static-site.md b/docs/docs/usage/scaladoc/static-site.md index 46bcdc018350..6a1f8db0824c 100644 --- a/docs/docs/usage/scaladoc/static-site.md +++ b/docs/docs/usage/scaladoc/static-site.md @@ -1,10 +1,6 @@ --- -layout: multipage-overview +layout: doc-page title: "Static documentation" -partof: scala3-scaladoc -num: 4 -previous-page: linking -next-page: blog --- Scaladoc can generate static sites, known from [Jekyll](http://jekyllrb.com/) or [Docusaurus](https://docusaurus.io/). @@ -145,7 +141,7 @@ The `page` property `subsection` accepts nested nodes, these can be either pages In `subsection`s, you can omit `title` or `index`, however not specifying any of these properties prevents you from specifying the title of the section. -`blog` is a special node represented by simple entry `- title: Blog` with no other attributes. All your blog posts will be automatically linked under this section. You can read more about the blog [here]({% link _overviews/scala3-scaladoc/blog.md %}). +`blog` is a special node represented by simple entry `- title: Blog` with no other attributes. All your blog posts will be automatically linked under this section. You can read more about the blog [here](./blog.md). ``` ├── blog diff --git a/docs/docs/usage/worksheet-mode-implementation-details.md b/docs/docs/usage/worksheet-mode-implementation-details.md index d06939d810ae..17c1cc3a2430 100644 --- a/docs/docs/usage/worksheet-mode-implementation-details.md +++ b/docs/docs/usage/worksheet-mode-implementation-details.md @@ -1,8 +1,13 @@ --- layout: doc-page title: "Worksheet Mode - Implementation details" + + + + --- + In brief, the worksheets extend the Language Server Protocol and rely on the Dotty REPL to evaluate code. From c632c859c520b8a3b720185494bb9366aa01c432 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Mon, 6 Dec 2021 16:24:13 +0100 Subject: [PATCH 0891/1244] Add indexes to reference chapters --- .github/workflows/ci.yaml | 3 +- .gitignore | 4 + .../changed-features.md | 0 docs/docs/reference/changed-features/index.md | 7 -- .../reference/{ => contextual}/contextual.md | 24 ++--- .../reference/contextual/derivation-macro.md | 2 +- .../dropped-features.md | 0 .../{enums.md => enums/enums-index.md} | 0 .../{ => metaprogramming}/metaprogramming.md | 12 +-- .../reference/{ => new-types}/new-types.md | 0 .../other-new-types.md} | 0 docs/sidebar.yml | 9 +- project/Build.scala | 4 +- project/CopyDocs.scala | 94 ------------------- project/DocumentationWebsite.scala | 4 +- project/scripts/genDocsScalaLang | 58 ------------ 16 files changed, 35 insertions(+), 186 deletions(-) rename docs/docs/reference/{ => changed-features}/changed-features.md (100%) delete mode 100644 docs/docs/reference/changed-features/index.md rename docs/docs/reference/{ => contextual}/contextual.md (83%) rename docs/docs/reference/{ => dropped-features}/dropped-features.md (100%) rename docs/docs/reference/{enums.md => enums/enums-index.md} (100%) rename docs/docs/reference/{ => metaprogramming}/metaprogramming.md (82%) rename docs/docs/reference/{ => new-types}/new-types.md (100%) rename docs/docs/reference/{other-new-features.md => other-new-features/other-new-types.md} (100%) delete mode 100644 project/CopyDocs.scala delete mode 100755 project/scripts/genDocsScalaLang diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 712df11ca03b..3a19af2de801 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -473,7 +473,8 @@ jobs: DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }} # If you need to change this: # Generate one at https://github.com/settings/tokens # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website - DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }} # If you need to change this: + # Currently unused token, no need to deploy anything to docs.scala-lang + # DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }} # If you need to change this: # Generate one at https://github.com/settings/tokens # Make sure you have the write permissions to the repo: https://github.com/scala/docs.scala-lang diff --git a/.gitignore b/.gitignore index 17a292e4c6a7..297d15748fdf 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,7 @@ cs # Coursier test product compiler/test-coursier/run/*.jar + +# docs related +contributors.js +content-contributors.css diff --git a/docs/docs/reference/changed-features.md b/docs/docs/reference/changed-features/changed-features.md similarity index 100% rename from docs/docs/reference/changed-features.md rename to docs/docs/reference/changed-features/changed-features.md diff --git a/docs/docs/reference/changed-features/index.md b/docs/docs/reference/changed-features/index.md deleted file mode 100644 index 70946645b06b..000000000000 --- a/docs/docs/reference/changed-features/index.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -layout: doc-page -title: "Other Changed Features" -movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/index.html ---- - -The following pages document the features that have changed in Scala 3, compared to Scala 2. diff --git a/docs/docs/reference/contextual.md b/docs/docs/reference/contextual/contextual.md similarity index 83% rename from docs/docs/reference/contextual.md rename to docs/docs/reference/contextual/contextual.md index de9046162c69..a2fe095c44c0 100644 --- a/docs/docs/reference/contextual.md +++ b/docs/docs/reference/contextual/contextual.md @@ -50,25 +50,25 @@ Existing Scala programmers by and large have gotten used to the status quo and s The following pages introduce a redesign of contextual abstractions in Scala. They introduce four fundamental changes: -1. [Given Instances](./contextual/givens.md) are a new way to define basic terms that can be synthesized. They replace implicit definitions. The core principle of the proposal is that, rather than mixing the `implicit` modifier with a large number of features, we have a single way to define terms that can be synthesized for types. +1. [Given Instances](./givens.md) are a new way to define basic terms that can be synthesized. They replace implicit definitions. The core principle of the proposal is that, rather than mixing the `implicit` modifier with a large number of features, we have a single way to define terms that can be synthesized for types. -2. [Using Clauses](./contextual/using-clauses.md) are a new syntax for implicit _parameters_ and their _arguments_. It unambiguously aligns parameters and arguments, solving a number of language warts. It also allows us to have several `using` clauses in a definition. +2. [Using Clauses](./using-clauses.md) are a new syntax for implicit _parameters_ and their _arguments_. It unambiguously aligns parameters and arguments, solving a number of language warts. It also allows us to have several `using` clauses in a definition. -3. ["Given" Imports](./contextual/given-imports.md) are a new class of import selectors that specifically import +3. ["Given" Imports](./given-imports.md) are a new class of import selectors that specifically import givens and nothing else. -4. [Implicit Conversions](./contextual/conversions.md) are now expressed as given instances of a standard `Conversion` class. All other forms of implicit conversions will be phased out. +4. [Implicit Conversions](./conversions.md) are now expressed as given instances of a standard `Conversion` class. All other forms of implicit conversions will be phased out. This section also contains pages describing other language features that are related to context abstraction. These are: -- [Context Bounds](./contextual/context-bounds.md), which carry over unchanged. -- [Extension Methods](./contextual/extension-methods.md) replace implicit classes in a way that integrates better with type classes. -- [Implementing Type Classes](./contextual/type-classes.md) demonstrates how some common type classes can be implemented using the new constructs. -- [Type Class Derivation](./contextual/derivation.md) introduces constructs to automatically derive type class instances for ADTs. -- [Multiversal Equality](./contextual/multiversal-equality.md) introduces a special type class to support type safe equality. -- [Context Functions](./contextual/context-functions.md) provide a way to abstract over context parameters. -- [By-Name Context Parameters](./contextual/by-name-context-parameters.md) are an essential tool to define recursive synthesized values without looping. -- [Relationship with Scala 2 Implicits](./contextual/relationship-implicits.md) discusses the relationship between old-style implicits and new-style givens and how to migrate from one to the other. +- [Context Bounds](./context-bounds.md), which carry over unchanged. +- [Extension Methods](./extension-methods.md) replace implicit classes in a way that integrates better with type classes. +- [Implementing Type Classes](./type-classes.md) demonstrates how some common type classes can be implemented using the new constructs. +- [Type Class Derivation](./derivation.md) introduces constructs to automatically derive type class instances for ADTs. +- [Multiversal Equality](./multiversal-equality.md) introduces a special type class to support type safe equality. +- [Context Functions](./context-functions.md) provide a way to abstract over context parameters. +- [By-Name Context Parameters](./by-name-context-parameters.md) are an essential tool to define recursive synthesized values without looping. +- [Relationship with Scala 2 Implicits](./relationship-implicits.md) discusses the relationship between old-style implicits and new-style givens and how to migrate from one to the other. Overall, the new design achieves a better separation of term inference from the rest of the language: There is a single way to define givens instead of a multitude of forms all taking an `implicit` modifier. There is a single way to introduce implicit parameters and arguments instead of conflating implicit with normal arguments. There is a separate way to import givens that does not allow them to hide in a sea of normal imports. And there is a single way to define an implicit conversion which is clearly marked as such and does not require special syntax. diff --git a/docs/docs/reference/contextual/derivation-macro.md b/docs/docs/reference/contextual/derivation-macro.md index c75f0430ec9b..5ff0007268dd 100644 --- a/docs/docs/reference/contextual/derivation-macro.md +++ b/docs/docs/reference/contextual/derivation-macro.md @@ -109,7 +109,7 @@ and an age of type `Int`, the equality check we want to generate is the followin ## Calling the derived method inside the macro -Following the rules in [Macros](../metaprogramming.md) we create two methods. +Following the rules in [Macros](../metaprogramming/metaprogramming.md) we create two methods. One that hosts the top-level splice `eqv` and one that is the implementation. Alternatively and what is shown below is that we can call the `eqv` method directly. The `eqGen` can trigger the derivation. diff --git a/docs/docs/reference/dropped-features.md b/docs/docs/reference/dropped-features/dropped-features.md similarity index 100% rename from docs/docs/reference/dropped-features.md rename to docs/docs/reference/dropped-features/dropped-features.md diff --git a/docs/docs/reference/enums.md b/docs/docs/reference/enums/enums-index.md similarity index 100% rename from docs/docs/reference/enums.md rename to docs/docs/reference/enums/enums-index.md diff --git a/docs/docs/reference/metaprogramming.md b/docs/docs/reference/metaprogramming/metaprogramming.md similarity index 82% rename from docs/docs/reference/metaprogramming.md rename to docs/docs/reference/metaprogramming/metaprogramming.md index 1d8fa83bae20..d2f210187337 100644 --- a/docs/docs/reference/metaprogramming.md +++ b/docs/docs/reference/metaprogramming/metaprogramming.md @@ -7,7 +7,7 @@ movedTo: https://docs.scala-lang.org/scala3/reference/metaprogramming.html The following pages introduce the redesign of metaprogramming in Scala. They introduce the following fundamental facilities: -1. [`inline`](./metaprogramming/inline.md) is a new modifier that guarantees that +1. [`inline`](./inline.md) is a new modifier that guarantees that a definition will be inlined at the point of use. The primary motivation behind inline is to reduce the overhead behind function calls and access to values. The expansion will be performed by the Scala compiler during the @@ -18,10 +18,10 @@ introduce the following fundamental facilities: programming), macros (enabling compile-time, generative, metaprogramming) and runtime code generation (multi-stage programming). -2. [Compile-time ops](./metaprogramming/compiletime-ops.md) are helper definitions in the +2. [Compile-time ops](./compiletime-ops.md) are helper definitions in the standard library that provide support for compile-time operations over values and types. -3. [Macros](./metaprogramming/macros.md) are built on two well-known fundamental +3. [Macros](./macros.md) are built on two well-known fundamental operations: quotation and splicing. Quotation converts program code to data, specifically, a (tree-like) representation of this code. It is expressed as `'{...}` for expressions and as `'[...]` for types. Splicing, @@ -29,19 +29,19 @@ introduce the following fundamental facilities: to program code. Together with `inline`, these two abstractions allow to construct program code programmatically. -4. [Runtime Staging](./metaprogramming/staging.md) Where macros construct code at _compile-time_, +4. [Runtime Staging](./staging.md) Where macros construct code at _compile-time_, staging lets programs construct new code at _runtime_. That way, code generation can depend not only on static data but also on data available at runtime. This splits the evaluation of the program in two or more phases or ... stages. Consequently, this method of generative programming is called "Multi-Stage Programming". Staging is built on the same foundations as macros. It uses quotes and splices, but leaves out `inline`. -5. [Reflection](./metaprogramming/reflection.md) Quotations are a "black-box" +5. [Reflection](./reflection.md) Quotations are a "black-box" representation of code. They can be parameterized and composed using splices, but their structure cannot be analyzed from the outside. TASTy reflection gives a way to analyze code structure by partly revealing the representation type of a piece of code in a standard API. The representation type is a form of typed abstract syntax tree, which gives rise to the `TASTy` moniker. -6. [TASTy Inspection](./metaprogramming/tasty-inspect.md) Typed abstract syntax trees are serialized +6. [TASTy Inspection](./tasty-inspect.md) Typed abstract syntax trees are serialized in a custom compressed binary format stored in `.tasty` files. TASTy inspection allows to load these files and analyze their content's tree structure. diff --git a/docs/docs/reference/new-types.md b/docs/docs/reference/new-types/new-types.md similarity index 100% rename from docs/docs/reference/new-types.md rename to docs/docs/reference/new-types/new-types.md diff --git a/docs/docs/reference/other-new-features.md b/docs/docs/reference/other-new-features/other-new-types.md similarity index 100% rename from docs/docs/reference/other-new-features.md rename to docs/docs/reference/other-new-features/other-new-types.md diff --git a/docs/sidebar.yml b/docs/sidebar.yml index 7a534eb42ae8..9ff759a98afe 100644 --- a/docs/sidebar.yml +++ b/docs/sidebar.yml @@ -10,6 +10,7 @@ sidebar: subsection: - page: docs/reference/overview.md - title: New Types + index: docs/reference/new-types/new-types.md subsection: - page: docs/reference/new-types/intersection-types.md - page: docs/reference/new-types/union-types.md @@ -18,13 +19,14 @@ sidebar: - page: docs/reference/new-types/dependent-function-types.md - page: docs/reference/new-types/polymorphic-function-types.md - title: Enums + index: docs/reference/enums/enums-index.md subsection: - page: docs/reference/enums/enums.md - page: docs/reference/enums/adts.md - page: docs/reference/enums/desugarEnums.md - title: Contextual Abstractions + index: docs/reference/contextual/contextual.md subsection: - - page: docs/reference/contextual.md - page: docs/reference/contextual/givens.md - page: docs/reference/contextual/using-clauses.md - page: docs/reference/contextual/context-bounds.md @@ -38,8 +40,8 @@ sidebar: - page: docs/reference/contextual/by-name-context-parameters.md - page: docs/reference/contextual/relationship-implicits.md - title: Metaprogramming + index: docs/reference/metaprogramming/metaprogramming.md subsection: - - page: docs/reference/metaprogramming.md - page: docs/reference/metaprogramming/inline.md - page: docs/reference/metaprogramming/compiletime-ops.md - page: docs/reference/metaprogramming/macros.md @@ -47,6 +49,7 @@ sidebar: - page: docs/reference/metaprogramming/reflection.md - page: docs/reference/metaprogramming/tasty-inspect.md - title: Other New Features + index: docs/reference/other-new-features/other-new-types.md subsection: - page: docs/reference/other-new-features/trait-parameters.md - page: docs/reference/other-new-features/transparent-traits.md @@ -66,6 +69,7 @@ sidebar: - page: docs/reference/other-new-features/type-test.md - page: docs/reference/other-new-features/experimental-defs.md - title: Other Changed Features + index: docs/reference/changed-features/changed-features.md subsection: - page: docs/reference/changed-features/numeric-literals.md - page: docs/reference/changed-features/structural-types.md @@ -86,6 +90,7 @@ sidebar: - page: docs/reference/changed-features/lazy-vals-init.md - page: docs/reference/changed-features/main-functions.md - title: Dropped Features + index: docs/reference/dropped-features/dropped-features.md subsection: - page: docs/reference/dropped-features/delayed-init.md - page: docs/reference/dropped-features/macros.md diff --git a/project/Build.scala b/project/Build.scala index fa9079362a50..03f69dd6f7e7 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1322,7 +1322,6 @@ object Build { name, scalaSrcLink(stdLibVersion, srcManaged(dottyNonBootstrappedVersion, "scala") + "="), dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "dotty") + "=", "#library/src"), - dottySrcLink(referenceVersion, "docs-for-dotty-page=", "#docs"), dottySrcLink(referenceVersion), "-Ygenerate-inkuire", ) ++ scalacOptionsDocSettings(includeExternalMappings) ++ revision ++ params ++ targets @@ -1383,7 +1382,6 @@ object Build { val dest = file(extraArgs.headOption.getOrElse("scaladoc/output/scala3")).getAbsoluteFile val justAPI = extraArgs.drop(1).headOption == Some("--justAPI") val majorVersion = (LocalProject("scala3-library-bootstrapped") / scalaBinaryVersion).value - CopyDocs.copyDocs() // invoke copying function form `project/CopyDocs.scala` val dottyJars: Seq[java.io.File] = Seq( (`stdlib-bootstrapped`/Compile/products).value, (`scala3-interfaces`/Compile/products).value, @@ -1414,7 +1412,7 @@ object Build { "https://scala-lang.org/api/versions.json", "-Ydocument-synthetic-types", s"-snippet-compiler:${dottyLibRoot}/scala/quoted=compile,${dottyLibRoot}/scala/compiletime=compile" - ) ++ (if (justAPI) Nil else Seq("-siteroot", "docs-for-dotty-page", "-Yapi-subdirectory")), includeExternalMappings = false) + ) ++ (if (justAPI) Nil else Seq("-siteroot", "docs", "-Yapi-subdirectory")), includeExternalMappings = false) if (dottyJars.isEmpty) Def.task { streams.value.log.error("Dotty lib wasn't found") } else if (justAPI) generateDocTask diff --git a/project/CopyDocs.scala b/project/CopyDocs.scala deleted file mode 100644 index e9a7c59ecd01..000000000000 --- a/project/CopyDocs.scala +++ /dev/null @@ -1,94 +0,0 @@ -import scala.io.{ Codec, Source } -import java.nio.file.{ FileSystems, Files, Path, StandardCopyOption } -import java.io.PrintStream -import collection.JavaConverters._ - - -/** - * Object used for copying docs from docs to docs-for-dotty-page. More explenation can be found and [readme](../docs/README.md) - */ -object CopyDocs { - - /** - * Input directory from which we will take all the docs. - */ - val inputDir = FileSystems.getDefault.getPath("docs") - - /** - * Output directory. Most of the sources will be copied as they are, but some of the files will have headers and links processed. - */ - val outputDir = FileSystems.getDefault.getPath("docs-for-dotty-page") - - val jekyllLinkPattern = """\{\% link _overviews/scala3-reference(.*) %\}""" - val jekyllLinkSubstitution = "..$1" - val jekyllLinkPattern2 = """\{\% link _overviews/scala3-scaladoc(.*) %\}""" - val jekyllLinkSubstitution2 = ".$1" - val localLinkPattern = """\((?!http|www)(.*).html\)""" - val localLinkSubstitution = "($1.md)" - - val commonTransformations: Map[String, String] = Map( - jekyllLinkPattern -> jekyllLinkSubstitution, - jekyllLinkPattern2 -> jekyllLinkSubstitution2, - localLinkPattern -> localLinkSubstitution, - ) - - /** - * Structure for holding which transformations should be applied to which directories. - * The outer map is holding morphism `directory prefix` -> `List of transformations`. - * The inner list is a collection of pairs `regex pattern` -> `substitution value`. - */ - val transformationMap: Map[String, Map[String, String]] = Map( - "docs/docs/usage/scaladoc/index.md" -> Map( - ("""\{\{ site\.baseurl \}\}/resources/images/scala3/scaladoc/logo\.svg""" -> "images/scaladoc_logo.svg"), - ), - - "docs/docs/usage/scaladoc/site-versioning.md" -> Map( - ("""/resources/images/scala3/scaladoc/nightly\.gif""" -> "images/scaladoc/nightly.gif"), - ), - - "docs/docs/usage/scaladoc/search-engine.md" -> Map( - ("""/resources/images/scala3/scaladoc/inkuire-1\.0\.0-M2_js_flatMap\.gif""" -> "images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif"), - ), - - "docs/docs/reference/other-new-features/explicit-nulls.md" -> Map( - ("""/resources/images/scala3/explicit-nulls/explicit-nulls-type-hierarchy\.png""" -> "images/explicit-nulls/explicit-nulls-type-hierarchy.png"), - ), - - "docs/docs/reference/" -> commonTransformations, - - "docs/docs/usage/scaladoc/" -> commonTransformations - ) - - def copyDocs() = { - def copyFile(path: Path): Unit = { - val newPath = outputDir.resolve(inputDir.relativize(path)) - Files.createDirectories(newPath.getParent()) - - path.toString match { - case s if s.startsWith("docs/docs/") && s.endsWith(".md") => - val inputStream = Source.fromFile(path.toFile)(Codec.UTF8) - val fileContent = inputStream.getLines().mkString("\n") - - new PrintStream(newPath.toFile) { - val patterns = transformationMap.filter { case (k, v) => path.toString.startsWith(k) }.flatMap(_._2) - val _ :: frontMatter :: actualContent :: Nil = fileContent.split("---", 3).toList - write("---".getBytes("UTF8")) - val frontMatterSplitted = frontMatter.split("\n(?=[^\\s])") - val frontMatterUpdated = List( - Some("layout: doc-page"), - frontMatterSplitted.find(_.startsWith("title")), - frontMatterSplitted.find(_.startsWith("redirectFrom")), - if (s.startsWith("docs/docs/reference/")) Some(s"movedTo: https://docs.scala-lang.org/scala3/reference/${s.stripPrefix("docs/docs/reference/").stripSuffix(".md")}.html") else None - ).flatten.mkString("\n", "\n", "\n") - write(frontMatterUpdated.getBytes("UTF8")) - write("---\n".getBytes("UTF8")) - val transformed = patterns.foldLeft(actualContent) { case (res, (pattern, substitution)) => res.replaceAll(pattern, substitution) } - write(transformed.getBytes("UTF8")) - } - case s => - Files.copy(path, newPath, StandardCopyOption.REPLACE_EXISTING); - } - } - Files.walk(inputDir).iterator().asScala.filter(Files.isRegularFile(_)).foreach(copyFile) - } -} diff --git a/project/DocumentationWebsite.scala b/project/DocumentationWebsite.scala index 6eee1ed02830..60a11e919e62 100644 --- a/project/DocumentationWebsite.scala +++ b/project/DocumentationWebsite.scala @@ -14,7 +14,7 @@ object DocumentationWebsite { val contributorsTestcasesDestinationFile = Paths.get("scaladoc-testcases", "docs", "js", "contributors.js").toFile - val contributorsDestinationFile = Paths.get("docs-for-dotty-page", "js", "contributors.js").toFile + val contributorsDestinationFile = Paths.get("docs", "js", "contributors.js").toFile sbt.IO.copyFile(contributorsFile, contributorsTestcasesDestinationFile) sbt.IO.copyFile(contributorsFile, contributorsDestinationFile) @@ -25,7 +25,7 @@ object DocumentationWebsite { val cssCodeSnippetsSourceFile = cssSourceFileBase / "code-snippets.css" sbt.IO.copyFile(cssCodeSnippetsSourceFile, cssCodeSnippetsDesitnationFile) - val cssContentContributorsTestcasesDesitnationFile = Paths.get("docs-for-dotty-page", "css", "content-contributors.css").toFile + val cssContentContributorsTestcasesDesitnationFile = Paths.get("docs", "css", "content-contributors.css").toFile val cssContentContributorsDesitnationFile = Paths.get("scaladoc-testcases", "docs", "css", "content-contributors.css").toFile val cssContentContributorsSourceFile = cssContentContributorsSourceBaseFile / "content-contributors.css" sbt.IO.copyFile(cssContentContributorsSourceFile, cssContentContributorsTestcasesDesitnationFile) diff --git a/project/scripts/genDocsScalaLang b/project/scripts/genDocsScalaLang deleted file mode 100755 index 1ce53899fd33..000000000000 --- a/project/scripts/genDocsScalaLang +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env bash - -set -e -shopt -s extglob # needed for rm everything but x -echo "Working directory: $PWD" - -GENDOC_EXTRA_ARGS=$@ -GIT_HEAD=$(git rev-parse HEAD) # save current head for commit message in gh-pages -PREVIOUS_SNAPSHOTS_DIR="$PWD/../prev_snapshots" -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)" -SITE_OUT_DIR="$PWD/docs/_site" - -DOCS_SCALA_LANG_DIR="$PWD/docsScalaLang" - -rm -rf $DOCS_SCALA_LANG_DIR -mkdir -pv $DOCS_SCALA_LANG_DIR -git clone "https://github.com/scala/docs.scala-lang.git" $DOCS_SCALA_LANG_DIR - -SBT="$SCRIPT_DIR/sbt" -mkdir -pv $SITE_OUT_DIR - -env "scaladoc.projectFormat=md" "$SBT" "scaladoc/renderScaladocScalajsToFile $DOCS_SCALA_LANG_DIR/scripts/scaladoc-scalajs.js $DOCS_SCALA_LANG_DIR/resources/css code-snippets.css" - -DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyNonBootstrappedVersion)\"" -DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1) - -DOTTY_BOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyVersion)\"" -DOTTY_BOOTSTRAPPED_VERSION=$(eval $DOTTY_BOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1) - -GITHUB_REPOSITORY="lampepfl/dotty" -GITHUB_SHA="3.0.0" - -"bin/scaladoc" "-d" "$SITE_OUT_DIR" "-format" "md" "-siteroot" "docs" "/dev/null " \ - -source-links:out/bootstrap/stdlib-bootstrapped/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/src_managed/main/scala-library-src=github://scala/scala/v"${STDLIB_VERSION}"#src/library \ - -source-links:out/bootstrap/stdlib-bootstrapped/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/src_managed/main/dotty-library-src=github://"${GITHUB_REPOSITORY}"/"${GITHUB_SHA}"\#library/src \ - -source-links:github://"${GITHUB_REPOSITORY}"/"${GITHUB_SHA}" \ - -if [ ! -d "$SITE_OUT_DIR" ]; then - echo "Output directory did not exist: $SITE_OUT_DIR" 1>&2 - exit 1 -fi - -# Copy reference and scaladoc docs -cp -rf "$SITE_OUT_DIR/docs/reference"/* "$DOCS_SCALA_LANG_DIR/_scala3-reference" -cp -rf "$SITE_OUT_DIR/docs/usage/scaladoc"/* "$DOCS_SCALA_LANG_DIR/_overviews/scala3-scaladoc" - -# Copy csses and html importing these assets -cp -f "$SITE_OUT_DIR/styles/colors.css" "$DOCS_SCALA_LANG_DIR/resources/css/colors.css" -cp -f "$PWD/docs/docsScalaLangResources/scaladoc-assets.html" "$DOCS_SCALA_LANG_DIR/_includes/scaladoc-assets.html" - -# Copy images and resources -cp -f "$PWD/scaladoc/resources/dotty_res/images/scaladoc_logo.svg" "$DOCS_SCALA_LANG_DIR/resources/images/scala3/scaladoc/logo.svg" -cp -f "$PWD/docs/images/scaladoc/nightly.gif" "$DOCS_SCALA_LANG_DIR/resources/images/scala3/scaladoc/nightly.gif" -cp -f "$PWD/docs/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif" "$DOCS_SCALA_LANG_DIR/resources/images/scala3/scaladoc/inkuire-1\.0\.0-M2_js_flatMap.gif" -cp -f "$PWD/docs/images/explicit-nulls/explicit-nulls-type-hierarchy.png" "$DOCS_SCALA_LANG_DIR/resources/images/scala3/explicit-nulls/explicit-nulls-type-hierarchy.png" - -# Hack inclusion of these assests by the docs.scala-lang jekyll builder -echo "{% include scaladoc-assets.html %}" >> "$DOCS_SCALA_LANG_DIR/_layouts/inner-page-parent-dropdown.html" From 14221dc837ea31afb6c1ce5421a08222be907568 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Tue, 7 Dec 2021 15:03:43 +0100 Subject: [PATCH 0892/1244] Fix links --- docs/docs/reference/changed-features/main-functions.md | 2 +- docs/docs/reference/experimental/canthrow.md | 2 +- .../docs/reference/other-new-features/trait-parameters.md | 2 +- docs/docs/usage/scaladoc/settings.md | 2 +- scaladoc/src/dotty/tools/scaladoc/site/templates.scala | 8 +------- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/docs/docs/reference/changed-features/main-functions.md b/docs/docs/reference/changed-features/main-functions.md index e0e13a14f681..f6f6067204a3 100644 --- a/docs/docs/reference/changed-features/main-functions.md +++ b/docs/docs/reference/changed-features/main-functions.md @@ -85,5 +85,5 @@ object happyBirthday extends App: ... ``` -The previous functionality of `App`, which relied on the "magic" [`DelayedInit`]({% link _scala3-reference/dropped-features/delayed-init.md %}) trait, is no longer available. [`App`](https://scala-lang.org/api/3.x/scala/App.md) still exists in limited form for now, but it does not support command line arguments and will be deprecated in the future. If programs need to cross-build +The previous functionality of `App`, which relied on the "magic" [`DelayedInit`](../dropped-features/delayed-init.md) trait, is no longer available. [`App`](https://scala-lang.org/api/3.x/scala/App.md) still exists in limited form for now, but it does not support command line arguments and will be deprecated in the future. If programs need to cross-build between Scala 2 and Scala 3, it is recommended to use an explicit `main` method with an `Array[String]` argument instead. diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md index 1d89b0d73583..c6957b534e07 100644 --- a/docs/docs/reference/experimental/canthrow.md +++ b/docs/docs/reference/experimental/canthrow.md @@ -60,7 +60,7 @@ In the _effects as capabilities_ model, an effect is expressed as an (implicit) ```scala erased class CanThrow[-E <: Exception] ``` -This shows another experimental Scala feature: [erased definitions]({% link _scala3-reference/experimental/erased-defs.md %}). Roughly speaking, values of an erased class do not generate runtime code; they are erased before code generation. This means that all `CanThrow` capabilities are compile-time only artifacts; they do not have a runtime footprint. +This shows another experimental Scala feature: [erased definitions](./erased-defs.md). Roughly speaking, values of an erased class do not generate runtime code; they are erased before code generation. This means that all `CanThrow` capabilities are compile-time only artifacts; they do not have a runtime footprint. Now, if the compiler sees a `throw Exc()` construct where `Exc` is a checked exception, it will check that there is a capability of type `CanThrow[Exc]` that can be summoned as a given. It's a compile-time error if that's not the case. diff --git a/docs/docs/reference/other-new-features/trait-parameters.md b/docs/docs/reference/other-new-features/trait-parameters.md index 4013e87237dd..6c833a097b21 100644 --- a/docs/docs/reference/other-new-features/trait-parameters.md +++ b/docs/docs/reference/other-new-features/trait-parameters.md @@ -56,7 +56,7 @@ class E extends Greeting("Bob"), FormalGreeting ### Traits With Context Parameters This "explicit extension required" rule is relaxed if the missing trait contains only -[context parameters]({% link _scala3-reference/contextual/using-clauses.md %}). In that case the trait reference is +[context parameters](../contextual/using-clauses.md). In that case the trait reference is implicitly inserted as an additional parent with inferred arguments. For instance, here's a variant of greetings where the addressee is a context parameter of type `ImpliedName`: diff --git a/docs/docs/usage/scaladoc/settings.md b/docs/docs/usage/scaladoc/settings.md index 396aef8b76fd..067967ee58cc 100644 --- a/docs/docs/usage/scaladoc/settings.md +++ b/docs/docs/usage/scaladoc/settings.md @@ -157,7 +157,7 @@ compile - Enables snippet checking. nocompile - Disables snippet checking. fail - Enables snippet checking, asserts that snippet doesn't compile. -The fail flag comes in handy for snippets that present that some action would eventually fail during compilation, e. g. [Opaques page]({% link _scala3-reference/other-new-features/opaques.md %}) +The fail flag comes in handy for snippets that present that some action would eventually fail during compilation, e. g. [Opaques page](../../reference/other-new-features/opaques.md) Example usage: diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala index 0e8b0994595b..9b81f4e9957e 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala @@ -105,14 +105,8 @@ case class TemplateFile( // Library requires mutable maps.. val mutableProperties = new JHashMap(ctx.properties.transform((_, v) => asJavaElement(v)).asJava) - // Register escaping {% link ... %} in markdown - val tag = new Tag("link"): - override def render(context: TemplateContext, nodes: Array[? <: LNode]): Object = - val link = super.asString(nodes(0).render(context)) - s"{% link $link %}" - val rendered = ssctx.args.projectFormat match - case "html" => Template.parse(this.rawCode).`with`(tag).render(mutableProperties) + case "html" => Template.parse(this.rawCode).render(mutableProperties) case "md" => this.rawCode // We want to render markdown only if next template is html From db42b35aa87412ccd57a43ef91c3324b973d87a8 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Tue, 7 Dec 2021 15:29:23 +0100 Subject: [PATCH 0893/1244] Remove preprocessor --- build.sbt | 1 - docs/docs/usage/ide-support.md | 1 + project/Build.scala | 29 +------------- scaladoc-js/markdown/src/Main.scala | 5 --- .../src/dotty/tools/scaladoc/Scaladoc.scala | 9 +---- .../tools/scaladoc/ScaladocSettings.scala | 10 ----- .../scaladoc/renderers/SiteRenderer.scala | 29 ++++---------- .../scaladoc/site/FrontMatterRenderer.scala | 24 ----------- .../dotty/tools/scaladoc/site/common.scala | 5 +-- .../dotty/tools/scaladoc/site/templates.scala | 15 ++----- .../markdown/SnippetFormattingExtension.scala | 40 ------------------- 11 files changed, 16 insertions(+), 152 deletions(-) delete mode 100644 scaladoc-js/markdown/src/Main.scala delete mode 100644 scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala delete mode 100644 scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetFormattingExtension.scala diff --git a/build.sbt b/build.sbt index 5add443e0a64..3ec2958324be 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,6 @@ val scaladoc = Build.scaladoc val `scaladoc-testcases` = Build.`scaladoc-testcases` val `scaladoc-js-common` = Build.`scaladoc-js-common` val `scaladoc-js-main` = Build.`scaladoc-js-main` -val `scaladoc-js-markdown` = Build.`scaladoc-js-markdown` val `scaladoc-js-contributors` = Build.`scaladoc-js-contributors` val `scala3-bench-run` = Build.`scala3-bench-run` val dist = Build.dist diff --git a/docs/docs/usage/ide-support.md b/docs/docs/usage/ide-support.md index c0736090e2be..25739b021b78 100644 --- a/docs/docs/usage/ide-support.md +++ b/docs/docs/usage/ide-support.md @@ -1,6 +1,7 @@ --- layout: doc-page title: "IDE support for Scala 3" +movedTo: https://docs.scala-lang.org/scala3/getting-started.html --- This page is deprecated. Please go to the [getting-started](https://docs.scala-lang.org/scala3/getting-started.html) diff --git a/project/Build.scala b/project/Build.scala index 03f69dd6f7e7..460fdd4ae89a 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1251,7 +1251,6 @@ object Build { // Note: the two tasks below should be one, but a bug in Tasty prevents that val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib") val generateTestcasesDocumentation = taskKey[Unit]("Generate documentation for testcases, usefull for debugging tests") - val renderScaladocScalajsToFile = inputKey[Unit]("Copy the output of the scaladoc js files") lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")). dependsOn(`scala3-compiler-bootstrapped`). @@ -1260,9 +1259,8 @@ object Build { /** * Collection of projects building targets for scaladoc, these are: - * - common - common module for javascript shared among html and markdown outpu + * - common - common module for javascript * - main - main target for default scaladoc producing html webpage - * - markdown - companion js for preprocessing features. Can be later used with some templating engine * - contributors - not related project to any of forementioned modules. Used for presenting contributors for static site. * Made as an indepented project to be scaladoc-agnostic. */ @@ -1279,14 +1277,6 @@ object Build { Test / fork := false ) - lazy val `scaladoc-js-markdown` = project.in(file("scaladoc-js/markdown")). - enablePlugins(DottyJSPlugin). - dependsOn(`scaladoc-js-common`). - settings( - scalaJSUseMainModuleInitializer := true, - Test / fork := false - ) - lazy val `scaladoc-js-contributors` = project.in(file("scaladoc-js/contributors")). enablePlugins(DottyJSPlugin). dependsOn(`scala3-library-bootstrappedJS`). @@ -1434,23 +1424,6 @@ object Build { ) }.value, - renderScaladocScalajsToFile := Def.inputTask { - val extraArgs = spaceDelimited("").parsed - val (destJS, destCSS, csses) = extraArgs match { - case js :: css :: tail => (js, css, tail) - case js :: Nil => (js, "", Nil) - case _ => throw new IllegalArgumentException("No js destination provided") - } - val jsDestinationFile: File = Paths.get(destJS).toFile - sbt.IO.copyFile((`scaladoc-js-markdown` / Compile / fullOptJS).value.data, jsDestinationFile) - csses.map { file => - val cssDesitnationFile = Paths.get(destCSS).toFile / file - val cssSourceFile = (`scaladoc-js-markdown` / Compile / resourceDirectory).value / file - sbt.IO.copyFile(cssSourceFile, cssDesitnationFile) - cssDesitnationFile - } - }.evaluated, - Test / buildInfoKeys := Seq[BuildInfoKey]( (Test / Build.testcasesOutputDir), (Test / Build.testcasesSourceRoot), diff --git a/scaladoc-js/markdown/src/Main.scala b/scaladoc-js/markdown/src/Main.scala deleted file mode 100644 index f7794057bfdf..000000000000 --- a/scaladoc-js/markdown/src/Main.scala +++ /dev/null @@ -1,5 +0,0 @@ -package dotty.tools.scaladoc -import scala.scalajs.js.annotation._ - -object Main extends App: - CodeSnippets() diff --git a/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala b/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala index 580acf9cb6ca..154209b5e1e5 100644 --- a/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala +++ b/scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala @@ -60,7 +60,6 @@ object Scaladoc: generateInkuire : Boolean = false, apiSubdirectory : Boolean = false, scastieConfiguration: String = "", - projectFormat: String = "html", defaultTemplate: Option[String] = None, ) @@ -239,7 +238,6 @@ object Scaladoc: generateInkuire.get, apiSubdirectory.get, scastieConfiguration.get, - projectFormat.get, defaultTemplate.nonDefault ) (Some(docArgs), newContext) @@ -248,11 +246,6 @@ object Scaladoc: private [scaladoc] def run(args: Args)(using ctx: CompilerContext): DocContext = given docContext: DocContext = new DocContext(args, ctx) val module = ScalaModuleProvider.mkModule() - - val renderer = args.projectFormat match - case "html" => new dotty.tools.scaladoc.renderers.HtmlRenderer(module.rootPackage, module.members) - case "md" => new dotty.tools.scaladoc.renderers.MarkdownRenderer(module.rootPackage, module.members) - - renderer.render() + new dotty.tools.scaladoc.renderers.HtmlRenderer(module.rootPackage, module.members).render() report.inform("generation completed successfully") docContext diff --git a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala index ea35ac0f9b8c..0d6bc60f281a 100644 --- a/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala +++ b/scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala @@ -125,16 +125,6 @@ class ScaladocSettings extends SettingGroup with AllScalaSettings: val scastieConfiguration: Setting[String] = StringSetting("-scastie-configuration", "Scastie configuration", "Additional configuration passed to Scastie in code snippets", "") - val projectFormat: Setting[String] = - ChoiceSetting( - "-format", - "format of the static site output", - "Format of the static site output. The default value is html, which converts all static articles into a webpage. " + - "The md format only preprocess markdown files and should not be used as a direct output, but rather as a sources generator for an outer templating engine like Jekyll", - List("html", "md"), - "html" - ) - val defaultTemplate: Setting[String] = StringSetting( "-default-template", diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala index 396c7830d8dc..566ccd81ab62 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala @@ -56,24 +56,11 @@ trait SiteRenderer(using DocContext) extends Locations: else processLocalLink(str) - summon[DocContext].args.projectFormat match - case "html" => - val document = Jsoup.parse(content.resolved.code) - document.select("a").forEach(element => - element.attr("href", processLocalLinkWithGuard(element.attr("href"))) - ) - document.select("img").forEach { element => - element.attr("src", processLocalLink(element.attr("src"))) - } // foreach does not work here. Why? - raw(document.outerHtml()) - case "md" => - val links = """(? s"[${m.group(1)}](${processLocalLink(m.group(2))})" - ), - m => s"[${m.group(1)}](${processLocalLinkWithGuard(m.group(2))})" - )) + val document = Jsoup.parse(content.resolved.code) + document.select("a").forEach(element => + element.attr("href", processLocalLinkWithGuard(element.attr("href"))) + ) + document.select("img").forEach { element => + element.attr("src", processLocalLink(element.attr("src"))) + } // foreach does not work here. Why? + raw(document.outerHtml()) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala deleted file mode 100644 index 2e02918b5b39..000000000000 --- a/scaladoc/src/dotty/tools/scaladoc/site/FrontMatterRenderer.scala +++ /dev/null @@ -1,24 +0,0 @@ -package dotty.tools.scaladoc -package site - - -/** - * Object for rendering yaml front-matter for preprocessed markdowns. - */ -object FrontMatterRenderer: - def render(properties: Map[String, Object]): String = - - def renderProperties(newProps: Map[String, Object]): List[String] = newProps.collect { - case (k: String, v: String) => s"$k: $v" - }.toList - - val rows = renderProperties(properties) ++ renderProperties(properties("page").asInstanceOf[Map[String, Object]]) - - rows.mkString("---\n", "\n", "\n---") + "\n\n\n\n" - - - diff --git a/scaladoc/src/dotty/tools/scaladoc/site/common.scala b/scaladoc/src/dotty/tools/scaladoc/site/common.scala index 5873863ed6c0..6c7677729e89 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/common.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/common.scala @@ -37,10 +37,7 @@ def defaultMarkdownOptions(using ctx: StaticSiteContext): DataHolder = YamlFrontMatterExtension.create(), StrikethroughExtension.create(), WikiLinkExtension.create(), - (ctx.args.projectFormat match - case "html" => tasty.comments.markdown.SnippetRenderingExtension - case "md" => tasty.comments.markdown.SnippetFormattingExtension - ), + tasty.comments.markdown.SnippetRenderingExtension )) def emptyTemplate(file: File, title: String): TemplateFile = TemplateFile( diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala index 9b81f4e9957e..55eb30026fd4 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala @@ -92,7 +92,7 @@ case class TemplateFile( if (ctx.resolving.contains(file.getAbsolutePath)) throw new RuntimeException(s"Cycle in templates involving $file: ${ctx.resolving}") - val layoutTemplate = layout.filter(_ => ssctx.args.projectFormat == "html").map(name => + val layoutTemplate = layout.map(name => ctx.layouts.getOrElse(name, throw new RuntimeException(s"No layouts named $name in ${ctx.layouts}"))) def asJavaElement(o: Object): Object = o match @@ -105,9 +105,7 @@ case class TemplateFile( // Library requires mutable maps.. val mutableProperties = new JHashMap(ctx.properties.transform((_, v) => asJavaElement(v)).asJava) - val rendered = ssctx.args.projectFormat match - case "html" => Template.parse(this.rawCode).render(mutableProperties) - case "md" => this.rawCode + val rendered = Template.parse(this.rawCode).render(mutableProperties) // We want to render markdown only if next template is html val code = if (isHtml || layoutTemplate.exists(!_.isHtml)) rendered else @@ -115,14 +113,9 @@ case class TemplateFile( val parser: Parser = Parser.builder(defaultMarkdownOptions).build() val parsedMd = parser.parse(rendered) val processed = FlexmarkSnippetProcessor.processSnippets(parsedMd, None, snippetCheckingFunc, withContext = false)(using ssctx.outerCtx) + HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed) - ssctx.args.projectFormat match - case "html" => HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed) - case "md" => FrontMatterRenderer.render(ctx.properties ++ settings) + - Formatter.builder(defaultMarkdownOptions).build().render(processed) - - - if layoutTemplate.isEmpty || ssctx.args.projectFormat == "md" then + if layoutTemplate.isEmpty then ResolvedPage(code, resources ++ ctx.resources) else layoutTemplate.get.resolveInner(ctx.nest(code, file, resources)) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetFormattingExtension.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetFormattingExtension.scala deleted file mode 100644 index 7833c0c5d669..000000000000 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetFormattingExtension.scala +++ /dev/null @@ -1,40 +0,0 @@ -package dotty.tools.scaladoc -package tasty.comments.markdown - -import dotty.tools.scaladoc.snippets._ - -import com.vladsch.flexmark.formatter._ -import com.vladsch.flexmark.parser._ -import com.vladsch.flexmark.ext.wikilink._ -import com.vladsch.flexmark.ext.wikilink.internal.WikiLinkLinkRefProcessor -import com.vladsch.flexmark.util.ast._ -import com.vladsch.flexmark.util.options._ -import com.vladsch.flexmark.util.sequence.BasedSequence -import com.vladsch.flexmark._ - -/** - * SnippetFormattingExtension is a clone of the [[SnippetRenderingExtension]] used as a fallback strategy when the `-format` setting is set up to `md` - */ -object SnippetFormattingExtension extends Formatter.FormatterExtension: - - def rendererOptions(opt: MutableDataHolder): Unit = () - - object ExtendedFencedCodeBlockHandler extends CustomNodeFormatter[ExtendedFencedCodeBlock]: - override def render(node: ExtendedFencedCodeBlock, c: NodeFormatterContext, markdown: MarkdownWriter): Unit = - markdown.append( - SnippetRenderer.renderSnippetWithMessages(node) - ) - - object Format extends NodeFormatter: - override def getNodeFormattingHandlers: JSet[NodeFormattingHandler[?]] = - JSet( - new NodeFormattingHandler(classOf[ExtendedFencedCodeBlock], ExtendedFencedCodeBlockHandler), - ) - - def getNodeClasses: JSet[Class[?]] = null - - object Factory extends NodeFormatterFactory: - override def create(options: DataHolder): NodeFormatter = Format - - def extend(formatterBuilder: Formatter.Builder) = - formatterBuilder.nodeFormatterFactory(Factory) From 2caffea1ba40c1adaa64957b02c828c252b405f9 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 10 Dec 2021 16:59:37 +0100 Subject: [PATCH 0894/1244] To avoid (CVE-2021-44228) See https://github.com/sbt/sbt/releases/tag/v1.5.6 --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 3ce8b22dd455..fcd6b8aa26e0 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -140,7 +140,7 @@ final case class SbtCommunityProject( case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome") case _ => Nil extraSbtArgs ++ sbtProps ++ List( - "-sbt-version", "1.5.5", + "-sbt-version", "1.5.6", "-Dsbt.supershell=false", s"-Ddotty.communitybuild.dir=$communitybuildDir", s"--addPluginSbtFile=$sbtPluginFilePath" diff --git a/project/build.properties b/project/build.properties index 10fd9eee04ac..bb3a9b7dc6d2 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.5.6 From c0786ef0574592555f7b0998386b1e8bcf97af85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Chantepie?= Date: Sun, 14 Nov 2021 22:08:50 +0100 Subject: [PATCH 0895/1244] Add Reflect TypeRepr.typeArgs Closes #13947 --- .../src/scala/quoted/runtime/impl/QuotesImpl.scala | 5 +++++ library/src/scala/quoted/Quotes.scala | 3 +++ project/MiMaFilters.scala | 2 ++ tests/run-macros/i13947.check | 3 +++ tests/run-macros/i13947/Macro_1.scala | 12 ++++++++++++ tests/run-macros/i13947/Test_2.scala | 4 ++++ 6 files changed, 29 insertions(+) create mode 100644 tests/run-macros/i13947.check create mode 100644 tests/run-macros/i13947/Macro_1.scala create mode 100644 tests/run-macros/i13947/Test_2.scala diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala index d6e13fbbd168..3de7f0bfc670 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala @@ -1749,6 +1749,10 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler dotc.core.Types.decorateTypeApplications(self).appliedTo(targs) def substituteTypes(from: List[Symbol], to: List[TypeRepr]): TypeRepr = self.subst(from, to) + + def typeArgs: List[TypeRepr] = self match + case AppliedType(_, args) => args + case _ => List.empty end extension end TypeReprMethods @@ -2480,6 +2484,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler def name: String = self.denot.name.toString def fullName: String = self.denot.fullName.toString + def pos: Option[Position] = if self.exists then Some(self.sourcePos) else None diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala index 397f9d3b6aae..a375709844db 100644 --- a/library/src/scala/quoted/Quotes.scala +++ b/library/src/scala/quoted/Quotes.scala @@ -2571,6 +2571,9 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => @experimental def substituteTypes(from: List[Symbol], to: List[TypeRepr]): TypeRepr + /** The applied type arguments (empty if there is no such arguments) */ + @experimental + def typeArgs: List[TypeRepr] end extension } diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index 53a23fb8c3f2..fe9c7987a6b3 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -9,6 +9,8 @@ object MiMaFilters { ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.append"), ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"), ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"), + ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.typeArgs"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.typeArgs"), ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.double"), ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.double$"), ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.float"), diff --git a/tests/run-macros/i13947.check b/tests/run-macros/i13947.check new file mode 100644 index 000000000000..674afdfa11eb --- /dev/null +++ b/tests/run-macros/i13947.check @@ -0,0 +1,3 @@ +[] +[scala.Predef.String] +[scala.Int, scala.Float, scala.Long] diff --git a/tests/run-macros/i13947/Macro_1.scala b/tests/run-macros/i13947/Macro_1.scala new file mode 100644 index 000000000000..49a4971e553c --- /dev/null +++ b/tests/run-macros/i13947/Macro_1.scala @@ -0,0 +1,12 @@ +import scala.quoted.* + +inline def printTypeParams[A]: Unit = ${ printTypeParamsImpl[A] } + +def printTypeParamsImpl[A: Type](using Quotes): Expr[Unit] = { + import quotes.reflect.* + + val targs: List[TypeRepr] = TypeRepr.of[A].typeArgs + val debug = targs.map(_.show).mkString("[", ", ", "]") + + '{ println(${Expr(debug)}) } +} diff --git a/tests/run-macros/i13947/Test_2.scala b/tests/run-macros/i13947/Test_2.scala new file mode 100644 index 000000000000..009193cf12b8 --- /dev/null +++ b/tests/run-macros/i13947/Test_2.scala @@ -0,0 +1,4 @@ +@main def Test: Unit = + printTypeParams[scala.util.Random] + printTypeParams[Option[String]] + printTypeParams[Function2[Int, Float, Long]] From 30d5a3bb87cdb6fe1e587a5837987605bb7ea26e Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Fri, 3 Dec 2021 17:36:18 +0100 Subject: [PATCH 0896/1244] reproduce issue #13777 --- .../hierarchical-mirrors/app/Main.scala | 8 ++++++++ .../scala3-backcompat/hierarchical-mirrors/build.sbt | 7 +++++++ .../hierarchical-mirrors/lib/Top.scala | 7 +++++++ .../project/DottyInjectedPlugin.scala | 11 +++++++++++ sbt-test/scala3-backcompat/hierarchical-mirrors/test | 1 + 5 files changed, 34 insertions(+) create mode 100644 sbt-test/scala3-backcompat/hierarchical-mirrors/app/Main.scala create mode 100644 sbt-test/scala3-backcompat/hierarchical-mirrors/build.sbt create mode 100644 sbt-test/scala3-backcompat/hierarchical-mirrors/lib/Top.scala create mode 100644 sbt-test/scala3-backcompat/hierarchical-mirrors/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/scala3-backcompat/hierarchical-mirrors/test diff --git a/sbt-test/scala3-backcompat/hierarchical-mirrors/app/Main.scala b/sbt-test/scala3-backcompat/hierarchical-mirrors/app/Main.scala new file mode 100644 index 000000000000..1a6691dfd280 --- /dev/null +++ b/sbt-test/scala3-backcompat/hierarchical-mirrors/app/Main.scala @@ -0,0 +1,8 @@ +package app + +import scala.deriving.Mirror + +object Main: + def main(args: Array[String]): Unit = + val mirrorTop = summon[Mirror.SumOf[lib.Top]] + assert(mirrorTop.ordinal(lib.Middle()) == 0) diff --git a/sbt-test/scala3-backcompat/hierarchical-mirrors/build.sbt b/sbt-test/scala3-backcompat/hierarchical-mirrors/build.sbt new file mode 100644 index 000000000000..82f800d59aab --- /dev/null +++ b/sbt-test/scala3-backcompat/hierarchical-mirrors/build.sbt @@ -0,0 +1,7 @@ +lazy val lib = project.in(file("lib")) + .settings( + scalaVersion := "3.0.2" + ) + +lazy val app = project.in(file("app")) + .dependsOn(lib) diff --git a/sbt-test/scala3-backcompat/hierarchical-mirrors/lib/Top.scala b/sbt-test/scala3-backcompat/hierarchical-mirrors/lib/Top.scala new file mode 100644 index 000000000000..e7e3ac40700b --- /dev/null +++ b/sbt-test/scala3-backcompat/hierarchical-mirrors/lib/Top.scala @@ -0,0 +1,7 @@ +package lib + +sealed trait Top +object Top // companion is necessary + +case class Middle() extends Top with Bottom +sealed trait Bottom extends Top diff --git a/sbt-test/scala3-backcompat/hierarchical-mirrors/project/DottyInjectedPlugin.scala b/sbt-test/scala3-backcompat/hierarchical-mirrors/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/scala3-backcompat/hierarchical-mirrors/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/scala3-backcompat/hierarchical-mirrors/test b/sbt-test/scala3-backcompat/hierarchical-mirrors/test new file mode 100644 index 000000000000..63092ffa4a03 --- /dev/null +++ b/sbt-test/scala3-backcompat/hierarchical-mirrors/test @@ -0,0 +1 @@ +> app/run From de6fb5074c4e372531e02003a0323ad85c094e26 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Fri, 3 Dec 2021 18:04:00 +0100 Subject: [PATCH 0897/1244] Tighten check to cache Mirror.Sum in companion cache the mirror in the companion if: - the class is not scala 2 defined & the class has a companion & the class was either: - defined in source - from tasty and its companion is a subtype of Mirror.Sum --- .../src/dotty/tools/dotc/transform/SymUtils.scala | 13 ++++++++++--- .../src/dotty/tools/dotc/typer/Synthesizer.scala | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala index acfb4be5c022..189a9c92e5da 100644 --- a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala +++ b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala @@ -112,7 +112,14 @@ object SymUtils: self.isCoDefinedGiven(res.typeSymbol) self.isAllOf(Given | Method) && isCodefined(self.info) - def useCompanionAsMirror(using Context): Boolean = self.linkedClass.exists && !self.is(Scala2x) + def useCompanionAsSumMirror(using Context): Boolean = + self.linkedClass.exists + && !self.is(Scala2x) + && ( + // self is from source, or companion is a subtype of Sum + self.isDefinedInCurrentRun + || self.linkedClass.isSubClass(defn.Mirror_SumClass) + ) /** Is this a sealed class or trait for which a sum mirror is generated? * It must satisfy the following conditions: @@ -129,7 +136,7 @@ object SymUtils: s"it is not an abstract class" else { val children = self.children - val companionMirror = self.useCompanionAsMirror + val companionMirror = self.useCompanionAsSumMirror assert(!(companionMirror && (declScope ne self.linkedClass))) def problem(child: Symbol) = { @@ -144,7 +151,7 @@ object SymUtils: val s = child.whyNotGenericProduct if (s.isEmpty) s else if (child.is(Sealed)) { - val s = child.whyNotGenericSum(if child.useCompanionAsMirror then child.linkedClass else ctx.owner) + val s = child.whyNotGenericSum(if child.useCompanionAsSumMirror then child.linkedClass else ctx.owner) if (s.isEmpty) s else i"its child $child is not a generic sum because $s" } else i"its child $child is not a generic product because $s" diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala index 31694c23a8e0..fe4feecd6100 100644 --- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala @@ -271,7 +271,7 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): private def sumMirror(mirroredType: Type, formal: Type, span: Span)(using Context): Tree = val cls = mirroredType.classSymbol - val useCompanion = cls.useCompanionAsMirror + val useCompanion = cls.useCompanionAsSumMirror if cls.isGenericSum(if useCompanion then cls.linkedClass else ctx.owner) then val elemLabels = cls.children.map(c => ConstantType(Constant(c.name.toString))) From 5de20f8cb64bad9a63400917538aa7ae420dde29 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 13 Dec 2021 14:03:33 +0100 Subject: [PATCH 0898/1244] clarify comment in useCompanionAsSumMirror --- compiler/src/dotty/tools/dotc/transform/SymUtils.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala index 189a9c92e5da..93268b71a477 100644 --- a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala +++ b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala @@ -116,7 +116,12 @@ object SymUtils: self.linkedClass.exists && !self.is(Scala2x) && ( - // self is from source, or companion is a subtype of Sum + // If the sum type is compiled from source, and `self` is a "generic sum" + // then its companion object will become a sum mirror in `posttyper`. (This method + // can be called from `typer` when summoning a Mirror.) + // However if `self` is from a prior run then we should check that its companion subclasses `Mirror.Sum`. + // e.g. before Scala 3.1, hierarchical sum types were not considered "generic sums", so their + // companion would not cache the mirror. Companions from TASTy will already be typed as `Mirror.Sum`. self.isDefinedInCurrentRun || self.linkedClass.isSubClass(defn.Mirror_SumClass) ) From 0d5a3bfc1e6977cb61b705831201d88dbb18e42c Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 7 Dec 2021 17:44:55 +0100 Subject: [PATCH 0899/1244] Don't generate illegal types when clarifying implicit errors Fixes #13987 --- .../dotty/tools/dotc/typer/Implicits.scala | 22 ++++++++++++------- tests/neg/i13987.scala | 16 ++++++++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 tests/neg/i13987.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index fecdf3eb6cef..227065a70c91 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -470,20 +470,26 @@ object Implicits: val ctx1 = ctx.fresh.setExploreTyperState() ctx1.typerState.constraint = constraint inContext(ctx1) { - val map = new TypeMap { - def apply(t: Type): Type = t match { + val map = new TypeMap: + def apply(t: Type): Type = t match case t: TypeParamRef => - constraint.entry(t) match { - case NoType => t - case bounds: TypeBounds => TypeComparer.fullBounds(t) + constraint.entry(t) match + case NoType | _: TypeBounds => t case t1 => t1 - } case t: TypeVar => t.instanceOpt.orElse(apply(t.origin)) case _ => mapOver(t) - } - } + + override def mapArgs(args: List[Type], tparams: List[ParamInfo]) = + args.mapConserve { + case t: TypeParamRef => + constraint.entry(t) match + case bounds: TypeBounds => TypeComparer.fullBounds(t) + case _ => this(t) + case t => this(t) + } + end map map(tp) } diff --git a/tests/neg/i13987.scala b/tests/neg/i13987.scala new file mode 100644 index 000000000000..b27cd444cda6 --- /dev/null +++ b/tests/neg/i13987.scala @@ -0,0 +1,16 @@ +sealed trait Xa[T] +sealed trait Mu[T] extends Xa[T] +object Xa { + // bad + implicit def convertMu[X[x] <: Xa[x], A, B](implicit t: X[A] with Xa[A]): X[B] = t.asInstanceOf[X[B]] + // good +// implicit def convertMu[X[x] <: Xa[x], A, B](implicit t: X[A] with Mu[A]): X[B] = t.asInstanceOf[X[B]] +} +object Mu { + implicit def mu: Mu[Int] = new Mu[Int] {} +} + +object App extends App { + def constrain(a: Mu[Long]): Unit = println(a) + constrain(Xa.convertMu) // error +} \ No newline at end of file From 2ed023812433b7fa07cb32511b563db31d5bf2e0 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Wed, 8 Dec 2021 19:19:50 +0100 Subject: [PATCH 0900/1244] Fix passing jvm options --- .github/workflows/ci.yaml | 2 +- .../tools/dotc/config/ScalaSettings.scala | 3 ++ .../tools/coursier/CoursierScalaTests.scala | 22 ++++++-- compiler/test-coursier/run/envtest.scala | 4 ++ compiler/test-resources/scripting/envtest.sc | 2 + .../test-resources/scripting/envtest.scala | 4 ++ .../test/dotty/tools/repl/EnvPropsTest.scala | 17 +++++++ .../tools/scripting/BashScriptsTests.scala | 51 +++++++++++++++---- dist/bin/scala | 26 +++++++++- 9 files changed, 116 insertions(+), 15 deletions(-) create mode 100644 compiler/test-coursier/run/envtest.scala create mode 100755 compiler/test-resources/scripting/envtest.sc create mode 100644 compiler/test-resources/scripting/envtest.scala create mode 100644 compiler/test/dotty/tools/repl/EnvPropsTest.scala diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3a19af2de801..8a2c1728496d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -111,7 +111,7 @@ jobs: - name: Cmd Tests run: | - ./project/scripts/sbt ";scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test" + ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test" ./project/scripts/bootstrapCmdTests - name: MiMa diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index 13adb0165c77..e9f5ea07a353 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -73,6 +73,9 @@ trait AllScalaSettings extends CommonScalaSettings, PluginSettings, VerboseSetti ) val wikiSyntax: Setting[Boolean] = BooleanSetting("-Xwiki-syntax", "Retains the Scala2 behavior of using Wiki Syntax in Scaladoc.") + + val jvmargs = PrefixSetting("-J", "-J", "Pass directly to the runtime system.") + val defines = PrefixSetting("-Dproperty=value", "-D", "Pass -Dproperty=value directly to the runtime system.") end AllScalaSettings /** Settings shared by compiler and scaladoc */ diff --git a/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala b/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala index 2e616eeea631..d8a14f72ebfa 100644 --- a/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala +++ b/compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala @@ -60,6 +60,13 @@ class CoursierScalaTests: assertTrue(output.mkString("\n").endsWith("scriptPath.sc")) scriptPath() + def scriptEnvDashJDashD() = + val scriptPath = scripts("/scripting").find(_.getName == "envtest.sc").get.absPath + val args = scriptPath + val output = CoursierScalaTests.csScalaCmd("-J-Dkey=World", args) + assertEquals(output.mkString("\n"), "Hello World") + scriptEnvDashJDashD() + def version() = val output = CoursierScalaTests.csScalaCmd("-version") assertTrue(output.mkString("\n").contains(sys.env("DOTTY_BOOTSTRAPPED_VERSION"))) @@ -75,6 +82,11 @@ class CoursierScalaTests: assertEquals(output.mkString("\n"), "Hello") run() + def runDashJDashD() = + val output = CoursierScalaTests.csScalaCmd("-J-Dkey=World", "-classpath", scripts("/run").head.getParentFile.getParent, "-run", "run.envtest") + assertEquals(output.mkString("\n"), "Hello World") + runDashJDashD() + def notOnlyOptionsEqualsRun() = val output = CoursierScalaTests.csScalaCmd("-classpath", scripts("/run").head.getParentFile.getParent, "run.myfile") assertEquals(output.mkString("\n"), "Hello") @@ -147,10 +159,12 @@ object CoursierScalaTests: csCmd("dotty.tools.dotc.Main", options*) private def csCmd(entry: String, options: String*): List[String] = - val newOptions = options match - case Nil => options - case _ => "--" +: options - execCmd("./cs", (s"""launch "org.scala-lang:scala3-compiler_3:${sys.env("DOTTY_BOOTSTRAPPED_VERSION")}" --main-class "$entry" --property "scala.usejavacp=true"""" +: newOptions)*) + val (jOpts, args) = options.partition(_.startsWith("-J")) + val newOptions = args match + case Nil => args + case _ => "--" +: args + val newJOpts = jOpts.map(s => s"--java-opt ${s.stripPrefix("-J")}").mkString(" ") + execCmd("./cs", (s"""launch "org.scala-lang:scala3-compiler_3:${sys.env("DOTTY_BOOTSTRAPPED_VERSION")}" $newJOpts --main-class "$entry" --property "scala.usejavacp=true"""" +: newOptions)*) /** Get coursier script */ @BeforeClass def setup(): Unit = diff --git a/compiler/test-coursier/run/envtest.scala b/compiler/test-coursier/run/envtest.scala new file mode 100644 index 000000000000..bf416c9519ce --- /dev/null +++ b/compiler/test-coursier/run/envtest.scala @@ -0,0 +1,4 @@ +package run + +object envtest extends App: + println("Hello " + sys.props("key")) diff --git a/compiler/test-resources/scripting/envtest.sc b/compiler/test-resources/scripting/envtest.sc new file mode 100755 index 000000000000..b2fde1b32339 --- /dev/null +++ b/compiler/test-resources/scripting/envtest.sc @@ -0,0 +1,2 @@ +def main(args: Array[String]): Unit = + println("Hello " + util.Properties.propOrNull("key")) diff --git a/compiler/test-resources/scripting/envtest.scala b/compiler/test-resources/scripting/envtest.scala new file mode 100644 index 000000000000..bf416c9519ce --- /dev/null +++ b/compiler/test-resources/scripting/envtest.scala @@ -0,0 +1,4 @@ +package run + +object envtest extends App: + println("Hello " + sys.props("key")) diff --git a/compiler/test/dotty/tools/repl/EnvPropsTest.scala b/compiler/test/dotty/tools/repl/EnvPropsTest.scala new file mode 100644 index 000000000000..ccb755852465 --- /dev/null +++ b/compiler/test/dotty/tools/repl/EnvPropsTest.scala @@ -0,0 +1,17 @@ +package dotty.tools.repl + +import org.junit.Assert._ +import org.junit.Test + +class EnvPropsTest extends ReplTest(options = Array("-J-Dkey=value", "-Dkey2=value2")) { + @Test def fromDashJDashD = fromInitialState { implicit s => + run("util.Properties.propOrNull(\"key\")") + assertTrue(storedOutput().contains("val res0: String = value")) + } + + @Test def fromDashD = fromInitialState { implicit s => + run("util.Properties.propOrNull(\"key2\")") + assertTrue(storedOutput().contains("val res0: String = value2")) + } +} + diff --git a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala index eaa5fe80dc07..00d515185a96 100644 --- a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala +++ b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala @@ -7,6 +7,7 @@ import java.nio.file.{Path, Paths, Files} import scala.sys.process._ import org.junit.Test +import org.junit.Assert.assertEquals import vulpix.TestConfiguration @@ -28,13 +29,13 @@ class BashScriptsTests: printf("scalac path: [%s]\n", scalacPath) lazy val expectedOutput = List( - "arg 0:[a]", - "arg 1:[b]", - "arg 2:[c]", - "arg 3:[-repl]", - "arg 4:[-run]", - "arg 5:[-script]", - "arg 6:[-debug]", + "arg 0:[a]", + "arg 1:[b]", + "arg 2:[c]", + "arg 3:[-repl]", + "arg 4:[-run]", + "arg 5:[-script]", + "arg 6:[-debug]", ) lazy val testScriptArgs = Seq( "a", "b", "c", "-repl", "-run", "-script", "-debug" @@ -56,6 +57,38 @@ class BashScriptsTests: if fail then assert(stdout == expectedOutput) + /* verify `dist/bin/scala` with -J setting */ + @Test def verifyScJProperty = + val commandline = Seq(scalaPath, "-J-Dkey=World", testFiles.find(_.getName == "envtest.sc").get.absPath).mkString(" ") + val (validTest, exitCode, stdout, stderr) = bashCommand(commandline) + assertEquals(stdout.mkString("/n"), "Hello World") + + /* verify `dist/bin/scala` with -J setting */ + @Test def verifyScalaJProperty = + val commandline = Seq(scalaPath, "-J-Dkey=World3", testFiles.find(_.getName == "envtest.scala").get.absPath).mkString(" ") + val (validTest, exitCode, stdout, stderr) = bashCommand(commandline) + assertEquals(stdout.mkString("/n"), "Hello World3") + + /* verify `dist/bin/scala` with -D setting */ + @Test def verifyScDProperty = + val commandline = Seq(scalaPath, "-Dkey=World3", testFiles.find(_.getName == "envtest.sc").get.absPath).mkString(" ") + val (validTest, exitCode, stdout, stderr) = bashCommand(commandline) + assertEquals(stdout.mkString("/n"), "Hello World3") + + /* verify `dist/bin/scala` with -D setting */ + @Test def verifyScalaDProperty = + val commandline = Seq(scalaPath, "-Dkey=World4", testFiles.find(_.getName == "envtest.scala").get.absPath).mkString(" ") + val (validTest, exitCode, stdout, stderr) = bashCommand(commandline) + assertEquals(stdout.mkString("/n"), "Hello World4") + + /* verify `dist/bin/scala` with -D setting */ + @Test def saveAndRunWithDProperty = + val commandline = Seq(scalaPath, "-save", testFiles.find(_.getName == "envtest.scala").get.absPath).mkString(" ") + val (_, _, _, _) = bashCommand(commandline) + val commandline2 = Seq(scalaPath, "-Dkey=World5", testFiles.find(_.getName == "envtest.jar").get.absPath).mkString(" ") + val (validTest, exitCode, stdout, stderr) = bashCommand(commandline2) + assertEquals(stdout.mkString("/n"), "Hello World5") + /* verify `dist/bin/scala` non-interference with command line args following script name */ @Test def verifyScalaArgs = val commandline = (Seq("SCALA_OPTS= ", scalaPath, showArgsScript) ++ testScriptArgs).mkString(" ") @@ -73,7 +106,7 @@ class BashScriptsTests: assert(stdout == expectedOutput) /* - * verify that scriptPath.sc sees a valid script.path property, + * verify that scriptPath.sc sees a valid script.path property, * and that it's value is the path to "scriptPath.sc". */ @Test def verifyScriptPathProperty = @@ -194,7 +227,7 @@ class BashScriptsTests: val envPairs = testEnvPairs ++ additionalEnvPairs val proc = Process(cmd, None, envPairs *) val exitVal = proc ! ProcessLogger ( - (out: String) => stdout ::= out, + (out: String) => stdout ::= out, (err: String) => stderr ::= err ) val validTest = exitVal == 0 && ! stderr.exists(_.contains("Permission denied")) diff --git a/dist/bin/scala b/dist/bin/scala index 5ae7761b69c5..8a87d6d0d8a0 100755 --- a/dist/bin/scala +++ b/dist/bin/scala @@ -28,10 +28,34 @@ fi source "$PROG_HOME/bin/common" +while [[ $# -gt 0 ]]; do + case "$1" in + -D*) + # pass to scala as well: otherwise we lose it sometimes when we + # need it, e.g. communicating with a server compiler. + addJava "$1" + addScala "$1" + # respect user-supplied -Dscala.usejavacp + shift + ;; + -J*) + # as with -D, pass to scala even though it will almost + # never be used. + addJava "${1:2}" + addScala "$1" + shift + ;; + *) + addScala "$1" + shift + ;; + esac +done + # exec here would prevent onExit from being called, leaving terminal in unusable state compilerJavaClasspathArgs [ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405 -eval "\"$JAVACMD\"" "-Dscala.home=$PROG_HOME" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "$@" +eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=$PROG_HOME" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}" scala_exit_status=$? From aa998859ed591fba46473c8ecaa6edf867394caf Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Thu, 9 Dec 2021 17:37:45 +0100 Subject: [PATCH 0901/1244] Enable scripting tests --- .../src/dotty/tools/MainGenericRunner.scala | 2 +- .../test-resources/scripting/classpathReport.sc | 2 +- .../test-resources/scripting/unglobClasspath.sc | 2 +- .../test/dotty/tools/repl/EnvPropsTest.scala | 17 ----------------- .../dotty/tools/scripting/ClasspathTests.scala | 6 +++--- 5 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 compiler/test/dotty/tools/repl/EnvPropsTest.scala diff --git a/compiler/src/dotty/tools/MainGenericRunner.scala b/compiler/src/dotty/tools/MainGenericRunner.scala index 2e634645fddc..fbc947ce175a 100644 --- a/compiler/src/dotty/tools/MainGenericRunner.scala +++ b/compiler/src/dotty/tools/MainGenericRunner.scala @@ -157,7 +157,7 @@ object MainGenericRunner { process(tail, newSettings.withResidualArgs(arg)) def main(args: Array[String]): Unit = - val scalaOpts = envOrNone("SCALA_OPTS").toArray.flatMap(_.split(" ")) + val scalaOpts = envOrNone("SCALA_OPTS").toArray.flatMap(_.split(" ")).filter(_.nonEmpty) val allArgs = scalaOpts ++ args val settings = process(allArgs.toList, Settings()) if settings.exitCode != 0 then System.exit(settings.exitCode) diff --git a/compiler/test-resources/scripting/classpathReport.sc b/compiler/test-resources/scripting/classpathReport.sc index e7b2f7067a1f..2a240d2fc3a0 100755 --- a/compiler/test-resources/scripting/classpathReport.sc +++ b/compiler/test-resources/scripting/classpathReport.sc @@ -1,4 +1,4 @@ -#!dist/target/pack/bin/scala -classpath dist/target/pack/lib/* +#!/usr/bin/env -S bin/scala -classpath 'dist/target/pack/lib/*' import java.nio.file.Paths diff --git a/compiler/test-resources/scripting/unglobClasspath.sc b/compiler/test-resources/scripting/unglobClasspath.sc index 796697cdedf2..d05ff78435b3 100755 --- a/compiler/test-resources/scripting/unglobClasspath.sc +++ b/compiler/test-resources/scripting/unglobClasspath.sc @@ -1,4 +1,4 @@ -#!bin/scala -classpath 'dist/target/pack/lib/*' +#!/usr/bin/env -S bin/scala -classpath 'dist/target/pack/lib/*' // won't compile unless the hashbang line sets classpath import org.jline.terminal.Terminal diff --git a/compiler/test/dotty/tools/repl/EnvPropsTest.scala b/compiler/test/dotty/tools/repl/EnvPropsTest.scala deleted file mode 100644 index ccb755852465..000000000000 --- a/compiler/test/dotty/tools/repl/EnvPropsTest.scala +++ /dev/null @@ -1,17 +0,0 @@ -package dotty.tools.repl - -import org.junit.Assert._ -import org.junit.Test - -class EnvPropsTest extends ReplTest(options = Array("-J-Dkey=value", "-Dkey2=value2")) { - @Test def fromDashJDashD = fromInitialState { implicit s => - run("util.Properties.propOrNull(\"key\")") - assertTrue(storedOutput().contains("val res0: String = value")) - } - - @Test def fromDashD = fromInitialState { implicit s => - run("util.Properties.propOrNull(\"key2\")") - assertTrue(storedOutput().contains("val res0: String = value2")) - } -} - diff --git a/compiler/test/dotty/tools/scripting/ClasspathTests.scala b/compiler/test/dotty/tools/scripting/ClasspathTests.scala index 82b6affe0c02..d755789543a3 100755 --- a/compiler/test/dotty/tools/scripting/ClasspathTests.scala +++ b/compiler/test/dotty/tools/scripting/ClasspathTests.scala @@ -41,7 +41,7 @@ class ClasspathTests: cmd.foreach { printf("[%s]\n", _) } - // test script reports the classpath it sees + // test script reports the classpath it sees val scriptOutput = exec(cmd:_*) val scriptCwd = findTaggedLine("cwd", scriptOutput) printf("script ran in directory [%s]\n", scriptCwd) @@ -49,7 +49,7 @@ class ClasspathTests: val hashbangClasspathJars = scriptCp.split(psep).map { _.getName }.sorted.distinct val packlibJars = listJars(s"$scriptCwd/$packLibDir").sorted.distinct - + printf("%d jar files in dist/target/pack/lib\n", packlibJars.size) printf("%d test script jars in classpath\n", hashbangClasspathJars.size) @@ -78,7 +78,7 @@ class ClasspathTests: cmd.foreach { printf("[%s]\n", _) } - // test script reports the classpath it sees + // test script reports the classpath it sees val scriptOutput = exec(cmd:_*) val scriptCp = findTaggedLine("unglobbed classpath", scriptOutput) val classpathJars = scriptCp.split(psep).map { _.getName }.sorted.distinct From dbf8781e14df37821c5dac5ceb5b898189103a05 Mon Sep 17 00:00:00 2001 From: philwalk Date: Mon, 13 Dec 2021 07:39:14 -0700 Subject: [PATCH 0902/1244] Create BashScriptsTests.scala This sets `javaHome` at the head of the PATH for `bashCommands`. --- .../dotty/tools/scripting/BashScriptsTests.scala | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala index 00d515185a96..30e824d760c7 100644 --- a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala +++ b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala @@ -169,6 +169,7 @@ class BashScriptsTests: def exists: Boolean = s.toPath.toFile.exists def name: String = s.toFile.getName def dropExtension: String = s.reverse.dropWhile(_ != '.').drop(1).reverse + def parent(up: Int): String = s.norm.split("/").reverse.drop(up).reverse.mkString("/") } extension(p: Path) { @@ -203,7 +204,7 @@ class BashScriptsTests: if scalacPath.isFile then scalacPath.replaceAll("/bin/scalac", "") else envOrElse("SCALA_HOME", "").norm - lazy val javaHome = envOrElse("JAVA_HOME", "").norm + lazy val javaHome = whichJava.parent(2) lazy val testEnvPairs = List( ("JAVA_HOME", javaHome), @@ -211,14 +212,12 @@ class BashScriptsTests: ("PATH", adjustedPath), ).filter { case (name, valu) => valu.nonEmpty } - lazy val whichBash: String = - var whichBash = "" - if osname.startsWith("windows") then - whichBash = which("bash.exe") - else - whichBash = which("bash") + lazy val whichBash: String = whichExe("bash") + lazy val whichJava: String = whichExe("java") - whichBash + def whichExe(basename: String): String = + val exeName = if (osname.toLowerCase.startsWith("windows")) s"$basename.exe" else basename + which(exeName) def bashCommand(cmdstr: String, additionalEnvPairs: List[(String, String)] = Nil): (Boolean, Int, Seq[String], Seq[String]) = { var (stdout, stderr) = (List.empty[String], List.empty[String]) From 74d09c0571f7c72c51ec435310e1ef18dd744b52 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 6 Dec 2021 10:25:10 +0100 Subject: [PATCH 0903/1244] Traverse the types to find undesired references Undesired references can be to deprecated or experimental terms or types. Fixes #14034 --- .../tools/backend/jvm/BTypesFromSymbols.scala | 2 +- .../src/dotty/tools/dotc/typer/RefChecks.scala | 15 ++++++++++++++- tests/neg-custom-args/deprecation/14034b.scala | 14 ++++++++++++++ tests/neg-custom-args/no-experimental/14034.scala | 12 ++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 tests/neg-custom-args/deprecation/14034b.scala create mode 100644 tests/neg-custom-args/no-experimental/14034.scala diff --git a/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala b/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala index 78dfd8e0a869..25a05077626a 100644 --- a/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala +++ b/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala @@ -5,7 +5,7 @@ package jvm import scala.tools.asm import scala.annotation.threadUnsafe import scala.collection.mutable -import scala.collection.generic.Clearable +import scala.collection.mutable.Clearable import dotty.tools.dotc.core.Flags._ import dotty.tools.dotc.core.Contexts._ diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala index 4c20f5821ca4..b89205a1b666 100644 --- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala @@ -1339,7 +1339,20 @@ class RefChecks extends MiniPhase { thisPhase => } override def transformTypeTree(tree: TypeTree)(using Context): TypeTree = { - checkExperimental(tree.symbol, tree.srcPos) + object CheckExperimental extends TypeTraverser { + def traverse(tp: Type): Unit = + tp match { + case tp: TypeRef => + checkDeprecated(tp.symbol, tree.srcPos) + checkExperimental(tp.symbol, tree.srcPos) + case tp: TermRef => + checkDeprecated(tp.symbol, tree.srcPos) + checkExperimental(tp.symbol, tree.srcPos) + case _ => + traverseChildren(tp) + } + } + CheckExperimental.traverse(tree.tpe) tree } diff --git a/tests/neg-custom-args/deprecation/14034b.scala b/tests/neg-custom-args/deprecation/14034b.scala new file mode 100644 index 000000000000..d22a945fe10d --- /dev/null +++ b/tests/neg-custom-args/deprecation/14034b.scala @@ -0,0 +1,14 @@ + +@deprecated trait Exp +@deprecated val exp = 1 + +def test1 = exp // error +def test2(a: Exp) = () // error + +type Foo0 = Exp // error +type Foo = Option[Exp] // error +type Bar = Option[exp.type] // error +type Baz = Exp | Int // error +type Quux = [X] =>> X match // error + case Exp => Int +type Quuz[A <: Exp] = Int // error diff --git a/tests/neg-custom-args/no-experimental/14034.scala b/tests/neg-custom-args/no-experimental/14034.scala new file mode 100644 index 000000000000..c0b4cc6899db --- /dev/null +++ b/tests/neg-custom-args/no-experimental/14034.scala @@ -0,0 +1,12 @@ +import annotation.experimental + +@experimental trait Exp +@experimental val exp = 1 + +type Foo0 = Exp // error +type Foo = Option[Exp] // error +type Bar = Option[exp.type] // error +type Baz = Exp | Int // error +type Quux = [X] =>> X match // error + case Exp => Int +type Quuz[A <: Exp] = Int // error From 887d35886c4066becc008b9fef1f0f685baba35e Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 10 Dec 2021 11:42:42 +0100 Subject: [PATCH 0904/1244] Use foreachPart --- .../dotty/tools/dotc/typer/RefChecks.scala | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala index b89205a1b666..dcc4ac09d5ec 100644 --- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala @@ -1339,20 +1339,16 @@ class RefChecks extends MiniPhase { thisPhase => } override def transformTypeTree(tree: TypeTree)(using Context): TypeTree = { - object CheckExperimental extends TypeTraverser { - def traverse(tp: Type): Unit = - tp match { - case tp: TypeRef => - checkDeprecated(tp.symbol, tree.srcPos) - checkExperimental(tp.symbol, tree.srcPos) - case tp: TermRef => - checkDeprecated(tp.symbol, tree.srcPos) - checkExperimental(tp.symbol, tree.srcPos) - case _ => - traverseChildren(tp) - } + val tpe = tree.tpe + tpe.foreachPart { + case TypeRef(_, sym: Symbol) => + checkDeprecated(sym, tree.srcPos) + checkExperimental(sym, tree.srcPos) + case TermRef(_, sym: Symbol) => + checkDeprecated(sym, tree.srcPos) + checkExperimental(sym, tree.srcPos) + case _ => } - CheckExperimental.traverse(tree.tpe) tree } From 626f17e6f081d31cc4bd190743d1154bcd1c0197 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 13 Dec 2021 18:15:57 +0000 Subject: [PATCH 0905/1244] Revert to fix false positive reachability warnings --- .../dotty/tools/dotc/transform/patmat/Space.scala | 5 +++-- tests/neg-custom-args/fatal-warnings/i8711.check | 12 ++++++------ tests/patmat/i13485.check | 1 - tests/patmat/i13485.scala | 2 +- tests/patmat/i13931.scala | 4 ++++ 5 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 tests/patmat/i13931.scala diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala index 7fc2ef886c52..84345f095ad9 100644 --- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala +++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala @@ -959,8 +959,9 @@ class SpaceEngine(using Context) extends SpaceLogic { if prev == Empty && covered == Empty then // defer until a case is reachable deferred ::= pat else { - for (pat <- deferred.reverseIterator) - report.warning(MatchCaseUnreachable(), pat.srcPos) + // FIXME: These should be emitted, but reverted for i13931 + //for (pat <- deferred.reverseIterator) + // report.warning(MatchCaseUnreachable(), pat.srcPos) if pat != EmptyTree // rethrow case of catch uses EmptyTree && isSubspace(covered, prev) then { diff --git a/tests/neg-custom-args/fatal-warnings/i8711.check b/tests/neg-custom-args/fatal-warnings/i8711.check index 0035af0755d4..0abda7a77ed6 100644 --- a/tests/neg-custom-args/fatal-warnings/i8711.check +++ b/tests/neg-custom-args/fatal-warnings/i8711.check @@ -1,8 +1,8 @@ --- [E030] Match case Unreachable Error: tests/neg-custom-args/fatal-warnings/i8711.scala:7:9 --------------------------- +-- Error: tests/neg-custom-args/fatal-warnings/i8711.scala:7:9 --------------------------------------------------------- 7 | case x: B => x // error: this case is unreachable since class A is not a subclass of class B - | ^^^^ - | Unreachable case --- [E030] Match case Unreachable Error: tests/neg-custom-args/fatal-warnings/i8711.scala:12:9 -------------------------- + | ^ + | this case is unreachable since type A and class B are unrelated +-- Error: tests/neg-custom-args/fatal-warnings/i8711.scala:12:9 -------------------------------------------------------- 12 | case x: C => x // error - | ^^^^ - | Unreachable case + | ^ + | this case is unreachable since type A | B and class C are unrelated diff --git a/tests/patmat/i13485.check b/tests/patmat/i13485.check index f9d066905a86..f05a4c6c0788 100644 --- a/tests/patmat/i13485.check +++ b/tests/patmat/i13485.check @@ -1,2 +1 @@ -11: Match case Unreachable 16: Match case Unreachable diff --git a/tests/patmat/i13485.scala b/tests/patmat/i13485.scala index 72cc3a3d2cd3..2c8ef5547704 100644 --- a/tests/patmat/i13485.scala +++ b/tests/patmat/i13485.scala @@ -8,7 +8,7 @@ sealed trait Foo class Bar def test1(bar: Bar) = bar match - case _: Foo => 1 + case _: Foo => 1 // FIXME: this is unreachable, but reverted for i13931 case _: Bar => 2 def test2(bar: Bar) = bar match diff --git a/tests/patmat/i13931.scala b/tests/patmat/i13931.scala new file mode 100644 index 000000000000..b6c8ba6accd8 --- /dev/null +++ b/tests/patmat/i13931.scala @@ -0,0 +1,4 @@ +class Test: + def test = Vector() match + case Seq() => println("empty") + case _ => println("non-empty") From dbf2dd679d5d6d3735b9bf7d3c1a01e1d0c9893c Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 6 Dec 2021 12:38:03 +0100 Subject: [PATCH 0906/1244] fix #13994: initialise inline ctx in lateEnter --- compiler/src/dotty/tools/dotc/Run.scala | 33 +++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala index b9552d97fca7..751973065d0a 100644 --- a/compiler/src/dotty/tools/dotc/Run.scala +++ b/compiler/src/dotty/tools/dotc/Run.scala @@ -9,7 +9,7 @@ import Types._ import Scopes._ import Names.Name import Denotations.Denotation -import typer.Typer +import typer.{Typer, PrepareInlineable} import typer.ImportInfo._ import Decorators._ import io.{AbstractFile, PlainFile, VirtualFile} @@ -303,17 +303,30 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint .withRootImports def process()(using Context) = { - unit.untpdTree = + + def parseSource()(using Context) = if (unit.isJava) new JavaParser(unit.source).parse() else new Parser(unit.source).parse() - ctx.typer.lateEnter(unit.untpdTree) - def processUnit() = { - unit.tpdTree = ctx.typer.typedExpr(unit.untpdTree) - val phase = new transform.SetRootTree() - phase.run - } - if (typeCheck) - if (compiling) finalizeActions += (() => processUnit()) else processUnit() + + def enterTrees()(using Context) = + ctx.typer.lateEnter(unit.untpdTree) + def typeCheckUnit()(using Context) = + unit.tpdTree = ctx.typer.typedExpr(unit.untpdTree) + val phase = new transform.SetRootTree() + phase.run + if typeCheck then + val typerCtx: Context = + // typer phase allows implicits to be searched + ctx.withPhase(Phases.typerPhase) + if compiling then finalizeActions += (() => typeCheckUnit()(using typerCtx)) + else typeCheckUnit()(using typerCtx) + + unit.untpdTree = parseSource() + val namerCtx = + // inline body annotations are set in namer, capturing the current context + // we need to prepare the context for inlining. + if unit.isJava then ctx else PrepareInlineable.initContext(ctx) + enterTrees()(using namerCtx) } process()(using unitCtx) } From c2f24e68a96ea64802ba4532c19be68fbbd567b6 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 6 Dec 2021 18:40:12 +0100 Subject: [PATCH 0907/1244] reproduce #13994 in cmdTest --- compiler/src/dotty/tools/dotc/Run.scala | 8 +++--- project/scripts/bootstrapCmdTests | 9 +++++++ project/scripts/cmdTestsCommon.inc.sh | 4 ++- project/scripts/sbt | 15 +++++++++-- tests/cmdTest-sbt-tests/README.md | 7 +++++ .../sourcepath-with-inline/build.sbt | 17 ++++++++++++ .../changes/zz.new.scala | 7 +++++ .../changes/zz.original.scala | 6 +++++ .../project/DottyInjectedPlugin.scala | 27 +++++++++++++++++++ .../project/build.properties | 1 + .../src/main/scala/a/Bar.scala | 5 ++++ 11 files changed, 98 insertions(+), 8 deletions(-) create mode 100644 tests/cmdTest-sbt-tests/README.md create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline/build.sbt create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.new.scala create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.original.scala create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline/project/DottyInjectedPlugin.scala create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/Bar.scala diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala index 751973065d0a..e439ebfd60f7 100644 --- a/compiler/src/dotty/tools/dotc/Run.scala +++ b/compiler/src/dotty/tools/dotc/Run.scala @@ -304,10 +304,6 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint def process()(using Context) = { - def parseSource()(using Context) = - if (unit.isJava) new JavaParser(unit.source).parse() - else new Parser(unit.source).parse() - def enterTrees()(using Context) = ctx.typer.lateEnter(unit.untpdTree) def typeCheckUnit()(using Context) = @@ -321,7 +317,9 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint if compiling then finalizeActions += (() => typeCheckUnit()(using typerCtx)) else typeCheckUnit()(using typerCtx) - unit.untpdTree = parseSource() + unit.untpdTree = + if (unit.isJava) new JavaParser(unit.source).parse() + else new Parser(unit.source).parse() val namerCtx = // inline body annotations are set in namer, capturing the current context // we need to prepare the context for inlining. diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrapCmdTests index 8c49983613b1..939a67183b7e 100755 --- a/project/scripts/bootstrapCmdTests +++ b/project/scripts/bootstrapCmdTests @@ -87,3 +87,12 @@ clear_out "$OUT" ./bin/scalac -d "$OUT/out.jar" tests/pos/i12973.scala echo "Bug12973().check" | TERM=dumb ./bin/scala -cp "$OUT/out.jar" > "$tmp" 2>&1 grep -qe "Bug12973 is fixed" "$tmp" + +echo "testing -sourcepath with inlining" +cwd=$(pwd) +java_prop="-Dpack.version.file=$cwd/dist/target/pack/VERSION" +sbt_test_command=";clean;prepareSources;compile;copyChanges;compile" +(cd "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline" && "$SBT" "$java_prop" "$sbt_test_command") +rm -rf "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/target" +rm -rf "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/target" +rm -f "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/zz.scala" diff --git a/project/scripts/cmdTestsCommon.inc.sh b/project/scripts/cmdTestsCommon.inc.sh index dc81a3e35b52..587dd3527bd2 100644 --- a/project/scripts/cmdTestsCommon.inc.sh +++ b/project/scripts/cmdTestsCommon.inc.sh @@ -1,6 +1,8 @@ set -eux -SBT="./project/scripts/sbt" # if run on CI +ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/../.." + +SBT="$ROOT/project/scripts/sbt" # if run on CI # SBT="sbt" # if run locally SOURCE="tests/pos/HelloWorld.scala" diff --git a/project/scripts/sbt b/project/scripts/sbt index 8c6f5aa1c280..9184056dd3b8 100755 --- a/project/scripts/sbt +++ b/project/scripts/sbt @@ -2,12 +2,23 @@ set -e # Usage: -# ./sbt +# ./sbt -CMD="${1:?Missing sbt command}" +declare -a sys_props +declare -a sbt_commands + +while [[ $# -gt 0 ]]; do + case "$1" in + -D*) sys_props+=("$1") && shift ;; + *) sbt_commands+=("$1") && shift ;; + esac +done + +CMD="${sbt_commands[0]:?Missing sbt command}" # run sbt with the supplied arg sbt -J-XX:ReservedCodeCacheSize=512m \ -DSBT_PGP_USE_GPG=false \ + "${sys_props[@]}" \ -no-colors \ "$CMD" diff --git a/tests/cmdTest-sbt-tests/README.md b/tests/cmdTest-sbt-tests/README.md new file mode 100644 index 000000000000..3738c0861fb1 --- /dev/null +++ b/tests/cmdTest-sbt-tests/README.md @@ -0,0 +1,7 @@ +# Readme + +Do not use this directory for testing sbt projects in general, add a test case to `dotty/sbt-test` + +This directory is for sbt tests that can not be reproduced with sbt scripted tests. + +Adding a test here will reduce the performance of running all tests. diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/build.sbt b/tests/cmdTest-sbt-tests/sourcepath-with-inline/build.sbt new file mode 100644 index 000000000000..4bff160ff55a --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/build.sbt @@ -0,0 +1,17 @@ +import java.util.Properties + +val prepareSources = taskKey[Unit]("Copy changes to the src directory") +val copyChanges = taskKey[Unit]("Copy changes to the src directory") + +val srcDir = settingKey[File]("The directory to copy changes to") +val changesDir = settingKey[File]("The directory to copy changes from") + +srcDir := (ThisBuild / baseDirectory).value / "src" / "main" / "scala" +changesDir := (ThisBuild / baseDirectory).value / "changes" + +prepareSources := IO.copyFile(changesDir.value / "zz.original.scala", srcDir.value / "a" / "zz.scala") +copyChanges := IO.copyFile(changesDir.value / "zz.new.scala", srcDir.value / "a" / "zz.scala") + +(Compile / scalacOptions) ++= Seq( + "-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(java.io.File.pathSeparator), +) diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.new.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.new.scala new file mode 100644 index 000000000000..fbf5cf7fb5e0 --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.new.scala @@ -0,0 +1,7 @@ +package a + +object Foo: // note that `Foo` is defined in `zz.scala` + class Local + inline def foo(using Local): Nothing = + ??? + ??? diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.original.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.original.scala new file mode 100644 index 000000000000..17a7488ccb1a --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/changes/zz.original.scala @@ -0,0 +1,6 @@ +package a + +object Foo: // note that `Foo` is defined in `zz.scala` + class Local + inline def foo(using Local): Nothing = + ??? diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/DottyInjectedPlugin.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..1cdccf273e9a --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/DottyInjectedPlugin.scala @@ -0,0 +1,27 @@ +import sbt._ +import Keys._ + +import java.util.Properties +import java.io.File + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + private val packProperties = settingKey[Properties]("The properties of the dist/pack command") + + override val projectSettings = Seq( + packProperties := { + val prop = new Properties() + IO + .read(new File(sys.props("pack.version.file"))) + .linesIterator + .foreach { line => + val Array(key, value) = line.split(":=") + prop.setProperty(key, value) + } + prop + }, + scalaVersion := packProperties.value.getProperty("version") + ) +} diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties new file mode 100644 index 000000000000..10fd9eee04ac --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.5.5 diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/Bar.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/Bar.scala new file mode 100644 index 000000000000..79af4eb2cebd --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/Bar.scala @@ -0,0 +1,5 @@ +package a + +object Bar: + given Foo.Local() + def Bar = Foo.foo From e947f063f20b37394f9d2ac4e6c80453af9fe27b Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 13 Dec 2021 13:19:53 +0100 Subject: [PATCH 0908/1244] move lateCompile implementation to Namer --- compiler/src/dotty/tools/dotc/Run.scala | 33 ++++--------- .../src/dotty/tools/dotc/typer/Namer.scala | 47 +++++++++++++++---- 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala index e439ebfd60f7..504cffbe692a 100644 --- a/compiler/src/dotty/tools/dotc/Run.scala +++ b/compiler/src/dotty/tools/dotc/Run.scala @@ -23,8 +23,6 @@ import rewrites.Rewrites import profile.Profiler import printing.XprintMode -import parsing.Parsers.Parser -import parsing.JavaParsers.JavaParser import typer.ImplicitRunInfo import config.Feature import StdNames.nme @@ -302,31 +300,16 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint .setCompilationUnit(unit) .withRootImports - def process()(using Context) = { - - def enterTrees()(using Context) = - ctx.typer.lateEnter(unit.untpdTree) - def typeCheckUnit()(using Context) = - unit.tpdTree = ctx.typer.typedExpr(unit.untpdTree) - val phase = new transform.SetRootTree() - phase.run + def process()(using Context) = + ctx.typer.lateEnterUnit(doTypeCheck => if typeCheck then - val typerCtx: Context = - // typer phase allows implicits to be searched - ctx.withPhase(Phases.typerPhase) - if compiling then finalizeActions += (() => typeCheckUnit()(using typerCtx)) - else typeCheckUnit()(using typerCtx) - - unit.untpdTree = - if (unit.isJava) new JavaParser(unit.source).parse() - else new Parser(unit.source).parse() - val namerCtx = - // inline body annotations are set in namer, capturing the current context - // we need to prepare the context for inlining. - if unit.isJava then ctx else PrepareInlineable.initContext(ctx) - enterTrees()(using namerCtx) + if compiling then finalizeActions += doTypeCheck + else doTypeCheck() + ) + + inContext(unitCtx) { + process() } - process()(using unitCtx) } private sealed trait PrintedTree diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala index 9398b50db5e5..7d428e0fe1c4 100644 --- a/compiler/src/dotty/tools/dotc/typer/Namer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala @@ -18,6 +18,8 @@ import tpd.tpes import Variances.alwaysInvariant import config.{Config, Feature} import config.Printers.typr +import parsing.JavaParsers.JavaParser +import parsing.Parsers.Parser import Annotations._ import Inferencing._ import transform.ValueClasses._ @@ -708,15 +710,44 @@ class Namer { typer: Typer => ctxWithStats } - /** Index symbols in `tree` while asserting the `lateCompile` flag. - * This will cause any old top-level symbol with the same fully qualified - * name as a newly created symbol to be replaced. + /** Parse the source and index symbols in the compilation unit's untpdTree + * while asserting the `lateCompile` flag. This will cause any old + * top-level symbol with the same fully qualified name as a newly created + * symbol to be replaced. + * + * Will call the callback with an implementation of type checking + * That will set the tpdTree and root tree for the compilation unit. */ - def lateEnter(tree: Tree)(using Context): Context = { - val saved = lateCompile - lateCompile = true - try index(tree :: Nil) finally lateCompile = saved - } + def lateEnterUnit(typeCheckCB: (() => Unit) => Unit)(using Context) = + val unit = ctx.compilationUnit + + /** Index symbols in unit.untpdTree with lateCompile flag = true */ + def lateEnter()(using Context): Context = + val saved = lateCompile + lateCompile = true + try index(unit.untpdTree :: Nil) finally lateCompile = saved + + /** Set the tpdTree and root tree of the compilation unit */ + def lateTypeCheck()(using Context) = + unit.tpdTree = typer.typedExpr(unit.untpdTree) + val phase = new transform.SetRootTree() + phase.run + + unit.untpdTree = + if (unit.isJava) new JavaParser(unit.source).parse() + else new Parser(unit.source).parse() + + atPhase(Phases.typerPhase) { + inContext(PrepareInlineable.initContext(ctx)) { + // inline body annotations are set in namer, capturing the current context + // we need to prepare the context for inlining. + lateEnter() + typeCheckCB { () => + lateTypeCheck() + } + } + } + end lateEnterUnit /** The type bound on wildcard imports of an import list, with special values * Nothing if no wildcard imports of this kind exist From 87cfae930a85fe78f5f191ec0f32616d395c2324 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 13 Dec 2021 16:47:03 +0100 Subject: [PATCH 0909/1244] don't load scala version from java properties --- compiler/src/dotty/tools/dotc/Run.scala | 4 +-- project/scripts/bootstrapCmdTests | 17 +++++++++--- project/scripts/cmdTestsCommon.inc.sh | 5 ++++ project/scripts/sbt | 15 ++--------- .../project/DottyInjectedPlugin.scala | 27 ------------------- 5 files changed, 22 insertions(+), 46 deletions(-) delete mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline/project/DottyInjectedPlugin.scala diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala index 504cffbe692a..5c75f0ed8e2c 100644 --- a/compiler/src/dotty/tools/dotc/Run.scala +++ b/compiler/src/dotty/tools/dotc/Run.scala @@ -307,9 +307,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint else doTypeCheck() ) - inContext(unitCtx) { - process() - } + process()(using unitCtx) } private sealed trait PrintedTree diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrapCmdTests index 939a67183b7e..d1ec6138acb3 100755 --- a/project/scripts/bootstrapCmdTests +++ b/project/scripts/bootstrapCmdTests @@ -88,11 +88,22 @@ clear_out "$OUT" echo "Bug12973().check" | TERM=dumb ./bin/scala -cp "$OUT/out.jar" > "$tmp" 2>&1 grep -qe "Bug12973 is fixed" "$tmp" +echo "capturing scala version from dist/target/pack/VERSION" +cwd=$(pwd) +IFS=':=' read -ra versionProps < "$cwd/dist/target/pack/VERSION" # temporarily set IFS to ':=' to split versionProps +[ ${#versionProps[@]} -eq 3 ] && \ + [ ${versionProps[0]} = "version" ] && \ + [ -n ${versionProps[2]} ] || die "Expected non-empty 'version' property in $cwd/dist/target/pack/VERSION" +scala_version=${versionProps[2]} + echo "testing -sourcepath with inlining" +# Here we will test that an inline method symbol loaded from the sourcepath (-sourcepath compiler option) +# will have its `defTree` correctly set when its method body is required for inlining. +# So far I have not found a way to replicate issue https://github.com/lampepfl/dotty/issues/13994 +# with sbt scripted tests, if a way is found, move this test there. cwd=$(pwd) -java_prop="-Dpack.version.file=$cwd/dist/target/pack/VERSION" -sbt_test_command=";clean;prepareSources;compile;copyChanges;compile" -(cd "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline" && "$SBT" "$java_prop" "$sbt_test_command") +sbt_test_command="++${scala_version}!;clean;prepareSources;compile;copyChanges;compile" +(cd "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline" && "$SBT" "$sbt_test_command") rm -rf "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/target" rm -rf "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/target" rm -f "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/zz.scala" diff --git a/project/scripts/cmdTestsCommon.inc.sh b/project/scripts/cmdTestsCommon.inc.sh index 587dd3527bd2..a37ab757c057 100644 --- a/project/scripts/cmdTestsCommon.inc.sh +++ b/project/scripts/cmdTestsCommon.inc.sh @@ -14,6 +14,11 @@ OUT=$(mktemp -d) OUT1=$(mktemp -d) tmp=$(mktemp) +die () { + echo >&2 "$@" + exit 1 +} + clear_out() { local out="$1" diff --git a/project/scripts/sbt b/project/scripts/sbt index 9184056dd3b8..8c6f5aa1c280 100755 --- a/project/scripts/sbt +++ b/project/scripts/sbt @@ -2,23 +2,12 @@ set -e # Usage: -# ./sbt +# ./sbt -declare -a sys_props -declare -a sbt_commands - -while [[ $# -gt 0 ]]; do - case "$1" in - -D*) sys_props+=("$1") && shift ;; - *) sbt_commands+=("$1") && shift ;; - esac -done - -CMD="${sbt_commands[0]:?Missing sbt command}" +CMD="${1:?Missing sbt command}" # run sbt with the supplied arg sbt -J-XX:ReservedCodeCacheSize=512m \ -DSBT_PGP_USE_GPG=false \ - "${sys_props[@]}" \ -no-colors \ "$CMD" diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/DottyInjectedPlugin.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/DottyInjectedPlugin.scala deleted file mode 100644 index 1cdccf273e9a..000000000000 --- a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/DottyInjectedPlugin.scala +++ /dev/null @@ -1,27 +0,0 @@ -import sbt._ -import Keys._ - -import java.util.Properties -import java.io.File - -object DottyInjectedPlugin extends AutoPlugin { - override def requires = plugins.JvmPlugin - override def trigger = allRequirements - - private val packProperties = settingKey[Properties]("The properties of the dist/pack command") - - override val projectSettings = Seq( - packProperties := { - val prop = new Properties() - IO - .read(new File(sys.props("pack.version.file"))) - .linesIterator - .foreach { line => - val Array(key, value) = line.split(":=") - prop.setProperty(key, value) - } - prop - }, - scalaVersion := packProperties.value.getProperty("version") - ) -} From cb28be84603c818f8b9eaeed81b7bf1a26959fd0 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 28 Oct 2021 13:54:39 +0200 Subject: [PATCH 0910/1244] Generalize search for function type in expected type In particular, handle situations like: val x: (Int => Int) & (Int => Int) = x => x which end up arising in at least one test case during type inference after the avoidance fixes in this PR. --- compiler/src/dotty/tools/dotc/core/Types.scala | 18 +++++++----------- .../src/dotty/tools/dotc/typer/Typer.scala | 4 ++-- tests/neg/i11694.scala | 7 +++++++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index b1007a32f5c4..5edb70c4ec53 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -1674,23 +1674,19 @@ object Types { case _ => resultType } - /** Find the function type in union. - * If there are multiple function types, NoType is returned. + /** Determine the expected function type from the prototype. If multiple + * function types are found in a union or intersection, their intersection + * is returned. If no function type is found, Any is returned. */ - def findFunctionTypeInUnion(using Context): Type = this match { - case t: OrType => - val t1 = t.tp1.findFunctionTypeInUnion - if t1 == NoType then t.tp2.findFunctionTypeInUnion else - val t2 = t.tp2.findFunctionTypeInUnion - // Returen NoType if the union contains multiple function types - if t2 == NoType then t1 else NoType + def findFunctionType(using Context): Type = dealias match + case tp: AndOrType => + tp.tp1.findFunctionType & tp.tp2.findFunctionType case t if defn.isNonRefinedFunction(t) => t case t @ SAMType(_) => t case _ => - NoType - } + defn.AnyType /** This type seen as a TypeBounds */ final def bounds(using Context): TypeBounds = this match { diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 1ba0c0efeba4..fa26d0976d54 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1169,7 +1169,7 @@ class Typer extends Namer pt1 match { case tp: TypeParamRef => decomposeProtoFunction(ctx.typerState.constraint.entry(tp).bounds.hi, defaultArity, pos) - case _ => pt1.findFunctionTypeInUnion match { + case _ => pt1.findFunctionType match { case pt1 if defn.isNonRefinedFunction(pt1) => // if expected parameter type(s) are wildcards, approximate from below. // if expected result type is a wildcard, approximate from above. @@ -1444,7 +1444,7 @@ class Typer extends Namer if (tree.tpt.isEmpty) meth1.tpe.widen match { case mt: MethodType => - pt.findFunctionTypeInUnion match { + pt.findFunctionType match { case pt @ SAMType(sam) if !defn.isFunctionType(pt) && mt <:< sam => // SAMs of the form C[?] where C is a class cannot be conversion targets. diff --git a/tests/neg/i11694.scala b/tests/neg/i11694.scala index 5bbad1a83ce2..67138fd5a7eb 100644 --- a/tests/neg/i11694.scala +++ b/tests/neg/i11694.scala @@ -4,12 +4,19 @@ def test1 = { def f21: (Int => Int) | Null = x => x + 1 def f22: Null | (Int => Int) = x => x + 1 + + def f31: (Int => Int) | (Int => Int) = x => x + 1 + def f32: (Int => Int) | (Int => Int) | Unit = x => x + 1 + + def f41: (Int => Int) & (Int => Int) = x => x + 1 + def f42: (Int => Int) & (Int => Int) & Any = x => x + 1 } def test2 = { def f1: (Int => String) | (Int => Int) | Null = x => x + 1 // error def f2: (Int => String) | Function[String, Int] | Null = x => "" + x // error def f3: Function[Int, Int] | Function[String, Int] | Null = x => x + 1 // error + def f4: (Int => Int) & (Int => Int) & Unit = x => x + 1 // error } def test3 = { From 452a1c9b333fb8b934184b5af11306355b389ff9 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 28 Oct 2021 16:57:02 +0200 Subject: [PATCH 0911/1244] ApproximatingTypeMap: fix skolem handling By definition, a skolem is neither a subtype nor a supertype of a different skolem, so regardless of the variance, we shouldn't return a new skolem when approximating an existing skolem. Fixing derivedSkolemType to not do this lets us remove a special-case in `avoid`. --- compiler/src/dotty/tools/dotc/core/TypeOps.scala | 2 -- compiler/src/dotty/tools/dotc/core/Types.scala | 13 +++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala index 451b567dc771..1761def64e3e 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeOps.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeOps.scala @@ -459,8 +459,6 @@ object TypeOps: // Therefore, either they don't appear in the type to be avoided, or // it must be a class that encloses the block whose type is to be avoided. tp - case tp: SkolemType if partsToAvoid(Nil, tp.info).nonEmpty => - range(defn.NothingType, apply(tp.info)) case tp: TypeVar if mapCtx.typerState.constraint.contains(tp) => val lo = TypeComparer.instanceType( tp.origin, fromBelow = variance > 0 || variance == 0 && tp.hasLowerBound)(using mapCtx) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 5edb70c4ec53..3d9ea51544a2 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -5941,12 +5941,13 @@ object Types { case Range(lo, hi) => range(bound.bounds.lo, bound.bounds.hi) case _ => tp.derivedMatchType(bound, scrutinee, cases) - override protected def derivedSkolemType(tp: SkolemType, info: Type): Type = info match { - case Range(lo, hi) => - range(tp.derivedSkolemType(lo), tp.derivedSkolemType(hi)) - case _ => - tp.derivedSkolemType(info) - } + override protected def derivedSkolemType(tp: SkolemType, info: Type): Type = + if info eq tp.info then tp + // By definition, a skolem is neither a subtype nor a supertype of a + // different skolem. So, regardless of `variance`, we cannot return a + // fresh skolem when approximating an existing skolem, we can only return + // a range. + else range(defn.NothingType, info) override protected def derivedClassInfo(tp: ClassInfo, pre: Type): Type = { assert(!isRange(pre)) From e2053596cbe89568e2ab9365beb317b16f3ea0bb Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 6 Nov 2021 16:43:43 +0100 Subject: [PATCH 0912/1244] avoidCaptures: handle local types, not just terms Not that the added test case still infers `Local` for the type of `a` because avoidance doesn't handle type variables correctly and because the nesting level checks are too coarse, this doesn't lead to an error because the check for forward references in TreePickler is currently disabled. All these issues are fixed in later commits of this PR. --- compiler/src/dotty/tools/dotc/core/Types.scala | 4 ++-- tests/pos/i8900a.scala | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 tests/pos/i8900a.scala diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 3d9ea51544a2..e990006540b2 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4715,10 +4715,10 @@ object Types { private def avoidCaptures(tp: Type)(using Context): Type = val problemSyms = new TypeAccumulator[Set[Symbol]]: def apply(syms: Set[Symbol], t: Type): Set[Symbol] = t match - case ref @ TermRef(NoPrefix, _) + case ref: NamedType // AVOIDANCE TODO: Are there other problematic kinds of references? // Our current tests only give us these, but we might need to generalize this. - if ref.symbol.maybeOwner.nestingLevel > nestingLevel => + if (ref.prefix eq NoPrefix) && ref.symbol.maybeOwner.nestingLevel > nestingLevel => syms + ref.symbol case _ => foldOver(syms, t) diff --git a/tests/pos/i8900a.scala b/tests/pos/i8900a.scala new file mode 100644 index 000000000000..d34b3dc34516 --- /dev/null +++ b/tests/pos/i8900a.scala @@ -0,0 +1,11 @@ +class Inv[T](val elem: T) +object Test { + def unwrap[Outer](inv: Inv[Outer]): Outer = inv.elem + def wrap[Inner](i: Inner): Inv[Inner] = new Inv(i) + + val a = unwrap({ + class Local + val local = new Local + wrap(local) + }) +} From 8a74331d0eed9fc9281cf4110285c23e80402964 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 6 Nov 2021 16:43:43 +0100 Subject: [PATCH 0913/1244] Fix nesting level to account for block scopes Previously, the nesting level of a symbol was always equal to the nesting level of its owner incremented by one, but in a situation like i8900a.scala where we have: ... val a = unwrap[?Outer]({ class Local ... the owner of both `?Outer` and `Local` is `a`, and so they ended up with the same level even though `Local` should not leak outside of the block that defines it (i8900a.scala compiled regardless due to the disabled check for forward references in TreePickler re-enabled later in this PR). We rectify this by associating each scope with a level which is always greated than the level of the enclosing scope (repurposing the existing Scope#nestingLevel method which wasn't used for anything), newly created symbols then simply take the level of the current scope (this required tweaking typedCase so that the pattern symbols were typed in the scope were they end up being entered). Also add a `-Yprint-level` option for debugging level-related issues. --- compiler/src/dotty/tools/dotc/Run.scala | 2 +- compiler/src/dotty/tools/dotc/ast/tpd.scala | 3 ++- .../tools/dotc/config/ScalaSettings.scala | 1 + .../src/dotty/tools/dotc/core/Contexts.scala | 4 ++++ .../dotty/tools/dotc/core/Definitions.scala | 7 +++++-- .../src/dotty/tools/dotc/core/Scopes.scala | 17 +++++++-------- .../tools/dotc/core/SymDenotations.scala | 14 ------------- .../dotty/tools/dotc/core/SymbolLoaders.scala | 2 +- .../src/dotty/tools/dotc/core/Symbols.scala | 20 +++++++++--------- .../src/dotty/tools/dotc/core/Types.scala | 6 ++++-- .../dotc/core/classfile/ClassfileParser.scala | 4 ++-- .../core/unpickleScala2/Scala2Unpickler.scala | 2 +- .../tools/dotc/printing/PlainPrinter.scala | 16 +++++++++++--- .../tools/dotc/printing/RefinedPrinter.scala | 10 ++++++++- .../tools/dotc/quoted/MacroExpansion.scala | 2 +- .../tools/dotc/transform/ExpandSAMs.scala | 3 ++- .../dotty/tools/dotc/typer/Implicits.scala | 3 ++- .../src/dotty/tools/dotc/typer/Inliner.scala | 15 +++++++------ .../src/dotty/tools/dotc/typer/Namer.scala | 13 ++++-------- .../src/dotty/tools/dotc/typer/ReTyper.scala | 2 +- .../src/dotty/tools/dotc/typer/Typer.scala | 21 +++++++++++++++---- 21 files changed, 97 insertions(+), 70 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala index 5c75f0ed8e2c..9f7036f64255 100644 --- a/compiler/src/dotty/tools/dotc/Run.scala +++ b/compiler/src/dotty/tools/dotc/Run.scala @@ -68,7 +68,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint protected def rootContext(using Context): Context = { ctx.initialize() ctx.base.setPhasePlan(comp.phases) - val rootScope = new MutableScope + val rootScope = new MutableScope(0) val bootstrap = ctx.fresh .setPeriod(Period(comp.nextRunId, FirstPhaseId)) .setScope(rootScope) diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index 2db0bd6de2d4..39e24208e3e0 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -7,6 +7,7 @@ import typer.ProtoTypes import transform.SymUtils._ import transform.TypeUtils._ import core._ +import Scopes.newScope import util.Spans._, Types._, Contexts._, Constants._, Names._, Flags._, NameOps._ import Symbols._, StdNames._, Annotations._, Trees._, Symbols._ import Decorators._, DenotTransformers._ @@ -344,7 +345,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { } else parents val cls = newNormalizedClassSymbol(owner, tpnme.ANON_CLASS, Synthetic | Final, parents1, - coord = fns.map(_.span).reduceLeft(_ union _)) + newScope, coord = fns.map(_.span).reduceLeft(_ union _)) val constr = newConstructor(cls, Synthetic, Nil, Nil).entered def forwarder(fn: TermSymbol, name: TermName) = { val fwdMeth = fn.copy(cls, name, Synthetic | Method | Final).entered.asTerm diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index e9f5ea07a353..9ae095ae9bca 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -277,6 +277,7 @@ private sealed trait YSettings: val YprintSyms: Setting[Boolean] = BooleanSetting("-Yprint-syms", "When printing trees print info in symbols instead of corresponding info in trees.") val YprintDebug: Setting[Boolean] = BooleanSetting("-Yprint-debug", "When printing trees, print some extra information useful for debugging.") val YprintDebugOwners: Setting[Boolean] = BooleanSetting("-Yprint-debug-owners", "When printing trees, print owners of definitions.") + val YprintLevel: Setting[Boolean] = BooleanSetting("-Yprint-level", "print nesting levels of symbols and type variables.") val YshowPrintErrors: Setting[Boolean] = BooleanSetting("-Yshow-print-errors", "Don't suppress exceptions thrown during tree printing.") val YtestPickler: Setting[Boolean] = BooleanSetting("-Ytest-pickler", "Self-test for pickling functionality; should be used with -Ystop-after:pickler.") val YcheckReentrant: Setting[Boolean] = BooleanSetting("-Ycheck-reentrant", "Check that compiled program does not contain vars that can be accessed from a global root.") diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala index f10a1cc7372c..3e3f8a800ebf 100644 --- a/compiler/src/dotty/tools/dotc/core/Contexts.scala +++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala @@ -270,6 +270,10 @@ object Contexts { if owner != null && owner.isClass then owner.asClass.unforcedDecls else scope + def nestingLevel: Int = + val sc = effectiveScope + if sc != null then sc.nestingLevel else 0 + /** Sourcefile corresponding to given abstract file, memoized */ def getSource(file: AbstractFile, codec: => Codec = Codec(settings.encoding.value)) = { util.Stats.record("Context.getSource") diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 19ddcf7b16fe..464c7900a54f 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -49,7 +49,10 @@ class Definitions { private def newPermanentClassSymbol(owner: Symbol, name: TypeName, flags: FlagSet, infoFn: ClassSymbol => Type) = newClassSymbol(owner, name, flags | Permanent | NoInits | Open, infoFn) - private def enterCompleteClassSymbol(owner: Symbol, name: TypeName, flags: FlagSet, parents: List[TypeRef], decls: Scope = newScope) = + private def enterCompleteClassSymbol(owner: Symbol, name: TypeName, flags: FlagSet, parents: List[TypeRef]): ClassSymbol = + enterCompleteClassSymbol(owner, name, flags, parents, newScope(owner.nestingLevel + 1)) + + private def enterCompleteClassSymbol(owner: Symbol, name: TypeName, flags: FlagSet, parents: List[TypeRef], decls: Scope) = newCompleteClassSymbol(owner, name, flags | Permanent | NoInits | Open, parents, decls).entered private def enterTypeField(cls: ClassSymbol, name: TypeName, flags: FlagSet, scope: MutableScope) = @@ -433,7 +436,7 @@ class Definitions { Any_toString, Any_##, Any_getClass, Any_isInstanceOf, Any_typeTest, Object_eq, Object_ne) @tu lazy val AnyKindClass: ClassSymbol = { - val cls = newCompleteClassSymbol(ScalaPackageClass, tpnme.AnyKind, AbstractFinal | Permanent, Nil) + val cls = newCompleteClassSymbol(ScalaPackageClass, tpnme.AnyKind, AbstractFinal | Permanent, Nil, newScope(0)) if (!ctx.settings.YnoKindPolymorphism.value) // Enable kind-polymorphism by exposing scala.AnyKind cls.entered diff --git a/compiler/src/dotty/tools/dotc/core/Scopes.scala b/compiler/src/dotty/tools/dotc/core/Scopes.scala index 1553093a2b87..ecc61530601d 100644 --- a/compiler/src/dotty/tools/dotc/core/Scopes.scala +++ b/compiler/src/dotty/tools/dotc/core/Scopes.scala @@ -75,7 +75,7 @@ object Scopes { */ def size: Int - /** The number of outer scopes from which symbols are inherited */ + /** The number of scopes enclosing this scope. */ def nestingLevel: Int /** The symbols in this scope in the order they were entered; @@ -193,7 +193,7 @@ object Scopes { * This is necessary because when run from reflection every scope needs to have a * SynchronizedScope as mixin. */ - class MutableScope protected[Scopes](initElems: ScopeEntry, initSize: Int, val nestingLevel: Int = 0) + class MutableScope protected[Scopes](initElems: ScopeEntry, initSize: Int, val nestingLevel: Int) extends Scope { /** Scope shares elements with `base` */ @@ -201,7 +201,7 @@ object Scopes { this(base.lastEntry, base.size, base.nestingLevel + 1) ensureCapacity(MinHashedScopeSize) - def this() = this(null, 0, 0) + def this(nestingLevel: Int) = this(null, 0, nestingLevel) private[dotc] var lastEntry: ScopeEntry = initElems @@ -225,7 +225,7 @@ object Scopes { /** Use specified synthesize for this scope */ def useSynthesizer(s: SymbolSynthesizer): Unit = synthesize = s - protected def newScopeLikeThis(): MutableScope = new MutableScope() + protected def newScopeLikeThis(): MutableScope = new MutableScope(nestingLevel) /** Clone scope, taking care not to force the denotations of any symbols in the scope. */ @@ -440,7 +440,10 @@ object Scopes { } /** Create a new scope */ - def newScope: MutableScope = new MutableScope() + def newScope(using Context): MutableScope = + new MutableScope(ctx.nestingLevel + 1) + + def newScope(nestingLevel: Int): MutableScope = new MutableScope(nestingLevel) /** Create a new scope nested in another one with which it shares its elements */ def newNestedScope(outer: Scope)(using Context): MutableScope = new MutableScope(outer) @@ -468,8 +471,4 @@ object Scopes { override def lookupEntry(name: Name)(using Context): ScopeEntry = null override def lookupNextEntry(entry: ScopeEntry)(using Context): ScopeEntry = null } - - /** A class for error scopes (mutable) - */ - class ErrorScope(owner: Symbol) extends MutableScope } diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala index 7f47f1696cd6..9d55f43dff25 100644 --- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala @@ -1477,14 +1477,6 @@ object SymDenotations { else if is(Contravariant) then Contravariant else EmptyFlags - /** The length of the owner chain of this symbol. 1 for _root_, 0 for NoSymbol */ - def nestingLevel(using Context): Int = - @tailrec def recur(d: SymDenotation, n: Int): Int = d match - case NoDenotation => n - case d: ClassDenotation => d.nestingLevel + n // profit from the cache in ClassDenotation - case _ => recur(d.owner, n + 1) - recur(this, 0) - /** The flags to be used for a type parameter owned by this symbol. * Overridden by ClassDenotation. */ @@ -2323,12 +2315,6 @@ object SymDenotations { override def registeredCompanion_=(c: Symbol) = myCompanion = c - - private var myNestingLevel = -1 - - override def nestingLevel(using Context) = - if myNestingLevel == -1 then myNestingLevel = owner.nestingLevel + 1 - myNestingLevel } /** The denotation of a package class. diff --git a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala index 26e6e659779e..83198ab65857 100644 --- a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala +++ b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala @@ -221,7 +221,7 @@ object SymbolLoaders { /** The scope of a package. This is different from a normal scope * in that names of scope entries are kept in mangled form. */ - final class PackageScope extends MutableScope { + final class PackageScope extends MutableScope(0) { override def newScopeEntry(name: Name, sym: Symbol)(using Context): ScopeEntry = super.newScopeEntry(name.mangled, sym) diff --git a/compiler/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala index e49399ff9791..7f0969d55f07 100644 --- a/compiler/src/dotty/tools/dotc/core/Symbols.scala +++ b/compiler/src/dotty/tools/dotc/core/Symbols.scala @@ -46,7 +46,7 @@ object Symbols { * @param coord The coordinates of the symbol (a position or an index) * @param id A unique identifier of the symbol (unique per ContextBase) */ - class Symbol private[Symbols] (private var myCoord: Coord, val id: Int) + class Symbol private[Symbols] (private var myCoord: Coord, val id: Int, val nestingLevel: Int) extends Designator, ParamInfo, SrcPos, printing.Showable { type ThisName <: Name @@ -368,8 +368,8 @@ object Symbols { type TermSymbol = Symbol { type ThisName = TermName } type TypeSymbol = Symbol { type ThisName = TypeName } - class ClassSymbol private[Symbols] (coord: Coord, val assocFile: AbstractFile, id: Int) - extends Symbol(coord, id) { + class ClassSymbol private[Symbols] (coord: Coord, val assocFile: AbstractFile, id: Int, nestingLevel: Int) + extends Symbol(coord, id, nestingLevel) { type ThisName = TypeName @@ -459,7 +459,7 @@ object Symbols { override protected def prefixString: String = "ClassSymbol" } - @sharable object NoSymbol extends Symbol(NoCoord, 0) { + @sharable object NoSymbol extends Symbol(NoCoord, 0, 0) { override def associatedFile(using Context): AbstractFile = NoSource.file override def recomputeDenot(lastd: SymDenotation)(using Context): SymDenotation = NoDenotation } @@ -516,7 +516,7 @@ object Symbols { info: Type, privateWithin: Symbol = NoSymbol, coord: Coord = NoCoord)(using Context): Symbol { type ThisName = N } = { - val sym = new Symbol(coord, ctx.base.nextSymId).asInstanceOf[Symbol { type ThisName = N }] + val sym = new Symbol(coord, ctx.base.nextSymId, ctx.nestingLevel).asInstanceOf[Symbol { type ThisName = N }] val denot = SymDenotation(sym, owner, name, flags, info, privateWithin) sym.denot = denot sym @@ -534,7 +534,7 @@ object Symbols { coord: Coord = NoCoord, assocFile: AbstractFile = null)(using Context): ClassSymbol = { - val cls = new ClassSymbol(coord, assocFile, ctx.base.nextSymId) + val cls = new ClassSymbol(coord, assocFile, ctx.base.nextSymId, ctx.nestingLevel) val denot = SymDenotation(cls, owner, name, flags, infoFn(cls), privateWithin) cls.denot = denot cls @@ -546,7 +546,7 @@ object Symbols { name: TypeName, flags: FlagSet, parents: List[TypeRef], - decls: Scope = newScope, + decls: Scope, selfInfo: Type = NoType, privateWithin: Symbol = NoSymbol, coord: Coord = NoCoord, @@ -564,7 +564,7 @@ object Symbols { name: TypeName, flags: FlagSet, parentTypes: List[Type], - decls: Scope = newScope, + decls: Scope, selfInfo: Type = NoType, privateWithin: Symbol = NoSymbol, coord: Coord = NoCoord, @@ -580,7 +580,7 @@ object Symbols { } def newRefinedClassSymbol(coord: Coord = NoCoord)(using Context): ClassSymbol = - newCompleteClassSymbol(ctx.owner, tpnme.REFINE_CLASS, NonMember, parents = Nil, coord = coord) + newCompleteClassSymbol(ctx.owner, tpnme.REFINE_CLASS, NonMember, parents = Nil, newScope, coord = coord) /** Create a module symbol with associated module class * from its non-info fields and a function producing the info @@ -646,7 +646,7 @@ object Symbols { name: TermName, modFlags: FlagSet = EmptyFlags, clsFlags: FlagSet = EmptyFlags, - decls: Scope = newScope)(using Context): TermSymbol = + decls: Scope = newScope(0))(using Context): TermSymbol = newCompleteModuleSymbol( owner, name, modFlags | PackageCreationFlags, clsFlags | PackageCreationFlags, diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index e990006540b2..59b8405f0e4c 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4667,7 +4667,7 @@ object Types { * @param origin The parameter that's tracked by the type variable. * @param creatorState The typer state in which the variable was created. */ - final class TypeVar private(initOrigin: TypeParamRef, creatorState: TyperState, nestingLevel: Int) extends CachedProxyType with ValueType { + final class TypeVar private(initOrigin: TypeParamRef, creatorState: TyperState, val nestingLevel: Int) extends CachedProxyType with ValueType { private var currentOrigin = initOrigin @@ -4713,6 +4713,8 @@ object Types { * are nested more deeply than the type variable itself. */ private def avoidCaptures(tp: Type)(using Context): Type = + if ctx.isAfterTyper then + return tp val problemSyms = new TypeAccumulator[Set[Symbol]]: def apply(syms: Set[Symbol], t: Type): Set[Symbol] = t match case ref: NamedType @@ -4806,7 +4808,7 @@ object Types { } object TypeVar: def apply(initOrigin: TypeParamRef, creatorState: TyperState)(using Context) = - new TypeVar(initOrigin, creatorState, ctx.owner.nestingLevel) + new TypeVar(initOrigin, creatorState, ctx.nestingLevel) type TypeVars = SimpleIdentitySet[TypeVar] diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala index 410bc6e591d4..c0140c5b8641 100644 --- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala +++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala @@ -62,8 +62,8 @@ class ClassfileParser( protected val staticModule: Symbol = moduleRoot.sourceModule(using ictx) - protected val instanceScope: MutableScope = newScope // the scope of all instance definitions - protected val staticScope: MutableScope = newScope // the scope of all static definitions + protected val instanceScope: MutableScope = newScope(0) // the scope of all instance definitions + protected val staticScope: MutableScope = newScope(0) // the scope of all static definitions protected var pool: ConstantPool = _ // the classfile's constant pool protected var currentClassName: SimpleName = _ // JVM name of the current class diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index 18f3e0b19d87..305a8a7510df 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -233,7 +233,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas } /** The `decls` scope associated with given symbol */ - protected def symScope(sym: Symbol): Scope = symScopes.getOrElseUpdate(sym, newScope) + protected def symScope(sym: Symbol): Scope = symScopes.getOrElseUpdate(sym, newScope(0)) /** Does entry represent an (internal) symbol */ protected def isSymbolEntry(i: Int)(using Context): Boolean = { diff --git a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala index 3a3fca5e7f90..bc6258398f54 100644 --- a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -29,6 +29,7 @@ class PlainPrinter(_ctx: Context) extends Printer { protected def maxToTextRecursions: Int = 100 protected def showUniqueIds = ctx.settings.uniqid.value || Printer.debugPrintUnique + protected def showNestingLevel = ctx.settings.YprintLevel.value protected final def limiter: MessageLimiter = ctx.property(MessageLimiter).get @@ -155,7 +156,12 @@ class PlainPrinter(_ctx: Context) extends Printer { case tp: TermParamRef => ParamRefNameString(tp) ~ lambdaHash(tp.binder) ~ ".type" case tp: TypeParamRef => - ParamRefNameString(tp) ~ lambdaHash(tp.binder) + val suffix = + if showNestingLevel then + val tvar = ctx.typerState.constraint.typeVarOfParam(tp) + if tvar.exists then s"#${tvar.asInstanceOf[TypeVar].nestingLevel.toString}" else "" + else "" + ParamRefNameString(tp) ~ lambdaHash(tp.binder) ~ suffix case tp: SingletonType => toTextSingleton(tp) case AppliedType(tycon, args) => @@ -271,9 +277,13 @@ class PlainPrinter(_ctx: Context) extends Printer { catch { case ex: NullPointerException => "" } else "" - /** If -uniqid is set, the unique id of symbol, after a # */ + /** A string to append to a symbol composed of: + * - if -uniqid is set, its unique id after a #. + * - if -Yprint-level, its nesting level after a %. + */ protected def idString(sym: Symbol): String = - if (showUniqueIds || Printer.debugPrintUnique) "#" + sym.id else "" + (if (showUniqueIds || Printer.debugPrintUnique) "#" + sym.id else "") + + (if (showNestingLevel) "%" + sym.nestingLevel else "") def nameString(sym: Symbol): String = simpleNameString(sym) + idString(sym) // + "<" + (if (sym.exists) sym.owner else "") + ">" diff --git a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala index ef11ec9434ae..cf5942a178f0 100644 --- a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala +++ b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala @@ -798,7 +798,15 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { protected def optAscription[T >: Untyped](tpt: Tree[T]): Text = optText(tpt)(": " ~ _) private def idText(tree: untpd.Tree): Text = - if showUniqueIds && tree.hasType && tree.symbol.exists then s"#${tree.symbol.id}" else "" + (if showUniqueIds && tree.hasType && tree.symbol.exists then s"#${tree.symbol.id}" else "") ~ + (if showNestingLevel then tree.typeOpt match + case tp: NamedType if !tp.symbol.isStatic => s"%${tp.symbol.nestingLevel}" + case tp: TypeVar => s"%${tp.nestingLevel}" + case tp: TypeParamRef => ctx.typerState.constraint.typeVarOfParam(tp) match + case tvar: TypeVar => s"%${tvar.nestingLevel}" + case _ => "" + case _ => "" + else "") private def useSymbol(tree: untpd.Tree) = tree.hasType && tree.symbol.exists && ctx.settings.YprintSyms.value diff --git a/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala b/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala index 686998a94800..628afe4504bd 100644 --- a/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala +++ b/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala @@ -14,6 +14,6 @@ object MacroExpansion { ctx.property(MacroExpansionPosition) def context(inlinedFrom: tpd.Tree)(using Context): Context = - QuotesCache.init(ctx.fresh).setProperty(MacroExpansionPosition, SourcePosition(inlinedFrom.source, inlinedFrom.span)).setTypeAssigner(new Typer).withSource(inlinedFrom.source) + QuotesCache.init(ctx.fresh).setProperty(MacroExpansionPosition, SourcePosition(inlinedFrom.source, inlinedFrom.span)).setTypeAssigner(new Typer(ctx.nestingLevel + 1)).withSource(inlinedFrom.source) } diff --git a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala index b87686996ebd..ea9e7ede1b9a 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala @@ -3,6 +3,7 @@ package dotc package transform import core._ +import Scopes.newScope import Contexts._, Symbols._, Types._, Flags._, Decorators._, StdNames._, Constants._ import MegaPhase._ import SymUtils._ @@ -123,7 +124,7 @@ class ExpandSAMs extends MiniPhase: val parents = List( defn.AbstractPartialFunctionClass.typeRef.appliedTo(anonTpe.firstParamTypes.head, anonTpe.resultType), defn.SerializableType) - val pfSym = newNormalizedClassSymbol(anonSym.owner, tpnme.ANON_CLASS, Synthetic | Final, parents, coord = tree.span) + val pfSym = newNormalizedClassSymbol(anonSym.owner, tpnme.ANON_CLASS, Synthetic | Final, parents, newScope, coord = tree.span) def overrideSym(sym: Symbol) = sym.copy( owner = pfSym, diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index 227065a70c91..cc058cfc2c6e 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -25,6 +25,7 @@ import Constants._ import ProtoTypes._ import ErrorReporting._ import Inferencing.{fullyDefinedType, isFullyDefined} +import Scopes.newScope import Trees._ import transform.SymUtils._ import transform.TypeUtils._ @@ -1793,7 +1794,7 @@ final class SearchRoot extends SearchHistory: // } val parents = List(defn.ObjectType, defn.SerializableType) - val classSym = newNormalizedClassSymbol(ctx.owner, LazyImplicitName.fresh().toTypeName, Synthetic | Final, parents, coord = span) + val classSym = newNormalizedClassSymbol(ctx.owner, LazyImplicitName.fresh().toTypeName, Synthetic | Final, parents, newScope, coord = span) val vsyms = pruned.map(_._1.symbol) val nsyms = vsyms.map(vsym => newSymbol(classSym, vsym.name, EmptyFlags, vsym.info, coord = span).entered) val vsymMap = (vsyms zip nsyms).toMap diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index 65283b763673..722e3abfec85 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -20,6 +20,7 @@ import ProtoTypes.shallowSelectionProto import Annotations.Annotation import SymDenotations.SymDenotation import Inferencing.isFullyDefined +import Scopes.newScope import config.Printers.inlining import config.Feature import ErrorReporting.errorTree @@ -34,6 +35,8 @@ import util.Spans.Span import dotty.tools.dotc.transform.{Splicer, TreeMapWithStages} import quoted.QuoteUtils +import scala.annotation.constructorOnly + object Inliner { import tpd._ @@ -196,7 +199,7 @@ object Inliner { val UnApply(fun, implicits, patterns) = unapp val sym = unapp.symbol - val cls = newNormalizedClassSymbol(ctx.owner, tpnme.ANON_CLASS, Synthetic | Final, List(defn.ObjectType), coord = sym.coord) + val cls = newNormalizedClassSymbol(ctx.owner, tpnme.ANON_CLASS, Synthetic | Final, List(defn.ObjectType), newScope, coord = sym.coord) val constr = newConstructor(cls, Synthetic, Nil, Nil, coord = sym.coord).entered val targs = fun match @@ -334,7 +337,7 @@ object Inliner { ConstFold(underlyingCodeArg).tpe.widenTermRefExpr match { case ConstantType(Constant(code: String)) => val source2 = SourceFile.virtual("tasty-reflect", code) - inContext(ctx.fresh.setNewTyperState().setTyper(new Typer).setSource(source2)) { + inContext(ctx.fresh.setNewTyperState().setTyper(new Typer(ctx.nestingLevel + 1)).setSource(source2)) { val tree2 = new Parser(source2).block() if ctx.reporter.allErrors.nonEmpty then ctx.reporter.allErrors.map((ErrorKind.Parser, _)) @@ -844,7 +847,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { } else if (inlinedMethod == defn.Compiletime_summonInline) { def searchImplicit(tpt: Tree) = - val evTyper = new Typer + val evTyper = new Typer(ctx.nestingLevel + 1) val evCtx = ctx.fresh.setTyper(evTyper) val evidence = evTyper.inferImplicitArg(tpt.tpe, tpt.span)(using evCtx) evidence.tpe match @@ -1313,7 +1316,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { } def searchImplicit(sym: TermSymbol, tpt: Tree) = { - val evTyper = new Typer + val evTyper = new Typer(ctx.nestingLevel + 1) val evCtx = ctx.fresh.setTyper(evTyper) val evidence = evTyper.inferImplicitArg(tpt.tpe, tpt.span)(using evCtx) evidence.tpe match { @@ -1511,7 +1514,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { * 4. Make sure inlined code is type-correct. * 5. Make sure that the tree's typing is idempotent (so that future -Ycheck passes succeed) */ - class InlineTyper(initialErrorCount: Int) extends ReTyper { + class InlineTyper(initialErrorCount: Int, @constructorOnly nestingLevel: Int = ctx.nestingLevel + 1) extends ReTyper(nestingLevel) { import reducer._ override def ensureAccessible(tpe: Type, superAccess: Boolean, pos: SrcPos)(using Context): Type = { @@ -1663,7 +1666,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { } } - override def newLikeThis: Typer = new InlineTyper(initialErrorCount) + override def newLikeThis(nestingLevel: Int): Typer = new InlineTyper(initialErrorCount, nestingLevel) /** True if this inline typer has already issued errors */ override def hasInliningErrors(using Context) = ctx.reporter.errorCount > initialErrorCount diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala index 7d428e0fe1c4..23bd87fa4139 100644 --- a/compiler/src/dotty/tools/dotc/typer/Namer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala @@ -29,6 +29,8 @@ import reporting._ import config.Feature.sourceVersion import config.SourceVersion._ +import scala.annotation.constructorOnly + /** This class creates symbols from definitions and imports and gives them * lazy types. * @@ -88,13 +90,6 @@ class Namer { typer: Typer => */ lazy val nestedTyper: mutable.AnyRefMap[Symbol, Typer] = new mutable.AnyRefMap - /** The scope of the typer. - * For nested typers this is a place parameters are entered during completion - * and where they survive until typechecking. A context with this typer also - * has this scope. - */ - val scope: MutableScope = newScope - /** We are entering symbols coming from a SourceLoader */ private var lateCompile = false @@ -782,7 +777,7 @@ class Namer { typer: Typer => if (sym.is(Module)) moduleValSig(sym) else valOrDefDefSig(original, sym, Nil, identity)(using localContext(sym).setNewScope) case original: DefDef => - val typer1 = ctx.typer.newLikeThis + val typer1 = ctx.typer.newLikeThis(ctx.nestingLevel + 1) nestedTyper(sym) = typer1 typer1.defDefSig(original, sym, this)(using localContext(sym).setTyper(typer1)) case imp: Import => @@ -1049,7 +1044,7 @@ class Namer { typer: Typer => } class ClassCompleter(cls: ClassSymbol, original: TypeDef)(ictx: Context) extends Completer(original)(ictx) { - withDecls(newScope) + withDecls(newScope(using ictx)) protected implicit val completerCtx: Context = localContext(cls) diff --git a/compiler/src/dotty/tools/dotc/typer/ReTyper.scala b/compiler/src/dotty/tools/dotc/typer/ReTyper.scala index 4f604a5a0b93..85be8c32227a 100644 --- a/compiler/src/dotty/tools/dotc/typer/ReTyper.scala +++ b/compiler/src/dotty/tools/dotc/typer/ReTyper.scala @@ -22,7 +22,7 @@ import Nullables._ * * Otherwise, everything is as in Typer. */ -class ReTyper extends Typer with ReChecking { +class ReTyper(nestingLevel: Int = 0) extends Typer(nestingLevel) with ReChecking { import tpd._ private def assertTyped(tree: untpd.Tree)(using Context): Unit = diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index fa26d0976d54..a571f39c42bc 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -51,6 +51,8 @@ import Nullables._ import NullOpsDecorator._ import config.Config +import scala.annotation.constructorOnly + object Typer { /** The precedence of bindings which determines which of several bindings will be @@ -110,7 +112,11 @@ object Typer { tree.putAttachment(HiddenSearchFailure, fail :: tree.attachmentOrElse(HiddenSearchFailure, Nil)) } -class Typer extends Namer +/** Typecheck trees, the main entry point is `typed`. + * + * @param nestingLevel The nesting level of the `scope` of this Typer. + */ +class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer with TypeAssigner with Applications with Implicits @@ -125,6 +131,13 @@ class Typer extends Namer import tpd.{cpy => _, _} import untpd.cpy + /** The scope of the typer. + * For nested typers (cf `Namer#nestedTyper`), this is a place parameters are + * entered during completion and where they survive until typechecking. A + * context with this typer also has this scope. + */ + val scope: MutableScope = newScope(nestingLevel) + /** A temporary data item valid for a single typed ident: * The set of all root import symbols that have been * encountered as a qualifier of an import so far. @@ -141,7 +154,7 @@ class Typer extends Namer private var foundUnderScala2: Type = NoType // Overridden in derived typers - def newLikeThis: Typer = new Typer + def newLikeThis(nestingLevel: Int): Typer = new Typer(nestingLevel) /** Find the type of an identifier with given `name` in given context `ctx`. * @param name the name of the identifier @@ -1652,7 +1665,7 @@ class Typer extends Namer /** Type a case. */ def typedCase(tree: untpd.CaseDef, sel: Tree, wideSelType: Type, pt: Type)(using Context): CaseDef = { val originalCtx = ctx - val gadtCtx: Context = ctx.fresh.setFreshGADTBounds + val gadtCtx: Context = ctx.fresh.setFreshGADTBounds.setNewScope def caseRest(pat: Tree)(using Context) = { val pt1 = instantiateMatchTypeProto(pat, pt) match { @@ -1677,7 +1690,7 @@ class Typer extends Namer val pat1 = typedPattern(tree.pat, wideSelType)(using gadtCtx) caseRest(pat1)( using Nullables.caseContext(sel, pat1)( - using gadtCtx.fresh.setNewScope)) + using gadtCtx)) } def typedLabeled(tree: untpd.Labeled)(using Context): Labeled = { From 2c189321ea80a65e173b23e94ce71cdd484822f0 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 20 Nov 2021 17:08:00 +0100 Subject: [PATCH 0914/1244] Replace useNecessaryEither by necessaryConstraintsOnly The name was misleading since it was also used in approximateWildcards, the new getter also returns true in GADT mode instead of having `either` manually check both the mode and the variable (this does not affect the behavior of approximateWildcards since GADT constraints never involve wildcards). --- .../dotty/tools/dotc/core/TypeComparer.scala | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index daa7394dae52..47cfda3463aa 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -63,7 +63,23 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling private var myInstance: TypeComparer = this def currentInstance: TypeComparer = myInstance - private var useNecessaryEither = false + private var myNecessaryConstraintsOnly = false + /** When collecting the constraints needed for a particular subtyping + * judgment to be true, we sometimes need to approximate the constraint + * set (see `TypeComparer#either` for example). + * + * Normally, this means adding extra constraints which may not be necessary + * for the subtyping judgment to be true, but if this variable is set to true + * we will instead under-approximate and keep only the constraints that must + * always be present for the subtyping judgment to hold. + * + * This is needed for GADT bounds inference to be sound, but it is also used + * when constraining a method call based on its expected type to avoid adding + * constraints that would later prevent us from typechecking method + * arguments, see or-inf.scala and and-inf.scala for examples. + */ + protected def necessaryConstraintsOnly(using Context) = + ctx.mode.is(Mode.GadtConstraintInference) || myNecessaryConstraintsOnly /** Is a subtype check in progress? In that case we may not * permanently instantiate type variables, because the corresponding @@ -134,20 +150,20 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling } def necessarySubType(tp1: Type, tp2: Type): Boolean = - val saved = useNecessaryEither - useNecessaryEither = true + val saved = myNecessaryConstraintsOnly + myNecessaryConstraintsOnly = true try topLevelSubType(tp1, tp2) - finally useNecessaryEither = saved + finally myNecessaryConstraintsOnly = saved /** Use avoidance to get rid of wildcards in constraint bounds if * we are doing a necessary comparison, or the mode is TypeVarsMissContext. * The idea is that under either of these conditions we are not interested * in creating a fresh type variable to replace the wildcard. I verified * that several tests break if one or the other part of the disjunction is dropped. - * (for instance, i12677.scala demands `useNecessaryEither` in the condition) + * (for instance, i12677.scala demands `necessaryConstraintsOnly` in the condition) */ override protected def approximateWildcards: Boolean = - useNecessaryEither || ctx.mode.is(Mode.TypevarsMissContext) + necessaryConstraintsOnly || ctx.mode.is(Mode.TypevarsMissContext) def testSubType(tp1: Type, tp2: Type): CompareResult = GADTused = false @@ -1580,24 +1596,16 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling /** Returns true iff the result of evaluating either `op1` or `op2` is true and approximates resulting constraints. * - * If we're inferring GADT bounds or constraining a method based on its - * expected type, we infer only the _necessary_ constraints, this means we - * keep the smaller constraint if any, or no constraint at all. This is - * necessary for GADT bounds inference to be sound. When constraining a - * method, this avoid committing of constraints that would later prevent us - * from typechecking method arguments, see or-inf.scala and and-inf.scala for - * examples. + * If `necessaryConstraintsOnly` is true, we keep the smaller constraint if + * any, or no constraint at all. * * Otherwise, we infer _sufficient_ constraints: we try to keep the smaller of * the two constraints, but if never is smaller than the other, we just pick * the first one. - * - * @see [[necessaryEither]] for the GADT / result type case - * @see [[sufficientEither]] for the normal case */ protected def either(op1: => Boolean, op2: => Boolean): Boolean = Stats.record("TypeComparer.either") - if ctx.mode.is(Mode.GadtConstraintInference) || useNecessaryEither then + if necessaryConstraintsOnly then necessaryEither(op1, op2) else sufficientEither(op1, op2) @@ -1673,7 +1681,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling * T1 & T2 <:< T3 * T1 <:< T2 | T3 * - * Unlike [[sufficientEither]], this method is used in GADTConstraintInference mode, when we are attempting + * But this method is used when `useNecessaryEither` is true, like when we are attempting * to infer GADT constraints that necessarily follow from the subtyping relationship. For instance, if we have * * enum Expr[T] { From ecb4926b1568f5a42e129be7deae7afacd1284fa Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 7 Nov 2021 12:17:03 +0100 Subject: [PATCH 0915/1244] Fix variance of approximating map in `addOneBound` It turns out that the variance was flipped: when adding a constraint `P <: List[WildcardType(Int, Any)]`, we should over-constrain to `P <: List[Int]`, but previously we would under-constrain to `P <: List[Any]` which would allow us later to infer `P := List[String]` for example. However, this logic needs to be flipped when inferring necessary constraints (this explains why the previous behavior was seemingly correct). No test case but this will end up being important in later commits of this PR where we re-use the same map to do more approximations. --- .../tools/dotc/core/ConstraintHandling.scala | 24 ++++++++++++++++++- .../dotty/tools/dotc/core/TypeComparer.scala | 18 -------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala index 87f5b98a1744..889341184587 100644 --- a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala +++ b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala @@ -56,6 +56,24 @@ trait ConstraintHandling { */ protected var comparedTypeLambdas: Set[TypeLambda] = Set.empty + protected var myNecessaryConstraintsOnly = false + /** When collecting the constraints needed for a particular subtyping + * judgment to be true, we sometimes need to approximate the constraint + * set (see `TypeComparer#either` for example). + * + * Normally, this means adding extra constraints which may not be necessary + * for the subtyping judgment to be true, but if this variable is set to true + * we will instead under-approximate and keep only the constraints that must + * always be present for the subtyping judgment to hold. + * + * This is needed for GADT bounds inference to be sound, but it is also used + * when constraining a method call based on its expected type to avoid adding + * constraints that would later prevent us from typechecking method + * arguments, see or-inf.scala and and-inf.scala for examples. + */ + protected def necessaryConstraintsOnly(using Context): Boolean = + ctx.mode.is(Mode.GadtConstraintInference) || myNecessaryConstraintsOnly + def checkReset() = assert(addConstraintInvocations == 0) assert(frozenConstraint == false) @@ -92,7 +110,11 @@ trait ConstraintHandling { false else val dropWildcards = new AvoidWildcardsMap: - if !isUpper then variance = -1 + // Approximate the upper-bound from below and vice-versa + if isUpper then variance = -1 + // ...unless we can only infer necessary constraints, in which case we + // flip the variance to under-approximate. + if necessaryConstraintsOnly then variance = -variance override def mapWild(t: WildcardType) = if approximateWildcards then super.mapWild(t) else newTypeVar(apply(t.effectiveBounds).toBounds) diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index 47cfda3463aa..7e91b245787c 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -63,24 +63,6 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling private var myInstance: TypeComparer = this def currentInstance: TypeComparer = myInstance - private var myNecessaryConstraintsOnly = false - /** When collecting the constraints needed for a particular subtyping - * judgment to be true, we sometimes need to approximate the constraint - * set (see `TypeComparer#either` for example). - * - * Normally, this means adding extra constraints which may not be necessary - * for the subtyping judgment to be true, but if this variable is set to true - * we will instead under-approximate and keep only the constraints that must - * always be present for the subtyping judgment to hold. - * - * This is needed for GADT bounds inference to be sound, but it is also used - * when constraining a method call based on its expected type to avoid adding - * constraints that would later prevent us from typechecking method - * arguments, see or-inf.scala and and-inf.scala for examples. - */ - protected def necessaryConstraintsOnly(using Context) = - ctx.mode.is(Mode.GadtConstraintInference) || myNecessaryConstraintsOnly - /** Is a subtype check in progress? In that case we may not * permanently instantiate type variables, because the corresponding * constraint might still be retracted and the instantiation should From 0bfea4382638c581073265fc0963458137bade71 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 7 Nov 2021 11:45:56 +0100 Subject: [PATCH 0916/1244] Drop unnecessary ConstraintHandling#approximateWildcards After improving Inferencing#variances to take the type variables appearing into the expected type into account, the special-casing based on necessaryConstraintsOnly provided by approximateWildcards turned out to be unnecessary. This change required tweaking the -Ytest-pickler logic to avoid a regression in tests/pos/i8802a.scala where a widened skolem in a prefix lead to a pretty-printing difference. --- .../tools/dotc/core/ConstraintHandling.scala | 7 +-- .../dotty/tools/dotc/core/TypeComparer.scala | 10 ----- .../tools/dotc/printing/PlainPrinter.scala | 2 + .../dotty/tools/dotc/typer/Inferencing.scala | 43 +++++++++++-------- 4 files changed, 28 insertions(+), 34 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala index 889341184587..107d7008776f 100644 --- a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala +++ b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala @@ -97,11 +97,6 @@ trait ConstraintHandling { def fullBounds(param: TypeParamRef)(using Context): TypeBounds = nonParamBounds(param).derivedTypeBounds(fullLowerBound(param), fullUpperBound(param)) - /** If true, eliminate wildcards in bounds by avoidance, otherwise replace - * them by fresh variables. - */ - protected def approximateWildcards: Boolean = true - protected def addOneBound(param: TypeParamRef, rawBound: Type, isUpper: Boolean)(using Context): Boolean = if !constraint.contains(param) then true else if !isUpper && param.occursIn(rawBound) then @@ -116,7 +111,7 @@ trait ConstraintHandling { // flip the variance to under-approximate. if necessaryConstraintsOnly then variance = -variance override def mapWild(t: WildcardType) = - if approximateWildcards then super.mapWild(t) + if ctx.mode.is(Mode.TypevarsMissContext) then super.mapWild(t) else newTypeVar(apply(t.effectiveBounds).toBounds) val bound = dropWildcards(rawBound) val oldBounds @ TypeBounds(lo, hi) = constraint.nonParamBounds(param) diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index 7e91b245787c..1d75c9ef0019 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -137,16 +137,6 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling try topLevelSubType(tp1, tp2) finally myNecessaryConstraintsOnly = saved - /** Use avoidance to get rid of wildcards in constraint bounds if - * we are doing a necessary comparison, or the mode is TypeVarsMissContext. - * The idea is that under either of these conditions we are not interested - * in creating a fresh type variable to replace the wildcard. I verified - * that several tests break if one or the other part of the disjunction is dropped. - * (for instance, i12677.scala demands `necessaryConstraintsOnly` in the condition) - */ - override protected def approximateWildcards: Boolean = - necessaryConstraintsOnly || ctx.mode.is(Mode.TypevarsMissContext) - def testSubType(tp1: Type, tp2: Type): CompareResult = GADTused = false if !topLevelSubType(tp1, tp2) then CompareResult.Fail diff --git a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala index bc6258398f54..d2efbeff2901 100644 --- a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -66,6 +66,8 @@ class PlainPrinter(_ctx: Context) extends Printer { case tp @ AppliedType(tycon, args) => if (defn.isCompiletimeAppliedType(tycon.typeSymbol)) tp.tryCompiletimeConstantFold else tycon.dealias.appliedTo(args) + case tp: NamedType => + tp.reduceProjection case _ => tp } diff --git a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala index c544a0423d51..ba9116e4f6be 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala @@ -437,12 +437,19 @@ object Inferencing { type VarianceMap = SimpleIdentityMap[TypeVar, Integer] - /** All occurrences of type vars in this type that satisfy predicate - * `include` mapped to their variances (-1/0/1) in this type, where + /** All occurrences of type vars in `tp` that satisfy predicate + * `include` mapped to their variances (-1/0/1) in both `tp` and + * `pt.finalResultType`, where * -1 means: only contravariant occurrences * +1 means: only covariant occurrences * 0 means: mixed or non-variant occurrences * + * We need to take the occurences in `pt` into account because a type + * variable created when typing the current tree might only appear in the + * bounds of a type variable in the expected type, for example when + * `ConstraintHandling#addOneBound` creates type variables when approximating + * a bound. + * * Note: We intentionally use a relaxed version of variance here, * where the variance does not change under a prefix of a named type * (the strict version makes prefixes invariant). This turns out to be @@ -453,7 +460,7 @@ object Inferencing { * * we want to instantiate U to x.type right away. No need to wait further. */ - private def variances(tp: Type)(using Context): VarianceMap = { + private def variances(tp: Type, pt: Type = WildcardType)(using Context): VarianceMap = { Stats.record("variances") val constraint = ctx.typerState.constraint @@ -486,21 +493,21 @@ object Inferencing { def traverse(tp: Type) = { vmap1 = accu(vmap1, tp) } vmap.foreachBinding { (tvar, v) => val param = tvar.origin - val e = constraint.entry(param) - accu.setVariance(v) - if (v >= 0) { - traverse(e.bounds.lo) - constraint.lower(param).foreach(p => traverse(constraint.typeVarOfParam(p))) - } - if (v <= 0) { - traverse(e.bounds.hi) - constraint.upper(param).foreach(p => traverse(constraint.typeVarOfParam(p))) - } + constraint.entry(param) match + case TypeBounds(lo, hi) => + accu.setVariance(v) + if v >= 0 then + traverse(lo) + constraint.lower(param).foreach(p => traverse(constraint.typeVarOfParam(p))) + if v <= 0 then + traverse(hi) + constraint.upper(param).foreach(p => traverse(constraint.typeVarOfParam(p))) + case _ => } if (vmap1 eq vmap) vmap else propagate(vmap1) } - propagate(accu(SimpleIdentityMap.empty, tp)) + propagate(accu(accu(SimpleIdentityMap.empty, tp), pt.finalResultType)) } /** Run the transformation after dealiasing but return the original type if it was a no-op. */ @@ -546,8 +553,8 @@ trait Inferencing { this: Typer => * @param locked the set of type variables of the current typer state that cannot be interpolated * at the present time * Eligible for interpolation are all type variables owned by the current typerstate - * that are not in locked. Type variables occurring co- (respectively, contra-) variantly in the type - * are minimized (respectvely, maximized). Non occurring type variables are minimized if they + * that are not in locked. Type variables occurring co- (respectively, contra-) variantly in the tree type + * or expected type are minimized (respectvely, maximized). Non occurring type variables are minimized if they * have a lower bound different from Nothing, maximized otherwise. Type variables appearing * non-variantly in the type are left untouched. * @@ -572,7 +579,7 @@ trait Inferencing { this: Typer => if ((ownedVars ne locked) && !ownedVars.isEmpty) { val qualifying = ownedVars -- locked if (!qualifying.isEmpty) { - typr.println(i"interpolate $tree: ${tree.tpe.widen} in $state, owned vars = ${state.ownedVars.toList}%, %, qualifying = ${qualifying.toList}%, %, previous = ${locked.toList}%, % / ${state.constraint}") + typr.println(i"interpolate $tree: ${tree.tpe.widen} in $state, pt = $pt, owned vars = ${state.ownedVars.toList}%, %, qualifying = ${qualifying.toList}%, %, previous = ${locked.toList}%, % / ${state.constraint}") val resultAlreadyConstrained = tree.isInstanceOf[Apply] || tree.tpe.isInstanceOf[MethodOrPoly] if (!resultAlreadyConstrained) @@ -580,7 +587,7 @@ trait Inferencing { this: Typer => // This is needed because it could establish singleton type upper bounds. See i2998.scala. val tp = tree.tpe.widen - val vs = variances(tp) + val vs = variances(tp, pt) // Avoid interpolating variables occurring in tree's type if typerstate has unreported errors. // Reason: The errors might reflect unsatisfiable constraints. In that From fa9ef35600df14e1813fd52bfbf35acefc0d2f64 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 7 Nov 2021 14:55:42 +0100 Subject: [PATCH 0917/1244] Better level-checking in constraints to handle bad bounds Previously, we enforced level-correctness only when instantiating type variables, but this is not good enough as demonstrated by tests/neg/i8900.scala. The problem is that if we allow level-incorrect bounds, then we might end up reasoning with bad bounds outside of the scope where they are defined. This can lead to level-correct but unsound instantiations. To prevent this, we now enforce level-correctness in constraints at all times, we also introduce `AvoidMap` to share more logic between level-avoidance and symbol-avoidance (see also the added TODO on `TypeOps#avoid`). Note that this implementation is still incomplete: we only check the nestingLevel of NamedTypes, but we also need to check for TypeVars, this will be handled in the next commit. --- .../tools/dotc/core/ConstraintHandling.scala | 58 +++++-- .../tools/dotc/core/GadtConstraint.scala | 5 + .../src/dotty/tools/dotc/core/TypeOps.scala | 150 ++++++++++-------- .../src/dotty/tools/dotc/core/Types.scala | 35 +--- .../dotty/tools/dotc/typer/Inferencing.scala | 2 +- tests/neg/i8900.scala | 28 ++++ tests/{neg => run}/i8861.scala | 8 +- 7 files changed, 172 insertions(+), 114 deletions(-) create mode 100644 tests/neg/i8900.scala rename tests/{neg => run}/i8861.scala (77%) diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala index 107d7008776f..7df57fc40c10 100644 --- a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala +++ b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala @@ -81,6 +81,10 @@ trait ConstraintHandling { assert(homogenizeArgs == false) assert(comparedTypeLambdas == Set.empty) + def nestingLevel(param: TypeParamRef) = constraint.typeVarOfParam(param) match + case tv: TypeVar => tv.nestingLevel + case _ => Int.MaxValue + def nonParamBounds(param: TypeParamRef)(using Context): TypeBounds = constraint.nonParamBounds(param) def fullLowerBound(param: TypeParamRef)(using Context): Type = @@ -97,6 +101,49 @@ trait ConstraintHandling { def fullBounds(param: TypeParamRef)(using Context): TypeBounds = nonParamBounds(param).derivedTypeBounds(fullLowerBound(param), fullUpperBound(param)) + /** An approximating map that prevents types nested deeper than maxLevel as + * well as WildcardTypes from leaking into the constraint. + * Note that level-checking is turned off after typer and in uncommitable + * TyperState since these leaks should be safe. + */ + class LevelAvoidMap(topLevelVariance: Int, maxLevel: Int)(using Context) extends TypeOps.AvoidMap: + variance = topLevelVariance + + /** Are we allowed to refer to types of the given `level`? */ + private def levelOK(level: Int): Boolean = + level <= maxLevel || ctx.isAfterTyper || !ctx.typerState.isCommittable + + def toAvoid(tp: NamedType): Boolean = + tp.prefix == NoPrefix && !tp.symbol.isStatic && !levelOK(tp.symbol.nestingLevel) + + override def mapWild(t: WildcardType) = + if ctx.mode.is(Mode.TypevarsMissContext) then super.mapWild(t) + else + val tvar = newTypeVar(apply(t.effectiveBounds).toBounds) + tvar + end LevelAvoidMap + + /** Approximate `rawBound` if needed to make it a legal bound of `param` by + * avoiding wildcards and types with a level strictly greater than its + * `nestingLevel`. + * + * Note that level-checking must be performed here and cannot be delayed + * until instantiation because if we allow level-incorrect bounds, then we + * might end up reasoning with bad bounds outside of the scope where they are + * defined. This can lead to level-correct but unsound instantiations as + * demonstrated by tests/neg/i8900.scala. + */ + protected def legalBound(param: TypeParamRef, rawBound: Type, isUpper: Boolean)(using Context): Type = + // Over-approximate for soundness. + var variance = if isUpper then -1 else 1 + // ...unless we can only infer necessary constraints, in which case we + // flip the variance to under-approximate. + if necessaryConstraintsOnly then variance = -variance + + val approx = LevelAvoidMap(variance, nestingLevel(param)) + approx(rawBound) + end legalBound + protected def addOneBound(param: TypeParamRef, rawBound: Type, isUpper: Boolean)(using Context): Boolean = if !constraint.contains(param) then true else if !isUpper && param.occursIn(rawBound) then @@ -104,16 +151,7 @@ trait ConstraintHandling { // so we shouldn't allow them as constraints either. false else - val dropWildcards = new AvoidWildcardsMap: - // Approximate the upper-bound from below and vice-versa - if isUpper then variance = -1 - // ...unless we can only infer necessary constraints, in which case we - // flip the variance to under-approximate. - if necessaryConstraintsOnly then variance = -variance - override def mapWild(t: WildcardType) = - if ctx.mode.is(Mode.TypevarsMissContext) then super.mapWild(t) - else newTypeVar(apply(t.effectiveBounds).toBounds) - val bound = dropWildcards(rawBound) + val bound = legalBound(param, rawBound, isUpper) val oldBounds @ TypeBounds(lo, hi) = constraint.nonParamBounds(param) val equalBounds = (if isUpper then lo else hi) eq bound if equalBounds && !bound.existsPart(_ eq param, StopAt.Static) then diff --git a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala index 36c2c7899aef..c49b5e888904 100644 --- a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala +++ b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala @@ -81,6 +81,11 @@ final class ProperGadtConstraint private( subsumes(extractConstraint(left), extractConstraint(right), extractConstraint(pre)) } + override protected def legalBound(param: TypeParamRef, rawBound: Type, isUpper: Boolean)(using Context): Type = + // GADT constraints never involve wildcards and are not propagated outside + // the case where they're valid, so no approximating is needed. + rawBound + override def addToConstraint(params: List[Symbol])(using Context): Boolean = { import NameKinds.DepParamName diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala index 1761def64e3e..2d5c2a6da88a 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeOps.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeOps.scala @@ -410,91 +410,109 @@ object TypeOps: } } - /** An upper approximation of the given type `tp` that does not refer to any symbol in `symsToAvoid`. + /** An approximating map that drops NamedTypes matching `toAvoid` and wildcard types. */ + abstract class AvoidMap(using Context) extends AvoidWildcardsMap: + @threadUnsafe lazy val localParamRefs = util.HashSet[Type]() + + def toAvoid(tp: NamedType): Boolean + + /** True iff all NamedTypes on this prefix are static */ + override def isStaticPrefix(pre: Type)(using Context): Boolean = pre match + case pre: NamedType => + val sym = pre.currentSymbol + sym.is(Package) || sym.isStatic && isStaticPrefix(pre.prefix) + case _ => true + + override def apply(tp: Type): Type = tp match + case tp: TermRef + if toAvoid(tp) => + tp.info.widenExpr.dealias match { + case info: SingletonType => apply(info) + case info => range(defn.NothingType, apply(info)) + } + case tp: TypeRef if toAvoid(tp) => + tp.info match { + case info: AliasingBounds => + apply(info.alias) + case TypeBounds(lo, hi) => + range(atVariance(-variance)(apply(lo)), apply(hi)) + case info: ClassInfo => + range(defn.NothingType, apply(classBound(info))) + case _ => + emptyRange // should happen only in error cases + } + case tp: ThisType => + // ThisType is only used inside a class. + // Therefore, either they don't appear in the type to be avoided, or + // it must be a class that encloses the block whose type is to be avoided. + tp + case tp: LazyRef => + if localParamRefs.contains(tp.ref) then tp + else if isExpandingBounds then emptyRange + else mapOver(tp) + case tl: HKTypeLambda => + localParamRefs ++= tl.paramRefs + mapOver(tl) + case _ => + super.apply(tp) + end apply + + /** Three deviations from standard derivedSelect: + * 1. We first try a widening conversion to the type's info with + * the original prefix. Since the original prefix is known to + * be a subtype of the returned prefix, this can improve results. + * 2. Then, if the approximation result is a singleton reference C#x.type, we + * replace by the widened type, which is usually more natural. + * 3. Finally, we need to handle the case where the prefix type does not have a member + * named `tp.name` anymmore. In that case, we need to fall back to Bot..Top. + */ + override def derivedSelect(tp: NamedType, pre: Type) = + if (pre eq tp.prefix) + tp + else tryWiden(tp, tp.prefix).orElse { + if (tp.isTerm && variance > 0 && !pre.isSingleton) + apply(tp.info.widenExpr) + else if (upper(pre).member(tp.name).exists) + super.derivedSelect(tp, pre) + else + range(defn.NothingType, defn.AnyType) + } + end AvoidMap + + /** An upper approximation of the given type `tp` that does not refer to any symbol in `symsToAvoid` + * and does not contain any WildcardType. * We need to approximate with ranges: * * term references to symbols in `symsToAvoid`, * term references that have a widened type of which some part refers * to a symbol in `symsToAvoid`, * type references to symbols in `symsToAvoid`, - * this types of classes in `symsToAvoid`. * * Type variables that would be interpolated to a type that * needs to be widened are replaced by the widened interpolation instance. + * + * TODO: Could we replace some or all usages of this method by + * `LevelAvoidMap` instead? It would be good to investigate this in details + * but when I tried it, avoidance for inlined trees broke because `TreeMap` + * does not update `ctx.nestingLevel` when entering a block so I'm leaving + * this as Future Work™. */ def avoid(tp: Type, symsToAvoid: => List[Symbol])(using Context): Type = { - val widenMap = new ApproximatingTypeMap { + val widenMap = new AvoidMap { @threadUnsafe lazy val forbidden = symsToAvoid.toSet - @threadUnsafe lazy val localParamRefs = util.HashSet[Type]() - def toAvoid(sym: Symbol) = !sym.isStatic && forbidden.contains(sym) - def partsToAvoid = new NamedPartsAccumulator(tp => toAvoid(tp.symbol)) - - /** True iff all NamedTypes on this prefix are static */ - override def isStaticPrefix(pre: Type)(using Context): Boolean = pre match - case pre: NamedType => - val sym = pre.currentSymbol - sym.is(Package) || sym.isStatic && isStaticPrefix(pre.prefix) - case _ => true - - def apply(tp: Type): Type = tp match - case tp: TermRef - if toAvoid(tp.symbol) || partsToAvoid(Nil, tp.info).nonEmpty => - tp.info.widenExpr.dealias match { - case info: SingletonType => apply(info) - case info => range(defn.NothingType, apply(info)) - } - case tp: TypeRef if toAvoid(tp.symbol) => - tp.info match { - case info: AliasingBounds => - apply(info.alias) - case TypeBounds(lo, hi) => - range(atVariance(-variance)(apply(lo)), apply(hi)) - case info: ClassInfo => - range(defn.NothingType, apply(classBound(info))) - case _ => - emptyRange // should happen only in error cases - } - case tp: ThisType => - // ThisType is only used inside a class. - // Therefore, either they don't appear in the type to be avoided, or - // it must be a class that encloses the block whose type is to be avoided. - tp + def toAvoid(tp: NamedType) = + val sym = tp.symbol + !sym.isStatic && forbidden.contains(sym) + + override def apply(tp: Type): Type = tp match case tp: TypeVar if mapCtx.typerState.constraint.contains(tp) => val lo = TypeComparer.instanceType( tp.origin, fromBelow = variance > 0 || variance == 0 && tp.hasLowerBound)(using mapCtx) val lo1 = apply(lo) if (lo1 ne lo) lo1 else tp - case tp: LazyRef => - if localParamRefs.contains(tp.ref) then tp - else if isExpandingBounds then emptyRange - else mapOver(tp) - case tl: HKTypeLambda => - localParamRefs ++= tl.paramRefs - mapOver(tl) case _ => - mapOver(tp) + super.apply(tp) end apply - - /** Three deviations from standard derivedSelect: - * 1. We first try a widening conversion to the type's info with - * the original prefix. Since the original prefix is known to - * be a subtype of the returned prefix, this can improve results. - * 2. Then, if the approximation result is a singleton reference C#x.type, we - * replace by the widened type, which is usually more natural. - * 3. Finally, we need to handle the case where the prefix type does not have a member - * named `tp.name` anymmore. In that case, we need to fall back to Bot..Top. - */ - override def derivedSelect(tp: NamedType, pre: Type) = - if (pre eq tp.prefix) - tp - else tryWiden(tp, tp.prefix).orElse { - if (tp.isTerm && variance > 0 && !pre.isSingleton) - apply(tp.info.widenExpr) - else if (upper(pre).member(tp.name).exists) - super.derivedSelect(tp, pre) - else - range(defn.NothingType, defn.AnyType) - } } widenMap(tp) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 59b8405f0e4c..68e2dc92303d 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4668,7 +4668,6 @@ object Types { * @param creatorState The typer state in which the variable was created. */ final class TypeVar private(initOrigin: TypeParamRef, creatorState: TyperState, val nestingLevel: Int) extends CachedProxyType with ValueType { - private var currentOrigin = initOrigin def origin: TypeParamRef = currentOrigin @@ -4709,38 +4708,6 @@ object Types { /** Is the variable already instantiated? */ def isInstantiated(using Context): Boolean = instanceOpt.exists - /** Avoid term references in `tp` to parameters or local variables that - * are nested more deeply than the type variable itself. - */ - private def avoidCaptures(tp: Type)(using Context): Type = - if ctx.isAfterTyper then - return tp - val problemSyms = new TypeAccumulator[Set[Symbol]]: - def apply(syms: Set[Symbol], t: Type): Set[Symbol] = t match - case ref: NamedType - // AVOIDANCE TODO: Are there other problematic kinds of references? - // Our current tests only give us these, but we might need to generalize this. - if (ref.prefix eq NoPrefix) && ref.symbol.maybeOwner.nestingLevel > nestingLevel => - syms + ref.symbol - case _ => - foldOver(syms, t) - val problems = problemSyms(Set.empty, tp) - if problems.isEmpty then tp - else - val atp = TypeOps.avoid(tp, problems.toList) - def msg = i"Inaccessible variables captured in instantation of type variable $this.\n$tp was fixed to $atp" - typr.println(msg) - val bound = TypeComparer.fullUpperBound(origin) - if !(atp <:< bound) then - throw new TypeError(i"$msg,\nbut the latter type does not conform to the upper bound $bound") - atp - // AVOIDANCE TODO: This really works well only if variables are instantiated from below - // If we hit a problematic symbol while instantiating from above, then avoidance - // will widen the instance type further. This could yield an alias, which would be OK. - // But it also could yield a true super type which would then fail the bounds check - // and throw a TypeError. The right thing to do instead would be to avoid "downwards". - // To do this, we need first test cases for that situation. - /** Instantiate variable with given type */ def instantiateWith(tp: Type)(using Context): Type = { assert(tp ne this, i"self instantiation of $origin, constraint = ${ctx.typerState.constraint}") @@ -4765,7 +4732,7 @@ object Types { * is also a singleton type. */ def instantiate(fromBelow: Boolean)(using Context): Type = - val tp = avoidCaptures(TypeComparer.instanceType(origin, fromBelow)) + val tp = TypeComparer.instanceType(origin, fromBelow) if myInst.exists then // The line above might have triggered instantiation of the current type variable myInst else diff --git a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala index ba9116e4f6be..426543879103 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala @@ -447,7 +447,7 @@ object Inferencing { * We need to take the occurences in `pt` into account because a type * variable created when typing the current tree might only appear in the * bounds of a type variable in the expected type, for example when - * `ConstraintHandling#addOneBound` creates type variables when approximating + * `ConstraintHandling#legalBound` creates type variables when approximating * a bound. * * Note: We intentionally use a relaxed version of variance here, diff --git a/tests/neg/i8900.scala b/tests/neg/i8900.scala new file mode 100644 index 000000000000..c82f9cd18aa5 --- /dev/null +++ b/tests/neg/i8900.scala @@ -0,0 +1,28 @@ +trait Base { + type M +} +trait A { + type M >: Int | String +} +trait B { + type M <: Int & String +} +object Test { + def foo[T](z: T, x: A & B => T): T = z + def foo2[T](z: T, x: T): T = z + + def main(args: Array[String]): Unit = { + val x = foo(1, x => (??? : x.M)) + val x1: String = x // error (was: ClassCastException) + + val a = foo2(1, + if false then + val x: A & B = ??? + ??? : x.M + else 1 + ) + + val b: String = a // error (was: ClassCastException) + } +} + diff --git a/tests/neg/i8861.scala b/tests/run/i8861.scala similarity index 77% rename from tests/neg/i8861.scala rename to tests/run/i8861.scala index 744b49b0107b..e1e802a5c72b 100644 --- a/tests/neg/i8861.scala +++ b/tests/run/i8861.scala @@ -18,14 +18,16 @@ object Test { int = vi => vi.i : vi.A, str = vs => vs.t : vs.A ) + // Used to infer `c.visit[Int & M)]` and error out in the second lambda, + // now infers `c.visit[(Int & M | String & M)]` def minimalFail[M](c: Container { type A = M }): M = c.visit( int = vi => vi.i : vi.A, - str = vs => vs.t : vs.A // error // error + str = vs => vs.t : vs.A ) def main(args: Array[String]): Unit = { val e: Container { type A = String } = new StrV println(minimalOk(e)) // this one prints "hello" - println(minimalFail(e)) // this one fails with ClassCastException: class java.lang.String cannot be cast to class java.lang.Integer + println(minimalFail(e)) // used to fail with ClassCastException, now prints "hello" } -} \ No newline at end of file +} From ade9d4da12e3c7be5ff122b6ad7bc7d552fbe738 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Wed, 17 Nov 2021 17:10:15 +0100 Subject: [PATCH 0918/1244] Create fresh type variables to keep constraints level-correct This completes the implementation of `LevelAvoidMap` from the previous commit: we now make sure that the nonParamBounds of a type variable does not refer to variables of a higher level by creating fresh variables of the appropriate level if necessary. Each fresh variable will be upper- or lower-bounded by the existing variable it is substituted for depending on variance (an idea that I got from [1]), in the invariant case the existing variable will be instantiated to the fresh one (unlike [2], we can't simply mutate the nestingLevel of the existing variable after running avoidance on its bounds because the constraint containing these bounds might later be retracted). Additionally: - When unifying two type variables, keep the one with the lowest level in the constraint set and make sure the bounds transferred from the other one are level-correct. This required some changes in `Constraint#addLess` which previously assumed that `unify` would always keep the second parameter. - When instantiating a type variable to its full lower- or upper-bound, we also need to avoid any type variable of a higher level among its param bound. This commit is necessary to avoid leaking local types in i8900a2.scala and i8900a3.scala, these kind of leaks will become compile-time error in the next commit. This commit required making a type parameter explicit both in SnippetChecker.scala and i13809/Macros_1.scala, in both situations the problem is that the lambda passed to `map` can only be typed if the type argument of `map` contains a wildcard, but LevelAvoidMap instead creates a fresh type variable of a lower level at a point where we don't know yet that this cannot work. Since this situation seems very rare in practice, I believe this is an acceptable trade-off for soundness. [1]: Lionel Parreaux. "The simple essence of algebraic subtyping: principal type inference with subtyping made easy (functional pearl)." https://dl.acm.org/doi/abs/10.1145/3409006 [2]: Oleg Kiselyov. "How OCaml type checker works -- or what polymorphism and garbage collection have in common" https://okmij.org/ftp/ML/generalization.html --- .../dotty/tools/dotc/core/Constraint.scala | 26 ++- .../tools/dotc/core/ConstraintHandling.scala | 149 ++++++++++++++++-- .../tools/dotc/core/GadtConstraint.scala | 1 + .../src/dotty/tools/dotc/core/NameKinds.scala | 7 + .../src/dotty/tools/dotc/core/NameTags.scala | 5 + .../tools/dotc/core/OrderingConstraint.scala | 34 ++-- .../tools/dotc/core/TypeApplications.scala | 10 ++ .../src/dotty/tools/dotc/core/Types.scala | 13 +- .../dotty/tools/dotc/typer/Inferencing.scala | 69 +++++--- .../dotty/tools/dotc/typer/ProtoTypes.scala | 48 +++--- .../scaladoc/snippets/SnippetChecker.scala | 3 +- tests/neg-macros/i13809/Macros_1.scala | 2 +- tests/neg/i12284.check | 50 ++---- tests/neg/i12284.scala | 11 +- tests/{neg => pos}/i864.scala | 0 tests/pos/i8900-cycle.scala | 15 ++ tests/pos/i8900-polyfunction.scala | 5 + tests/pos/i8900-promote.scala | 18 +++ tests/pos/i8900-unflip.scala | 18 +++ tests/pos/i8900a2.scala | 12 ++ tests/pos/i8900a3.scala | 13 ++ 21 files changed, 381 insertions(+), 128 deletions(-) rename tests/{neg => pos}/i864.scala (100%) create mode 100644 tests/pos/i8900-cycle.scala create mode 100644 tests/pos/i8900-polyfunction.scala create mode 100644 tests/pos/i8900-promote.scala create mode 100644 tests/pos/i8900-unflip.scala create mode 100644 tests/pos/i8900a2.scala create mode 100644 tests/pos/i8900a3.scala diff --git a/compiler/src/dotty/tools/dotc/core/Constraint.scala b/compiler/src/dotty/tools/dotc/core/Constraint.scala index 32d23deea397..c35c93886cd8 100644 --- a/compiler/src/dotty/tools/dotc/core/Constraint.scala +++ b/compiler/src/dotty/tools/dotc/core/Constraint.scala @@ -93,13 +93,15 @@ abstract class Constraint extends Showable { /** A constraint that includes the relationship `p1 <: p2`. * `<:` relationships between parameters ("edges") are propagated, but * non-parameter bounds are left alone. + * + * @param direction Must be set to `KeepParam1` or `KeepParam2` when + * `p2 <: p1` is already true depending on which parameter + * the caller intends to keep. This will avoid propagating + * bounds that will be redundant after `p1` and `p2` are + * unified. */ - def addLess(p1: TypeParamRef, p2: TypeParamRef)(using Context): This - - /** A constraint resulting from adding p2 = p1 to this constraint, and at the same - * time transferring all bounds of p2 to p1 - */ - def unify(p1: TypeParamRef, p2: TypeParamRef)(using Context): This + def addLess(p1: TypeParamRef, p2: TypeParamRef, + direction: UnificationDirection = UnificationDirection.NoUnification)(using Context): This /** A new constraint which is derived from this constraint by removing * the type parameter `param` from the domain and replacing all top-level occurrences @@ -174,3 +176,15 @@ abstract class Constraint extends Showable { */ def checkConsistentVars()(using Context): Unit } + +/** When calling `Constraint#addLess(p1, p2, ...)`, the caller might end up + * unifying one parameter with the other, this enum lets `addLess` know which + * direction the unification will take. + */ +enum UnificationDirection: + /** Neither p1 nor p2 will be instantiated. */ + case NoUnification + /** `p2 := p1`, p1 left uninstantiated. */ + case KeepParam1 + /** `p1 := p2`, p2 left uninstantiated. */ + case KeepParam2 diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala index 7df57fc40c10..835da2176a33 100644 --- a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala +++ b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala @@ -10,8 +10,10 @@ import Flags._ import config.Config import config.Printers.typr import reporting.trace -import typer.ProtoTypes.newTypeVar +import typer.ProtoTypes.{newTypeVar, representedParamRef} import StdNames.tpnme +import UnificationDirection.* +import NameKinds.AvoidNameKind /** Methods for adding constraints and solving them. * @@ -85,13 +87,39 @@ trait ConstraintHandling { case tv: TypeVar => tv.nestingLevel case _ => Int.MaxValue + /** If `param` is nested deeper than `maxLevel`, try to instantiate it to a + * fresh type variable of level `maxLevel` and return the new variable. + * If this isn't possible, throw a TypeError. + */ + def atLevel(maxLevel: Int, param: TypeParamRef)(using Context): TypeParamRef = + if nestingLevel(param) <= maxLevel then return param + LevelAvoidMap(0, maxLevel)(param) match + case freshVar: TypeVar => freshVar.origin + case _ => throw new TypeError( + i"Could not decrease the nesting level of ${param} from ${nestingLevel(param)} to $maxLevel in $constraint") + def nonParamBounds(param: TypeParamRef)(using Context): TypeBounds = constraint.nonParamBounds(param) + /** The full lower bound of `param` includes both the `nonParamBounds` and the + * params in the constraint known to be `<: param`, except that + * params with a `nestingLevel` higher than `param` will be instantiated + * to a fresh param at a legal level. See the documentation of `TypeVar` + * for details. + */ def fullLowerBound(param: TypeParamRef)(using Context): Type = - constraint.minLower(param).foldLeft(nonParamBounds(param).lo)(_ | _) + val maxLevel = nestingLevel(param) + var loParams = constraint.minLower(param) + if maxLevel != Int.MaxValue then + loParams = loParams.mapConserve(atLevel(maxLevel, _)) + loParams.foldLeft(nonParamBounds(param).lo)(_ | _) + /** The full upper bound of `param`, see the documentation of `fullLowerBounds` above. */ def fullUpperBound(param: TypeParamRef)(using Context): Type = - constraint.minUpper(param).foldLeft(nonParamBounds(param).hi)(_ & _) + val maxLevel = nestingLevel(param) + var hiParams = constraint.minUpper(param) + if maxLevel != Int.MaxValue then + hiParams = hiParams.mapConserve(atLevel(maxLevel, _)) + hiParams.foldLeft(nonParamBounds(param).hi)(_ & _) /** Full bounds of `param`, including other lower/upper params. * @@ -116,10 +144,64 @@ trait ConstraintHandling { def toAvoid(tp: NamedType): Boolean = tp.prefix == NoPrefix && !tp.symbol.isStatic && !levelOK(tp.symbol.nestingLevel) + /** Return a (possibly fresh) type variable of a level no greater than `maxLevel` which is: + * - lower-bounded by `tp` if variance >= 0 + * - upper-bounded by `tp` if variance <= 0 + * If this isn't possible, return the empty range. + */ + def legalVar(tp: TypeVar): Type = + val oldParam = tp.origin + val nameKind = + if variance > 0 then AvoidNameKind.UpperBound + else if variance < 0 then AvoidNameKind.LowerBound + else AvoidNameKind.BothBounds + + /** If it exists, return the first param in the list created in a previous call to `legalVar(tp)` + * with the appropriate level and variance. + */ + def findParam(params: List[TypeParamRef]): Option[TypeParamRef] = + params.find(p => + nestingLevel(p) <= maxLevel && representedParamRef(p) == oldParam && + (p.paramName.is(AvoidNameKind.BothBounds) || + variance != 0 && p.paramName.is(nameKind))) + + // First, check if we can reuse an existing parameter, this is more than an optimization + // since it avoids an infinite loop in tests/pos/i8900-cycle.scala + findParam(constraint.lower(oldParam)).orElse(findParam(constraint.upper(oldParam))) match + case Some(param) => + constraint.typeVarOfParam(param) + case _ => + // Otherwise, try to return a fresh type variable at `maxLevel` with + // the appropriate constraints. + val name = nameKind(oldParam.paramName.toTermName).toTypeName + val freshVar = newTypeVar(TypeBounds.upper(tp.topType), name, + nestingLevel = maxLevel, represents = oldParam) + val ok = + if variance < 0 then + addLess(freshVar.origin, oldParam) + else if variance > 0 then + addLess(oldParam, freshVar.origin) + else + unify(freshVar.origin, oldParam) + if ok then freshVar else emptyRange + end legalVar + + override def apply(tp: Type): Type = tp match + case tp: TypeVar if !tp.isInstantiated && !levelOK(tp.nestingLevel) => + legalVar(tp) + // TypeParamRef can occur in tl bounds + case tp: TypeParamRef => + constraint.typeVarOfParam(tp) match + case tvar: TypeVar => + apply(tvar) + case _ => super.apply(tp) + case _ => + super.apply(tp) + override def mapWild(t: WildcardType) = if ctx.mode.is(Mode.TypevarsMissContext) then super.mapWild(t) else - val tvar = newTypeVar(apply(t.effectiveBounds).toBounds) + val tvar = newTypeVar(apply(t.effectiveBounds).toBounds, nestingLevel = maxLevel) tvar end LevelAvoidMap @@ -140,7 +222,16 @@ trait ConstraintHandling { // flip the variance to under-approximate. if necessaryConstraintsOnly then variance = -variance - val approx = LevelAvoidMap(variance, nestingLevel(param)) + val approx = new LevelAvoidMap(variance, nestingLevel(param)): + override def legalVar(tp: TypeVar): Type = + // `legalVar` will create a type variable whose bounds depend on + // `variance`, but whether the variance is positive or negative, + // we can still infer necessary constraints since just creating a + // type variable doesn't reduce the set of possible solutions. + // Therefore, we can safely "unflip" the variance flipped above. + // This is necessary for i8900-unflip.scala to typecheck. + val v = if necessaryConstraintsOnly then -this.variance else this.variance + atVariance(v)(super.legalVar(tp)) approx(rawBound) end legalBound @@ -246,19 +337,50 @@ trait ConstraintHandling { def location(using Context) = "" // i"in ${ctx.typerState.stateChainStr}" // use for debugging - /** Make p2 = p1, transfer all bounds of p2 to p1 - * @pre less(p1)(p2) + /** Unify p1 with p2: one parameter will be kept in the constraint, the + * other will be removed and its bounds transferred to the remaining one. + * + * If p1 and p2 have different `nestingLevel`, the parameter with the lowest + * level will be kept and the transferred bounds from the other parameter + * will be adjusted for level-correctness. */ private def unify(p1: TypeParamRef, p2: TypeParamRef)(using Context): Boolean = { constr.println(s"unifying $p1 $p2") - assert(constraint.isLess(p1, p2)) - constraint = constraint.addLess(p2, p1) + if !constraint.isLess(p1, p2) then + constraint = constraint.addLess(p1, p2) + + val level1 = nestingLevel(p1) + val level2 = nestingLevel(p2) + val pKept = if level1 <= level2 then p1 else p2 + val pRemoved = if level1 <= level2 then p2 else p1 + + constraint = constraint.addLess(p2, p1, direction = if pKept eq p1 then KeepParam2 else KeepParam1) + + val boundKept = constraint.nonParamBounds(pKept).substParam(pRemoved, pKept) + var boundRemoved = constraint.nonParamBounds(pRemoved).substParam(pRemoved, pKept) + + if level1 != level2 then + boundRemoved = LevelAvoidMap(-1, math.min(level1, level2))(boundRemoved) + val TypeBounds(lo, hi) = boundRemoved + // After avoidance, the interval might be empty, e.g. in + // tests/pos/i8900-promote.scala: + // >: x.type <: Singleton + // becomes: + // >: Int <: Singleton + // In that case, we can still get a legal constraint + // by replacing the lower-bound to get: + // >: Int & Singleton <: Singleton + if !isSub(lo, hi) then + boundRemoved = TypeBounds(lo & hi, hi) + val down = constraint.exclusiveLower(p2, p1) val up = constraint.exclusiveUpper(p1, p2) - constraint = constraint.unify(p1, p2) - val bounds = constraint.nonParamBounds(p1) - val lo = bounds.lo - val hi = bounds.hi + + val newBounds = (boundKept & boundRemoved).bounds + constraint = constraint.updateEntry(pKept, newBounds).replace(pRemoved, pKept) + + val lo = newBounds.lo + val hi = newBounds.hi isSub(lo, hi) && down.forall(addOneBound(_, hi, isUpper = true)) && up.forall(addOneBound(_, lo, isUpper = false)) @@ -311,6 +433,7 @@ trait ConstraintHandling { final def approximation(param: TypeParamRef, fromBelow: Boolean)(using Context): Type = constraint.entry(param) match case entry: TypeBounds => + val maxLevel = nestingLevel(param) val useLowerBound = fromBelow || param.occursIn(entry.hi) val inst = if useLowerBound then fullLowerBound(param) else fullUpperBound(param) typr.println(s"approx ${param.show}, from below = $fromBelow, inst = ${inst.show}") diff --git a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala index c49b5e888904..fb1ed9acaa4f 100644 --- a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala +++ b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala @@ -11,6 +11,7 @@ import collection.mutable import printing._ import scala.annotation.internal.sharable +import scala.annotation.unused /** Represents GADT constraints currently in scope */ sealed abstract class GadtConstraint extends Showable { diff --git a/compiler/src/dotty/tools/dotc/core/NameKinds.scala b/compiler/src/dotty/tools/dotc/core/NameKinds.scala index b77f870b72b7..2b3806e48f79 100644 --- a/compiler/src/dotty/tools/dotc/core/NameKinds.scala +++ b/compiler/src/dotty/tools/dotc/core/NameKinds.scala @@ -358,6 +358,13 @@ object NameKinds { val ProtectedAccessorName: PrefixNameKind = new PrefixNameKind(PROTECTEDACCESSOR, "protected$") val InlineAccessorName: PrefixNameKind = new PrefixNameKind(INLINEACCESSOR, "inline$") + /** See `ConstraintHandling#LevelAvoidMap`. */ + enum AvoidNameKind(tag: Int, prefix: String) extends PrefixNameKind(tag, prefix): + override def definesNewName = true + case UpperBound extends AvoidNameKind(AVOIDUPPER, "(upper)") + case LowerBound extends AvoidNameKind(AVOIDLOWER, "(lower)") + case BothBounds extends AvoidNameKind(AVOIDBOTH, "(avoid)") + val BodyRetainerName: SuffixNameKind = new SuffixNameKind(BODYRETAINER, "$retainedBody") val FieldName: SuffixNameKind = new SuffixNameKind(FIELD, "$$local") { override def mkString(underlying: TermName, info: ThisInfo) = underlying.toString diff --git a/compiler/src/dotty/tools/dotc/core/NameTags.scala b/compiler/src/dotty/tools/dotc/core/NameTags.scala index 7ee7758a506b..5628adbd6f89 100644 --- a/compiler/src/dotty/tools/dotc/core/NameTags.scala +++ b/compiler/src/dotty/tools/dotc/core/NameTags.scala @@ -32,6 +32,11 @@ object NameTags extends TastyFormat.NameTags { inline val SETTER = 34 // A synthesized += suffix. + // Name of type variables created by `ConstraintHandling#LevelAvoidMap`. + final val AVOIDUPPER = 35 + final val AVOIDLOWER = 36 + final val AVOIDBOTH = 37 + def nameTagToString(tag: Int): String = tag match { case UTF8 => "UTF8" case QUALIFIED => "QUALIFIED" diff --git a/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala b/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala index aa4262ad6e02..1f83224cc3e7 100644 --- a/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala +++ b/compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala @@ -134,6 +134,8 @@ class OrderingConstraint(private val boundsMap: ParamBounds, private val lowerMap : ParamOrdering, private val upperMap : ParamOrdering) extends Constraint { + import UnificationDirection.* + type This = OrderingConstraint // ----------- Basic indices -------------------------------------------------- @@ -350,29 +352,37 @@ class OrderingConstraint(private val boundsMap: ParamBounds, /** Add the fact `param1 <: param2` to the constraint `current` and propagate * `<:<` relationships between parameters ("edges") but not bounds. */ - private def order(current: This, param1: TypeParamRef, param2: TypeParamRef)(using Context): This = + def order(current: This, param1: TypeParamRef, param2: TypeParamRef, direction: UnificationDirection = NoUnification)(using Context): This = if (param1 == param2 || current.isLess(param1, param2)) this else { assert(contains(param1), i"$param1") assert(contains(param2), i"$param2") - // Is `order` called during parameter unification? - val unifying = isLess(param2, param1) + val unifying = direction != NoUnification val newUpper = { val up = exclusiveUpper(param2, param1) if unifying then // Since param2 <:< param1 already holds now, filter out param1 to avoid adding // duplicated orderings. - param2 :: up.filterNot(_ eq param1) + val filtered = up.filterNot(_ eq param1) + // Only add bounds for param2 if it will be kept in the constraint after unification. + if direction == KeepParam2 then + param2 :: filtered + else + filtered else param2 :: up } val newLower = { val lower = exclusiveLower(param1, param2) if unifying then - // Do not add bounds for param1 since it will be unified to param2 soon. - // And, similarly filter out param2 from lowerly-ordered parameters + // Similarly, filter out param2 from lowerly-ordered parameters // to avoid duplicated orderings. - lower.filterNot(_ eq param2) + val filtered = lower.filterNot(_ eq param2) + // Only add bounds for param1 if it will be kept in the constraint after unification. + if direction == KeepParam1 then + param1 :: filtered + else + filtered else param1 :: lower } @@ -416,14 +426,8 @@ class OrderingConstraint(private val boundsMap: ParamBounds, def updateEntry(param: TypeParamRef, tp: Type)(using Context): This = updateEntry(this, param, ensureNonCyclic(param, tp)).checkNonCyclic() - def addLess(param1: TypeParamRef, param2: TypeParamRef)(using Context): This = - order(this, param1, param2).checkNonCyclic() - - def unify(p1: TypeParamRef, p2: TypeParamRef)(using Context): This = - val bound1 = nonParamBounds(p1).substParam(p2, p1) - val bound2 = nonParamBounds(p2).substParam(p2, p1) - val p1Bounds = bound1 & bound2 - updateEntry(p1, p1Bounds).replace(p2, p1) + def addLess(param1: TypeParamRef, param2: TypeParamRef, direction: UnificationDirection)(using Context): This = + order(this, param1, param2, direction).checkNonCyclic() // ---------- Replacements and Removals ------------------------------------- diff --git a/compiler/src/dotty/tools/dotc/core/TypeApplications.scala b/compiler/src/dotty/tools/dotc/core/TypeApplications.scala index bc7970d423f5..95ad0b95b335 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeApplications.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeApplications.scala @@ -231,6 +231,16 @@ class TypeApplications(val self: Type) extends AnyVal { (alias ne self) && alias.hasSimpleKind } + /** The top type with the same kind as `self`. */ + def topType(using Context): Type = + if self.hasSimpleKind then + defn.AnyType + else EtaExpand(self.typeParams) match + case tp: HKTypeLambda => + tp.derivedLambdaType(resType = tp.resultType.topType) + case _ => + defn.AnyKindType + /** If self type is higher-kinded, its result type, otherwise NoType. * Note: The hkResult of an any-kinded type is again AnyKind. */ diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 68e2dc92303d..2d02546a6d5e 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4666,6 +4666,15 @@ object Types { * * @param origin The parameter that's tracked by the type variable. * @param creatorState The typer state in which the variable was created. + * @param nestingLevel Symbols with a nestingLevel strictly greater than this + * will not appear in the instantiation of this type variable. + * This is enforced in `ConstraintHandling` by: + * - Maintaining the invariant that the `nonParamBounds` + * of a type variable never refer to a type with a + * greater `nestingLevel` (see `legalBound` for the reason + * why this cannot be delayed until instantiation). + * - On instantiation, replacing any param in the param bound + * with a level greater than nestingLevel (see `fullLowerBound`). */ final class TypeVar private(initOrigin: TypeParamRef, creatorState: TyperState, val nestingLevel: Int) extends CachedProxyType with ValueType { private var currentOrigin = initOrigin @@ -4774,8 +4783,8 @@ object Types { } } object TypeVar: - def apply(initOrigin: TypeParamRef, creatorState: TyperState)(using Context) = - new TypeVar(initOrigin, creatorState, ctx.nestingLevel) + def apply(using Context)(initOrigin: TypeParamRef, creatorState: TyperState, nestingLevel: Int = ctx.nestingLevel) = + new TypeVar(initOrigin, creatorState, nestingLevel) type TypeVars = SimpleIdentitySet[TypeVar] diff --git a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala index 426543879103..17df9c93f9a9 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala @@ -7,7 +7,7 @@ import ast._ import Contexts._, Types._, Flags._, Symbols._ import Trees._ import ProtoTypes._ -import NameKinds.UniqueName +import NameKinds.{AvoidNameKind, UniqueName} import util.Spans._ import util.{Stats, SimpleIdentityMap} import Decorators._ @@ -553,7 +553,8 @@ trait Inferencing { this: Typer => * @param locked the set of type variables of the current typer state that cannot be interpolated * at the present time * Eligible for interpolation are all type variables owned by the current typerstate - * that are not in locked. Type variables occurring co- (respectively, contra-) variantly in the tree type + * that are not in `locked` and whose `nestingLevel` is `>= ctx.nestingLevel`. + * Type variables occurring co- (respectively, contra-) variantly in the tree type * or expected type are minimized (respectvely, maximized). Non occurring type variables are minimized if they * have a lower bound different from Nothing, maximized otherwise. Type variables appearing * non-variantly in the type are left untouched. @@ -615,17 +616,35 @@ trait Inferencing { this: Typer => type InstantiateQueue = mutable.ListBuffer[(TypeVar, Boolean)] val toInstantiate = new InstantiateQueue for tvar <- qualifying do - if !tvar.isInstantiated && constraint.contains(tvar) then + if !tvar.isInstantiated && constraint.contains(tvar) && tvar.nestingLevel >= ctx.nestingLevel then constrainIfDependentParamRef(tvar, tree) // Needs to be checked again, since previous interpolations could already have // instantiated `tvar` through unification. val v = vs(tvar) if v == null then - typr.println(i"interpolate non-occurring $tvar in $state in $tree: $tp, fromBelow = ${tvar.hasLowerBound}, $constraint") - toInstantiate += ((tvar, tvar.hasLowerBound)) + // Even though `tvar` is non-occurring in `v`, the specific + // instantiation we pick still matters because `tvar` might appear + // in the bounds of a non-`qualifying` type variable in the + // constraint. + // In particular, if `tvar` was created as the upper or lower + // bound of an existing variable by `LevelAvoidMap`, we + // instantiate it in the direction corresponding to the + // original variable which might be further constrained later. + // Otherwise, we simply rely on `hasLowerBound`. + val name = tvar.origin.paramName + val fromBelow = + name.is(AvoidNameKind.UpperBound) || + !name.is(AvoidNameKind.LowerBound) && tvar.hasLowerBound + typr.println(i"interpolate non-occurring $tvar in $state in $tree: $tp, fromBelow = $fromBelow, $constraint") + toInstantiate += ((tvar, fromBelow)) else if v.intValue != 0 then typr.println(i"interpolate $tvar in $state in $tree: $tp, fromBelow = ${v.intValue == 1}, $constraint") toInstantiate += ((tvar, v.intValue == 1)) + else if tvar.nestingLevel > ctx.nestingLevel then + // Invariant: a type variable of level N can only appear + // in the type of a tree whose enclosing scope is level <= N. + typr.println(i"instantiate nonvariant $tvar of level ${tvar.nestingLevel} to a type variable of level <= ${ctx.nestingLevel}, $constraint") + comparing(_.atLevel(ctx.nestingLevel, tvar.origin)) else typr.println(i"no interpolation for nonvariant $tvar in $state") @@ -687,26 +706,26 @@ trait Inferencing { this: Typer => * type if necessary to make it a Singleton. */ private def constrainIfDependentParamRef(tvar: TypeVar, call: Tree)(using Context): Unit = - representedParamRef(tvar) match - case ref: TermParamRef => - - def findArg(tree: Tree)(using Context): Tree = tree match - case Apply(fn, args) => - if fn.tpe.widen eq ref.binder then - if ref.paramNum < args.length then args(ref.paramNum) - else EmptyTree - else findArg(fn) - case TypeApply(fn, _) => findArg(fn) - case Block(_, expr) => findArg(expr) - case Inlined(_, _, expr) => findArg(expr) - case _ => EmptyTree - - val arg = findArg(call) - if !arg.isEmpty then - var argType = arg.tpe.widenIfUnstable - if !argType.isSingleton then argType = SkolemType(argType) - argType <:< tvar - case _ => + if tvar.origin.paramName.is(NameKinds.DepParamName) then + representedParamRef(tvar.origin) match + case ref: TermParamRef => + def findArg(tree: Tree)(using Context): Tree = tree match + case Apply(fn, args) => + if fn.tpe.widen eq ref.binder then + if ref.paramNum < args.length then args(ref.paramNum) + else EmptyTree + else findArg(fn) + case TypeApply(fn, _) => findArg(fn) + case Block(_, expr) => findArg(expr) + case Inlined(_, _, expr) => findArg(expr) + case _ => EmptyTree + + val arg = findArg(call) + if !arg.isEmpty then + var argType = arg.tpe.widenIfUnstable + if !argType.isSingleton then argType = SkolemType(argType) + argType <:< tvar + case _ => end constrainIfDependentParamRef } diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala index fcedd8a0cd56..800af19e9f78 100644 --- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -628,7 +628,11 @@ object ProtoTypes { * for each parameter. * @return The added type lambda, and the list of created type variables. */ - def constrained(tl: TypeLambda, owningTree: untpd.Tree, alwaysAddTypeVars: Boolean)(using Context): (TypeLambda, List[TypeTree]) = { + def constrained(using Context)( + tl: TypeLambda, owningTree: untpd.Tree, + alwaysAddTypeVars: Boolean, + nestingLevel: Int = ctx.nestingLevel + ): (TypeLambda, List[TypeTree]) = { val state = ctx.typerState val addTypeVars = alwaysAddTypeVars || !owningTree.isEmpty if (tl.isInstanceOf[PolyType]) @@ -640,7 +644,7 @@ object ProtoTypes { for (paramRef <- tl.paramRefs) yield { val tt = InferredTypeTree().withSpan(owningTree.span) - val tvar = TypeVar(paramRef, state) + val tvar = TypeVar(paramRef, state, nestingLevel) state.ownedVars += tvar tt.withType(tvar) } @@ -664,36 +668,42 @@ object ProtoTypes { val targs = constrained(tl, ast.tpd.EmptyTree, alwaysAddTypeVars = true)._2 tl.instantiate(targs.tpes) - /** A new type variable with given bounds for its origin. - * @param represents If exists, the TermParamRef that the TypeVar represents - * in the substitution generated by `resultTypeApprox` + /** A fresh type variable added to the current constraint. + * @param bounds The initial bounds of the variable + * @param name The name of the variable, defaults a fresh `DepParamName` + * @param nestingLevel See `TypeVar#nestingLevel` + * @param represents If it exists, a ParamRef that this TypeVar represents, + * to be retrieved using `representedParamRef`. + * in the substitution generated by `resultTypeApprox` * If `represents` exists, it is stored in the result type of the PolyType * that backs the TypeVar, to be retrieved by `representedParamRef`. */ - def newTypeVar(bounds: TypeBounds, represents: Type = NoType)(using Context): TypeVar = { - val poly = PolyType(DepParamName.fresh().toTypeName :: Nil)( + def newTypeVar(using Context)( + bounds: TypeBounds, name: TypeName = DepParamName.fresh().toTypeName, + nestingLevel: Int = ctx.nestingLevel, represents: Type = NoType): TypeVar = + val poly = PolyType(name :: Nil)( pt => bounds :: Nil, pt => represents.orElse(defn.AnyType)) - constrained(poly, untpd.EmptyTree, alwaysAddTypeVars = true) + constrained(poly, untpd.EmptyTree, alwaysAddTypeVars = true, nestingLevel) ._2.head.tpe.asInstanceOf[TypeVar] - } - /** If `tvar` represents a parameter of a dependent function generated - * by `newDepVar` called from `resultTypeApprox, the term parameter reference - * for which the variable was substituted. Otherwise, NoType. + /** If `param` was created using `newTypeVar(..., represents = X)`, returns X. + * This is used in: + * - `Inferencing#constrainIfDependentParamRef` to retrieve the dependent function + * parameter for which the variable was substituted. + * - `ConstraintHandling#LevelAvoidMap#legalVar` to retrieve the type variable that was + * avoided in a previous call to `legalVar`. */ - def representedParamRef(tvar: TypeVar)(using Context): Type = - if tvar.origin.paramName.is(DepParamName) then - tvar.origin.binder.resultType match - case ref: TermParamRef => ref - case _ => NoType - else NoType + def representedParamRef(param: TypeParamRef)(using Context): Type = + param.binder.resultType match + case ref: ParamRef => ref + case _ => NoType /** Create a new TypeVar that represents a dependent method parameter singleton `ref` */ def newDepTypeVar(ref: TermParamRef)(using Context): TypeVar = newTypeVar( TypeBounds.upper(AndType(ref.underlying.widenExpr, defn.SingletonClass.typeRef)), - ref) + represents = ref) /** The result type of `mt`, where all references to parameters of `mt` are * replaced by either wildcards or TypeParamRefs. diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetChecker.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetChecker.scala index 906c0d2434b0..77ab539d34fa 100644 --- a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetChecker.scala +++ b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetChecker.scala @@ -25,7 +25,8 @@ class SnippetChecker(val args: Scaladoc.Args)(using cctx: CompilerContext): args.classpath ).mkString(sep) - private val snippetCompilerSettings: Seq[SnippetCompilerSetting[_]] = cctx.settings.userSetSettings(cctx.settingsState).filter(_ != cctx.settings.classpath).map( s => + private val snippetCompilerSettings: Seq[SnippetCompilerSetting[?]] = cctx.settings.userSetSettings(cctx.settingsState).filter(_ != cctx.settings.classpath) + .map[SnippetCompilerSetting[?]]( s => SnippetCompilerSetting(s, s.valueIn(cctx.settingsState)) ) :+ SnippetCompilerSetting(cctx.settings.classpath, fullClasspath) diff --git a/tests/neg-macros/i13809/Macros_1.scala b/tests/neg-macros/i13809/Macros_1.scala index 774a8bf195ba..3c39a40a7c51 100644 --- a/tests/neg-macros/i13809/Macros_1.scala +++ b/tests/neg-macros/i13809/Macros_1.scala @@ -221,7 +221,7 @@ object Async: }).transformed ) case _ => ??? case Block(prevs,last) => - val rPrevs = prevs.map{ p => + val rPrevs = prevs.map[CpsExpr[?]]{ p => p match case v@ValDef(vName,vtt,optRhs) => optRhs.get.tpe.widen.asType match diff --git a/tests/neg/i12284.check b/tests/neg/i12284.check index 2f3adee6e948..00e445d3c41c 100644 --- a/tests/neg/i12284.check +++ b/tests/neg/i12284.check @@ -1,41 +1,9 @@ --- Error: tests/neg/i12284.scala:5:36 ---------------------------------------------------------------------------------- -5 | val xx: Vector[F[_]] = deps.map(i => magic(i)) // error // error // error - | ^^^^^^^^^^^^^ - | return type B of lambda cannot be made hygienic; - | it is not a supertype of the hygienic type Any --- Error: tests/neg/i12284.scala:5:33 ---------------------------------------------------------------------------------- -5 | val xx: Vector[F[_]] = deps.map(i => magic(i)) // error // error // error - | ^ - | Inaccessible variables captured in instantation of type variable B. - | F[i.A] was fixed to Any, - | but the latter type does not conform to the upper bound F[?] --- Error: tests/neg/i12284.scala:5:6 ----------------------------------------------------------------------------------- -5 | val xx: Vector[F[_]] = deps.map(i => magic(i)) // error // error // error - | ^ - | Inaccessible variables captured in instantation of type variable B. - | F[i.A] was fixed to Any, - | but the latter type does not conform to the upper bound F[?] --- Error: tests/neg/i12284.scala:4:2 ----------------------------------------------------------------------------------- -4 | val deps: Vector[I[F, _]] = ??? // error - | ^ - | Inaccessible variables captured in instantation of type variable B. - | F[i.A] was fixed to Any, - | but the latter type does not conform to the upper bound F[?] --- Error: tests/neg/i12284.scala:3:4 ----------------------------------------------------------------------------------- -3 |def magic[F[_], A](in: I[F, A]): F[A] = // error // error - | ^ - | Inaccessible variables captured in instantation of type variable B. - | F[i.A] was fixed to Any, - | but the latter type does not conform to the upper bound F[?] --- Error: tests/neg/i12284.scala:3:0 ----------------------------------------------------------------------------------- -3 |def magic[F[_], A](in: I[F, A]): F[A] = // error // error - |^ - |Inaccessible variables captured in instantation of type variable B. - |F[i.A] was fixed to Any, - |but the latter type does not conform to the upper bound F[?] --- Error: tests/neg/i12284.scala:1:0 ----------------------------------------------------------------------------------- -1 |trait I[F[_], A] // error - |^ - |Inaccessible variables captured in instantation of type variable B. - |F[i.A] was fixed to Any, - |but the latter type does not conform to the upper bound F[?] +-- [E007] Type Mismatch Error: tests/neg/i12284.scala:6:26 ------------------------------------------------------------- +6 | val y: Vector[F[Any]] = xx // error + | ^^ + | Found: (xx : Vector[Any]) + | Required: Vector[F[Any]] + | + | where: F is a type in method magic with bounds <: [_] =>> Any + +longer explanation available when compiling with `-explain` diff --git a/tests/neg/i12284.scala b/tests/neg/i12284.scala index 302ed6468f1f..11635a1638cb 100644 --- a/tests/neg/i12284.scala +++ b/tests/neg/i12284.scala @@ -1,6 +1,7 @@ -trait I[F[_], A] // error +trait I[F[_], A] -def magic[F[_], A](in: I[F, A]): F[A] = // error // error - val deps: Vector[I[F, _]] = ??? // error - val xx: Vector[F[_]] = deps.map(i => magic(i)) // error // error // error - ??? \ No newline at end of file +def magic[F[_], A](in: I[F, A]): F[A] = + val deps: Vector[I[F, _]] = ??? + val xx = deps.map(i => magic(i)) + val y: Vector[F[Any]] = xx // error + ??? diff --git a/tests/neg/i864.scala b/tests/pos/i864.scala similarity index 100% rename from tests/neg/i864.scala rename to tests/pos/i864.scala diff --git a/tests/pos/i8900-cycle.scala b/tests/pos/i8900-cycle.scala new file mode 100644 index 000000000000..3b6ae214cb42 --- /dev/null +++ b/tests/pos/i8900-cycle.scala @@ -0,0 +1,15 @@ +trait Contra[-A] +trait Cov[+B] + +trait Test { + def foo[S](x: S): S + def rec1[T <: Cov[T]]: Contra[T] + def rec2[T <: Cov[U], U <: T]: Contra[T] + + val a = foo({ + rec1 + }) + val b = foo({ + rec2 + }) +} diff --git a/tests/pos/i8900-polyfunction.scala b/tests/pos/i8900-polyfunction.scala new file mode 100644 index 000000000000..2836283b3c65 --- /dev/null +++ b/tests/pos/i8900-polyfunction.scala @@ -0,0 +1,5 @@ +object Test { + def f[F](f: [t] => t => F): Unit = () + + f([t] => (x: t) => x) +} diff --git a/tests/pos/i8900-promote.scala b/tests/pos/i8900-promote.scala new file mode 100644 index 000000000000..7d3a2ff96bed --- /dev/null +++ b/tests/pos/i8900-promote.scala @@ -0,0 +1,18 @@ +class Inv[A <: Singleton](x: A) +object Inv { + def empty[A <: Singleton]: Inv[A] = new Inv(???) +} + +class Inv2[A](x: A) +object Inv2 { + def empty[A]: Inv2[A] = new Inv2(???) +} + +object Test { + def inv(cond: Boolean) = // used to leak: Inv[x.type] + if (cond) + val x: Int = 1 + new Inv(x) + else + Inv.empty +} diff --git a/tests/pos/i8900-unflip.scala b/tests/pos/i8900-unflip.scala new file mode 100644 index 000000000000..568e9d22530e --- /dev/null +++ b/tests/pos/i8900-unflip.scala @@ -0,0 +1,18 @@ +// Minimized from PLens.scala in scalaz + +class PLensFamily[A1, A2, B1, B2] + +class LazyOption[A3] { + def fold[X](some: (=> A3) => X, none: => X): X = ??? +} +class IndexedStore[I, A4, B4](run: (A4 => B4, I)) + +object PL { + + def plensFamily[A1x, A2x, B1x, B2x](r: A1x => Option[IndexedStore[B1x, B2x, A2x]]): PLensFamily[A1x, A2x, B1x, B2x] = ??? + + def lazySome[T](a: => T): LazyOption[T] = ??? + + def lazySomePLensFamily[A1y, A2y]: PLensFamily[LazyOption[A1y], LazyOption[A2y], A1y, A2y] = + plensFamily(_.fold(z => Some(IndexedStore(lazySome(_), z)), None)) +} diff --git a/tests/pos/i8900a2.scala b/tests/pos/i8900a2.scala new file mode 100644 index 000000000000..50a263ff7cc2 --- /dev/null +++ b/tests/pos/i8900a2.scala @@ -0,0 +1,12 @@ +class ContraCo[-T, +S](val t: S) +class CoContra[+T, -S](val t: T) +object Test { + def unwrap[Outer](inv: CoContra[Outer, Outer]): Outer = inv.t + def wrap[Inner](i: Inner): CoContra[Inner, Inner] = new CoContra(i) + + val a = unwrap({ + class Local + val local = new Local + wrap(local) + }) +} diff --git a/tests/pos/i8900a3.scala b/tests/pos/i8900a3.scala new file mode 100644 index 000000000000..d43f19fcaab6 --- /dev/null +++ b/tests/pos/i8900a3.scala @@ -0,0 +1,13 @@ +class ContraCo[-T, +S](val t: S) +class CoContra[+T, -S](val t: T) +object Test { + type Id[T] = T + def unwrap[Outer](inv: CoContra[Outer, Outer]): Outer = inv.t + def wrap[Inner](i: Inner): CoContra[Id[Inner], Id[Inner]] = new CoContra(i) + + val a = unwrap({ + class Local + val local = new Local + wrap(local) + }) +} From 20151ebb3bcaa0c112e7af0684c1ab19d2b81ea9 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 21 Nov 2021 19:13:55 +0100 Subject: [PATCH 0919/1244] Check that we pickle a definition before its references ... except for pattern-bound symbols because in `case x: List[t]` we pickle `List[t]` before we pickle `t` itself. The issue with t1957.scala is fixed (after staying as a TODO for 5 years!) by the level-checking improvements in the previous commits of this PR. --- compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala index a195b157cacd..8f5910c3dd56 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala @@ -89,11 +89,6 @@ class TreePickler(pickler: TastyPickler) { case Some(label) => if (label != NoAddr) writeRef(label) else pickleForwardSymRef(sym) case None => - // See pos/t1957.scala for an example where this can happen. - // I believe it's a bug in typer: the type of an implicit argument refers - // to a closure parameter outside the closure itself. TODO: track this down, so that we - // can eliminate this case. - report.log(i"pickling reference to as yet undefined $sym in ${sym.owner}", sym.srcPos) pickleForwardSymRef(sym) } @@ -206,6 +201,8 @@ class TreePickler(pickler: TastyPickler) { } else if (tpe.prefix == NoPrefix) { writeByte(if (tpe.isType) TYPEREFdirect else TERMREFdirect) + if !symRefs.contains(sym) && !sym.isPatternBound && !sym.hasAnnotation(defn.QuotedRuntimePatterns_patternTypeAnnot) then + report.error(i"pickling reference to as yet undefined $tpe with symbol ${sym}", sym.srcPos) pickleSymRef(sym) } else tpe.designator match { From cbce063b2365f0171574162110579f82a8dd43a6 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sun, 21 Nov 2021 19:16:45 +0100 Subject: [PATCH 0920/1244] Remove now-unnecessary `avoid` when typing closures This is no longer needed thanks to the improvements to avoidance in this PR. --- compiler/src/dotty/tools/dotc/typer/Namer.scala | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala index 23bd87fa4139..ed124b7a2fc8 100644 --- a/compiler/src/dotty/tools/dotc/typer/Namer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala @@ -1510,22 +1510,7 @@ class Namer { typer: Typer => // This case applies if the closure result type contains uninstantiated // type variables. In this case, constrain the closure result from below // by the parameter-capture-avoiding type of the body. - val rhsType = typedAheadExpr(mdef.rhs, tpt.tpe).tpe - - // The following part is important since otherwise we might instantiate - // the closure result type with a plain functon type that refers - // to local parameters. An example where this happens in `dependent-closures.scala` - // If the code after `val rhsType` is commented out, this file fails pickling tests. - // AVOIDANCE TODO: Follow up why this happens, and whether there - // are better ways to achieve this. It would be good if we could get rid of this code. - // It seems at least partially redundant with the nesting level checking on TypeVar - // instantiation. - val hygienicType = TypeOps.avoid(rhsType, termParamss.flatten) - if (!hygienicType.isValueType || !(hygienicType <:< tpt.tpe)) - report.error(i"return type ${tpt.tpe} of lambda cannot be made hygienic;\n" + - i"it is not a supertype of the hygienic type $hygienicType", mdef.srcPos) - //println(i"lifting $rhsType over $termParamss -> $hygienicType = ${tpt.tpe}") - //println(TypeComparer.explained { implicit ctx => hygienicType <:< tpt.tpe }) + typedAheadExpr(mdef.rhs, tpt.tpe).tpe case _ => } WildcardType From eb49aa6fe3a7bf673e0dd0dffcbe67f8bc3c3580 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Tue, 14 Dec 2021 18:22:24 +0000 Subject: [PATCH 0921/1244] Fix reachability of unapplySeq of non-List sequences --- .../dotty/tools/dotc/transform/patmat/Space.scala | 14 +++++++++----- .../dotc/transform/PatmatExhaustivityTest.scala | 2 +- tests/neg-custom-args/fatal-warnings/i8711.check | 12 ++++++------ tests/patmat/i13485.check | 1 + tests/patmat/i13485.scala | 2 +- tests/patmat/i13931.scala | 3 +++ 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala index 84345f095ad9..af7083f66f77 100644 --- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala +++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala @@ -371,10 +371,15 @@ class SpaceEngine(using Context) extends SpaceLogic { val fun1 = funPart(fun) val funRef = fun1.tpe.asInstanceOf[TermRef] if (fun.symbol.name == nme.unapplySeq) - if (fun.symbol.owner == scalaSeqFactoryClass) + val (arity, elemTp, resultTp) = unapplySeqInfo(fun.tpe.widen.finalResultType, fun.srcPos) + if (fun.symbol.owner == scalaSeqFactoryClass && scalaListType.appliedTo(elemTp) <:< pat.tpe) + // The exhaustivity and reachability logic already handles decomposing sum types (into its subclasses) + // and product types (into its components). To get better counter-examples for patterns that are of type + // List (or a super-type of list, like LinearSeq) we project them into spaces that use `::` and Nil. + // Doing so with a pattern of `case Seq() =>` with a scrutinee of type `Vector()` doesn't work because the + // space is then discarded leading to a false positive reachability warning, see #13931. projectSeq(pats) else { - val (arity, elemTp, resultTp) = unapplySeqInfo(fun.tpe.widen.finalResultType, fun.srcPos) if (elemTp.exists) Prod(erase(pat.tpe.stripAnnots, isValue = false), funRef, projectSeq(pats) :: Nil) else @@ -959,9 +964,8 @@ class SpaceEngine(using Context) extends SpaceLogic { if prev == Empty && covered == Empty then // defer until a case is reachable deferred ::= pat else { - // FIXME: These should be emitted, but reverted for i13931 - //for (pat <- deferred.reverseIterator) - // report.warning(MatchCaseUnreachable(), pat.srcPos) + for (pat <- deferred.reverseIterator) + report.warning(MatchCaseUnreachable(), pat.srcPos) if pat != EmptyTree // rethrow case of catch uses EmptyTree && isSubspace(covered, prev) then { diff --git a/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala b/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala index 3d877a46558f..7d9c77a439bf 100644 --- a/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala +++ b/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala @@ -66,7 +66,7 @@ class PatmatExhaustivityTest { .filter(f => f.extension == "scala" || f.isDirectory) .filter { f => val path = if f.isDirectory then f.path + "/" else f.path - path.contains(Properties.testsFilter.getOrElse("")) + Properties.testsFilter.getOrElse("").split(',').exists(path.contains) } .map(f => if f.isDirectory then compileDir(f.jpath) else compileFile(f.jpath)) diff --git a/tests/neg-custom-args/fatal-warnings/i8711.check b/tests/neg-custom-args/fatal-warnings/i8711.check index 0abda7a77ed6..0035af0755d4 100644 --- a/tests/neg-custom-args/fatal-warnings/i8711.check +++ b/tests/neg-custom-args/fatal-warnings/i8711.check @@ -1,8 +1,8 @@ --- Error: tests/neg-custom-args/fatal-warnings/i8711.scala:7:9 --------------------------------------------------------- +-- [E030] Match case Unreachable Error: tests/neg-custom-args/fatal-warnings/i8711.scala:7:9 --------------------------- 7 | case x: B => x // error: this case is unreachable since class A is not a subclass of class B - | ^ - | this case is unreachable since type A and class B are unrelated --- Error: tests/neg-custom-args/fatal-warnings/i8711.scala:12:9 -------------------------------------------------------- + | ^^^^ + | Unreachable case +-- [E030] Match case Unreachable Error: tests/neg-custom-args/fatal-warnings/i8711.scala:12:9 -------------------------- 12 | case x: C => x // error - | ^ - | this case is unreachable since type A | B and class C are unrelated + | ^^^^ + | Unreachable case diff --git a/tests/patmat/i13485.check b/tests/patmat/i13485.check index f05a4c6c0788..f9d066905a86 100644 --- a/tests/patmat/i13485.check +++ b/tests/patmat/i13485.check @@ -1 +1,2 @@ +11: Match case Unreachable 16: Match case Unreachable diff --git a/tests/patmat/i13485.scala b/tests/patmat/i13485.scala index 2c8ef5547704..72cc3a3d2cd3 100644 --- a/tests/patmat/i13485.scala +++ b/tests/patmat/i13485.scala @@ -8,7 +8,7 @@ sealed trait Foo class Bar def test1(bar: Bar) = bar match - case _: Foo => 1 // FIXME: this is unreachable, but reverted for i13931 + case _: Foo => 1 case _: Bar => 2 def test2(bar: Bar) = bar match diff --git a/tests/patmat/i13931.scala b/tests/patmat/i13931.scala index b6c8ba6accd8..0d8d9eb9dcd3 100644 --- a/tests/patmat/i13931.scala +++ b/tests/patmat/i13931.scala @@ -2,3 +2,6 @@ class Test: def test = Vector() match case Seq() => println("empty") case _ => println("non-empty") + + def test2 = IndexedSeq() match { case IndexedSeq() => case _ => } + def test3 = IndexedSeq() match { case IndexedSeq(1) => case _ => } From ddc46e2bba926f9359024272154a81c5ec2f0ab6 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 16 Dec 2021 09:51:06 +0100 Subject: [PATCH 0922/1244] Upgrade SBT to 1.5.7 Updates log4j 2 to 2.16.0, which disables JNDI lookup and fixes a denial of service vulnerability (CVE-2021-45046) See https://github.com/sbt/sbt/releases/tag/v1.5.7 --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index fcd6b8aa26e0..2a972edc4c28 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -140,7 +140,7 @@ final case class SbtCommunityProject( case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome") case _ => Nil extraSbtArgs ++ sbtProps ++ List( - "-sbt-version", "1.5.6", + "-sbt-version", "1.5.7", "-Dsbt.supershell=false", s"-Ddotty.communitybuild.dir=$communitybuildDir", s"--addPluginSbtFile=$sbtPluginFilePath" diff --git a/project/build.properties b/project/build.properties index bb3a9b7dc6d2..baf5ff3ec78b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.6 +sbt.version=1.5.7 From 6ef869f1461d7d0b272e7b7b69324ad713c8b700 Mon Sep 17 00:00:00 2001 From: philwalk Date: Thu, 16 Dec 2021 06:46:20 -0700 Subject: [PATCH 0923/1244] Fix for 14106 cygwin failed tests (#14113) * refactor common code from scripting tests; invalid tests fail by default * dump stdout/stderr if BashScriptsTests.verifyScalaOpts fails * fix for failing cygwin tests for #14106 * normalize scala and scalac paths; set proper SHELLOPTS in cygwin bashCommandline env * improved detection of scalacPath and scalaPath; additional logging * print warnings; remove unused code * strip ansi colors from bash command line output, to fix windows tests * dist/pack before sbt test in test_windows_full and test_non_bootstrapped * squeeze redundancy from env-var-setting tests, add more log messages * further reduced redundancy; additional log messages * remove trailing java from JAVA_HOME value; shorten comand lines with relpath * Update BashScriptsTests.scala remove duplicate * Update BashScriptsTests.scala Fix not-updating property Co-authored-by: Andrzej Ratajczak <32793002+BarkingBad@users.noreply.github.com> --- .github/workflows/ci.yaml | 4 +- .../scripting/classpathReport.sc | 2 +- .../scripting/unglobClasspath.sc | 2 +- .../tools/scripting/BashScriptsTests.scala | 258 ++++++---------- .../tools/scripting/ClasspathTests.scala | 159 +++------- .../dotty/tools/scripting/ScriptTestEnv.scala | 292 ++++++++++++++++++ .../tools/scripting/ScriptingTests.scala | 78 +++-- dist/bin/scala | 10 + 8 files changed, 483 insertions(+), 322 deletions(-) create mode 100644 compiler/test/dotty/tools/scripting/ScriptTestEnv.scala diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8a2c1728496d..1e9a145127bf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -66,7 +66,7 @@ jobs: - name: Test run: | - ./project/scripts/sbt ";compile ;test" + ./project/scripts/sbt ";dist/pack; compile ;test" ./project/scripts/cmdTests test: @@ -181,7 +181,7 @@ jobs: uses: actions/checkout@v2 - name: Test - run: sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test" + run: sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test" shell: cmd - name: Scala.js Test diff --git a/compiler/test-resources/scripting/classpathReport.sc b/compiler/test-resources/scripting/classpathReport.sc index 2a240d2fc3a0..a9eacbbba1f7 100755 --- a/compiler/test-resources/scripting/classpathReport.sc +++ b/compiler/test-resources/scripting/classpathReport.sc @@ -1,4 +1,4 @@ -#!/usr/bin/env -S bin/scala -classpath 'dist/target/pack/lib/*' +#!bin/scala -classpath 'dist/target/pack/lib/*' import java.nio.file.Paths diff --git a/compiler/test-resources/scripting/unglobClasspath.sc b/compiler/test-resources/scripting/unglobClasspath.sc index d05ff78435b3..796697cdedf2 100755 --- a/compiler/test-resources/scripting/unglobClasspath.sc +++ b/compiler/test-resources/scripting/unglobClasspath.sc @@ -1,4 +1,4 @@ -#!/usr/bin/env -S bin/scala -classpath 'dist/target/pack/lib/*' +#!bin/scala -classpath 'dist/target/pack/lib/*' // won't compile unless the hashbang line sets classpath import org.jline.terminal.Terminal diff --git a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala index 30e824d760c7..07fa37a4eb5b 100644 --- a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala +++ b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala @@ -2,33 +2,38 @@ package dotty package tools package scripting -import java.io.File -import java.nio.file.{Path, Paths, Files} -import scala.sys.process._ - -import org.junit.Test +import org.junit.{Test, AfterClass} import org.junit.Assert.assertEquals import vulpix.TestConfiguration -import dotty.tools.dotc.config.Properties._ +import ScriptTestEnv.* /** Verifies correct handling of command line arguments by `dist/bin/scala` and `dist/bin/scalac`. * +. arguments following a script path must be treated as script arguments * +. preserve script command line arguments. + * +. prevent SCALA_OPTS in build environment from infecting tests, via 'SCALA_OPTS= ' prefix + * +. test scripts must not throw execptions or exit with nonzero. */ -class BashScriptsTests: - // classpath tests managed by scripting.ClasspathTests.scala +object BashScriptsTests: + lazy val argsfile = createArgsFile() // avoid problems caused by drive letter def testFiles = scripts("/scripting") + @AfterClass def cleanup: Unit = { + val af = argsfile.toFile + if (af.exists) { + af.delete() + } + } printf("osname[%s]\n", osname) - printf("using JAVA_HOME=%s\n", javaHome) - printf("using SCALA_HOME=%s\n", scalaHome) - printf("first 5 PATH entries:\n%s\n", pathEntries.take(5).mkString("\n")) + printf("uname[%s]\n", ostypeFull) + printf("using JAVA_HOME=%s\n", envJavaHome) + printf("using SCALA_HOME=%s\n", envScalaHome) + printf("first 5 PATH entries:\n%s\n", adjustedPathEntries.take(5).mkString("\n")) printf("scala path: [%s]\n", scalaPath) printf("scalac path: [%s]\n", scalacPath) - lazy val expectedOutput = List( + val expectedOutput = List( "arg 0:[a]", "arg 1:[b]", "arg 2:[c]", @@ -37,16 +42,88 @@ class BashScriptsTests: "arg 5:[-script]", "arg 6:[-debug]", ) - lazy val testScriptArgs = Seq( + val testScriptArgs = Seq( "a", "b", "c", "-repl", "-run", "-script", "-debug" ) val showArgsScript = testFiles.find(_.getName == "showArgs.sc").get.absPath + def testFile(name: String): String = + val file = testFiles.find(_.getName == name) match { + case Some(f) => + val ff = f.absPath + printf("test file [%s] is [%s]\n", name, ff) + ff + case None => + printf("test file [%s] not found!\n", name) + name.absPath + } + file + + val Seq(envtestSc, envtestScala) = Seq("envtest.sc", "envtest.scala").map { testFile(_) } + + // create command line with given options, execute specified script, return stdout + def callScript(tag: String, script: String, keyPre: String): String = + val keyArg = s"$keyPre=$tag" + printf("pass tag [%s] via [%s] to script [%s]\n", tag, keyArg, script) + val cmd: String = Seq("SCALA_OPTS= ", scalaPath, keyArg, script).mkString(" ") + printf("cmd: [%s]\n", cmd) + val (validTest, exitCode, stdout, stderr) = bashCommand(cmd) + stderr.filter { !_.contains("Inappropriate ioctl") }.foreach { System.err.printf("stderr [%s]\n", _) } + stdout.mkString("\n") + + +class BashScriptsTests: + import BashScriptsTests.* + // classpath tests managed by scripting.ClasspathTests.scala + + ////////////////////////// begin tests ////////////////////// + + /* verify that `dist/bin/scala` correctly passes args to the jvm via -J-D for script envtest.sc */ + @Test def verifyScJProperty = + val tag = "World1" + val stdout = callScript(tag, envtestSc, s"-J-Dkey") + assertEquals( s"Hello $tag", stdout) + + /* verify that `dist/bin/scala` correctly passes args to the jvm via -J-D for script envtest.scala */ + @Test def verifyScalaJProperty = + val tag = "World2" + val stdout = callScript(tag, envtestScala, s"-J-Dkey") + assertEquals(s"Hello $tag", stdout) + + /* verify that `dist/bin/scala` can set system properties via -D for envtest.sc */ + @Test def verifyScDProperty = + val tag = "World3" + val stdout = callScript(tag, envtestSc, s"-Dkey") + assertEquals(s"Hello $tag", stdout) + + /* verify that `dist/bin/scala` can set system properties via -D for envtest.scala */ + @Test def verifyScalaDProperty = + val tag = "World4" + val stdout = callScript(tag, envtestScala, s"-Dkey") + assertEquals(s"Hello $tag", stdout) + + /* verify that `dist/bin/scala` can set system properties via -D when executing compiled script via -jar envtest.jar */ + @Test def saveAndRunWithDProperty = + val commandline = Seq("SCALA_OPTS= ", scalaPath.relpath, "-save", envtestScala.relpath).mkString(" ") + val (_, _, _, _) = bashCommand(commandline) // compile jar, discard output + val testJar = testFile("envtest.jar") // jar is created by the previous bashCommand() + if (testJar.isFile){ + printf("compiled envtest.scala to %s\n", testJar.norm) + } else { + sys.error(s"error: unable to compile envtest.scala to ${testJar.norm}") + } + + val tag = "World5" + val commandline2 = Seq("SCALA_OPTS= ", scalaPath.relpath, s"-Dkey=$tag", testJar.relpath) + printf("cmd[%s]\n", commandline2.mkString(" ")) + val (validTest, exitCode, stdout, stderr) = bashCommand(commandline2.mkString(" ")) + assertEquals(s"Hello $tag", stdout.mkString("/n")) + /* verify `dist/bin/scalac` non-interference with command line args following script name */ @Test def verifyScalacArgs = - val commandline = (Seq(scalacPath, "-script", showArgsScript) ++ testScriptArgs).mkString(" ") + val commandline = (Seq("SCALA_OPTS= ", scalacPath, "-script", showArgsScript) ++ testScriptArgs).mkString(" ") val (validTest, exitCode, stdout, stderr) = bashCommand(commandline) - if validTest then + if verifyValid(validTest) then var fail = false printf("\n") for (line, expect) <- stdout zip expectedOutput do @@ -57,46 +134,13 @@ class BashScriptsTests: if fail then assert(stdout == expectedOutput) - /* verify `dist/bin/scala` with -J setting */ - @Test def verifyScJProperty = - val commandline = Seq(scalaPath, "-J-Dkey=World", testFiles.find(_.getName == "envtest.sc").get.absPath).mkString(" ") - val (validTest, exitCode, stdout, stderr) = bashCommand(commandline) - assertEquals(stdout.mkString("/n"), "Hello World") - - /* verify `dist/bin/scala` with -J setting */ - @Test def verifyScalaJProperty = - val commandline = Seq(scalaPath, "-J-Dkey=World3", testFiles.find(_.getName == "envtest.scala").get.absPath).mkString(" ") - val (validTest, exitCode, stdout, stderr) = bashCommand(commandline) - assertEquals(stdout.mkString("/n"), "Hello World3") - - /* verify `dist/bin/scala` with -D setting */ - @Test def verifyScDProperty = - val commandline = Seq(scalaPath, "-Dkey=World3", testFiles.find(_.getName == "envtest.sc").get.absPath).mkString(" ") - val (validTest, exitCode, stdout, stderr) = bashCommand(commandline) - assertEquals(stdout.mkString("/n"), "Hello World3") - - /* verify `dist/bin/scala` with -D setting */ - @Test def verifyScalaDProperty = - val commandline = Seq(scalaPath, "-Dkey=World4", testFiles.find(_.getName == "envtest.scala").get.absPath).mkString(" ") - val (validTest, exitCode, stdout, stderr) = bashCommand(commandline) - assertEquals(stdout.mkString("/n"), "Hello World4") - - /* verify `dist/bin/scala` with -D setting */ - @Test def saveAndRunWithDProperty = - val commandline = Seq(scalaPath, "-save", testFiles.find(_.getName == "envtest.scala").get.absPath).mkString(" ") - val (_, _, _, _) = bashCommand(commandline) - val commandline2 = Seq(scalaPath, "-Dkey=World5", testFiles.find(_.getName == "envtest.jar").get.absPath).mkString(" ") - val (validTest, exitCode, stdout, stderr) = bashCommand(commandline2) - assertEquals(stdout.mkString("/n"), "Hello World5") - /* verify `dist/bin/scala` non-interference with command line args following script name */ @Test def verifyScalaArgs = val commandline = (Seq("SCALA_OPTS= ", scalaPath, showArgsScript) ++ testScriptArgs).mkString(" ") val (validTest, exitCode, stdout, stderr) = bashCommand(commandline) - if validTest then + if verifyValid(validTest) then var fail = false printf("\n") - var mismatches = List.empty[(String, String)] for (line, expect) <- stdout zip expectedOutput do printf("expected: %-17s\nactual : %s\n", expect, line) if line != expect then @@ -115,7 +159,7 @@ class BashScriptsTests: printf("===> verify valid system property script.path is reported by script [%s]\n", scriptFile.getName) printf("calling scriptFile: %s\n", scriptFile) val (validTest, exitCode, stdout, stderr) = bashCommand(scriptFile.absPath) - if validTest then + if verifyValid(validTest) then stdout.foreach { printf("stdout: [%s]\n", _) } stderr.foreach { printf("stderr: [%s]\n", _) } val valid = stdout.exists { _.endsWith(expected) } @@ -132,114 +176,16 @@ class BashScriptsTests: val envPairs = List(("SCALA_OPTS", s"@$argsfile")) val (validTest, exitCode, stdout, stderr) = bashCommand(scriptFile.absPath, envPairs) printf("stdout: %s\n", stdout.mkString("\n","\n","")) - if validTest then + if verifyValid(validTest) then val expected = s"${workingDirectory.norm}" - val output = stdout.find( _.trim.startsWith("cwd") ).getOrElse("").dropWhile(_!=' ').trim - printf("output [%s]\n", output) + // stdout might be polluted with an ANSI color prefix, so be careful + val cwdline = stdout.find( _.trim.matches(".*cwd: .*") ).getOrElse("") + printf("cwdline [%s]\n", cwdline) printf("expected[%s]\n", expected) - val valid = output.startsWith(expected) + val valid = cwdline.endsWith(expected) + if (!valid) then + stdout.foreach { printf("stdout[%s]\n", _) } + stderr.foreach { printf("stderr[%s]\n", _) } if valid then printf(s"\n===> success: classpath begins with %s, as reported by [%s]\n", workingDirectory, scriptFile.getName) assert(valid, s"script ${scriptFile.absPath} did not report valid java.class.path first entry") - def existingPath: String = envOrElse("PATH", "").norm - def adjustedPath = s"$javaHome/bin$psep$scalaHome/bin$psep$existingPath" - def pathEntries = adjustedPath.split(psep).toList - - lazy val argsfile = createArgsFile() // avoid problems caused by drive letter - def createArgsFile(): String = - val utfCharset = java.nio.charset.StandardCharsets.UTF_8.name - val text = s"-classpath $cwd" - val path = Files.createTempFile("scriptingTest", ".args") - val text = s"-classpath ${workingDirectory.absPath}" - Files.write(path, text.getBytes(utfCharset)) - path.toFile.getAbsolutePath.norm - - def fixHome(s: String): String = - s.startsWith("~") match { - case false => s - case true => s.replaceFirst("~", userHome) - } - - extension(s: String) { - def toPath: Path = Paths.get(fixHome(s)) // .toAbsolutePath - def toFile: File = s.toPath.toFile - def absPath: String = s.toFile.absPath - def norm: String = s.replace('\\', '/') // bash expects forward slash - def isFile: Boolean = s.toFile.isFile - def exists: Boolean = s.toPath.toFile.exists - def name: String = s.toFile.getName - def dropExtension: String = s.reverse.dropWhile(_ != '.').drop(1).reverse - def parent(up: Int): String = s.norm.split("/").reverse.drop(up).reverse.mkString("/") - } - - extension(p: Path) { - def listFiles: Seq[File] = p.toFile.listFiles.toList - def norm: String = p.normalize.toString.replace('\\', '/') - def name: String = p.toFile.getName - } - - extension(f: File) { - def name = f.getName - def norm: String = f.toPath.normalize.norm - def absPath: String = f.getAbsolutePath.norm - } - - lazy val psep: String = propOrElse("path.separator", "") - lazy val osname = propOrElse("os.name", "").toLowerCase - - lazy val scalacPath = s"$workingDirectory/dist/target/pack/bin/scalac".norm - lazy val scalaPath = s"$workingDirectory/dist/target/pack/bin/scala".norm - - extension(f: File) def absPath: String = - f.getAbsolutePath.norm - - // use optional TEST_BASH if defined, otherwise, bash must be in PATH - lazy val bashExe: String = envOrElse("TEST_BASH", whichBash) - - // test env SCALA_HOME is: - // dist/target/pack, if present - // else, SCALA_HOME if defined - // else, not defined - lazy val scalaHome = - if scalacPath.isFile then scalacPath.replaceAll("/bin/scalac", "") - else envOrElse("SCALA_HOME", "").norm - - lazy val javaHome = whichJava.parent(2) - - lazy val testEnvPairs = List( - ("JAVA_HOME", javaHome), - ("SCALA_HOME", scalaHome), - ("PATH", adjustedPath), - ).filter { case (name, valu) => valu.nonEmpty } - - lazy val whichBash: String = whichExe("bash") - lazy val whichJava: String = whichExe("java") - - def whichExe(basename: String): String = - val exeName = if (osname.toLowerCase.startsWith("windows")) s"$basename.exe" else basename - which(exeName) - - def bashCommand(cmdstr: String, additionalEnvPairs: List[(String, String)] = Nil): (Boolean, Int, Seq[String], Seq[String]) = { - var (stdout, stderr) = (List.empty[String], List.empty[String]) - if bashExe.toFile.exists then - val cmd = Seq(bashExe, "-c", cmdstr) - val envPairs = testEnvPairs ++ additionalEnvPairs - val proc = Process(cmd, None, envPairs *) - val exitVal = proc ! ProcessLogger ( - (out: String) => stdout ::= out, - (err: String) => stderr ::= err - ) - val validTest = exitVal == 0 && ! stderr.exists(_.contains("Permission denied")) - if ! validTest then - printf("\nunable to execute script, return value is %d\n", exitVal) - stderr.foreach { System.err.printf("stderr [%s]\n", _) } - (validTest, exitVal, stdout.reverse, stderr.reverse) - else - (false, -1, Nil, Nil) - } - - def execCmd(command: String, options: String *): Seq[String] = - val cmd = (command :: options.toList).toSeq - for { - line <- Process(cmd).lazyLines_! - } yield line diff --git a/compiler/test/dotty/tools/scripting/ClasspathTests.scala b/compiler/test/dotty/tools/scripting/ClasspathTests.scala index d755789543a3..767c30e60ad6 100755 --- a/compiler/test/dotty/tools/scripting/ClasspathTests.scala +++ b/compiler/test/dotty/tools/scripting/ClasspathTests.scala @@ -3,27 +3,23 @@ package tools package scripting import java.io.File -import java.nio.file.{Files, Paths, Path} - -import org.junit.Test +import java.nio.file.Path +import org.junit.{Test, Ignore, AfterClass} import vulpix.TestConfiguration - -import scala.sys.process._ -import scala.jdk.CollectionConverters._ -import dotty.tools.dotc.config.Properties._ +import ScriptTestEnv.* /** Test java command line generated by bin/scala and bin/scalac */ -class ClasspathTests: - val packBinDir = "dist/target/pack/bin" - val packLibDir = "dist/target/pack/lib" - - def exists(scriptPath: Path): Boolean = Files.exists(scriptPath) - def packBinScalaExists:Boolean = exists(Paths.get(s"$packBinDir/scala")) +class ClasspathTests: /* + * Test disabled (temporarily). * verify classpath reported by called script. + * This need to be reconceptualized. + * System property "java.class.path" does not necessarily contain the actual runtime path, + * So this test can fail even when the classpath is correct. */ + @Ignore @Test def hashbangClasspathVerifyTest = { // only interested in classpath test scripts val testScriptName = "classpathReport.sc" @@ -41,21 +37,38 @@ class ClasspathTests: cmd.foreach { printf("[%s]\n", _) } - // test script reports the classpath it sees - val scriptOutput = exec(cmd:_*) - val scriptCwd = findTaggedLine("cwd", scriptOutput) + // classpathReport.sc is expected to produce two lines: + // cwd: + // classpath: + + val scriptOutput: Seq[String] = exec(cmd:_*) + val scriptCwd: String = findTaggedLine("cwd", scriptOutput) // the value tagged "cwd: " printf("script ran in directory [%s]\n", scriptCwd) - val scriptCp = findTaggedLine("classpath", scriptOutput) + val scriptCp = findTaggedLine("classpath", scriptOutput) // the value tagged "classpath: " - val hashbangClasspathJars = scriptCp.split(psep).map { _.getName }.sorted.distinct - val packlibJars = listJars(s"$scriptCwd/$packLibDir").sorted.distinct + // convert scriptCp to a list of files + val hashbangJars: List[File] = scriptCp.split(psep).map { _.toFile }.toList + val hashbangClasspathJars = hashbangJars.map { _.name }.sorted.distinct // get jar basenames, remove duplicates + val packlibDir = s"$scriptCwd/$packLibDir" // classpathReport.sc specifies a wildcard classpath in this directory + val packlibJars: List[File] = listJars(packlibDir) // classpath entries expected to have been reported by the script printf("%d jar files in dist/target/pack/lib\n", packlibJars.size) printf("%d test script jars in classpath\n", hashbangClasspathJars.size) - // verify that the classpath set in the hashbang line is effective - if hashbangClasspathJars.size != packlibJars.size then - printf("hashbangClasspathJars: %s\n", hashbangClasspathJars.mkString("\n ", "\n ", "")) + val (diff: Set[File], msg: String) = if (packlibJars.size > hashbangClasspathJars.size) { + (packlibJars.toSet -- hashbangJars.toSet , "only in packlib classpath") + } else { + (hashbangJars.toSet -- packlibJars.toSet , "only in hashbang classpath") + } + // verify that the script hasbang classpath setting was effective at supplementing the classpath + // (a minimal subset of jars below dist/target/pack/lib are always be in the classpath) + val missingClasspathEntries = if hashbangClasspathJars.size != packlibJars.size then + printf("packlib dir [%s]\n", packlibDir) + printf("hashbangClasspathJars: %s\n", hashbangJars.map { _.relpath.norm }.mkString("\n ", "\n ", "")) + printf("# %s\n", msg) + diff.foreach { (f: File) => printf(" %s\n", f.relpath.norm) } + else + Set.empty[String] assert(hashbangClasspathJars.size == packlibJars.size) } @@ -64,7 +77,7 @@ class ClasspathTests: */ @Test def unglobClasspathVerifyTest = { val testScriptName = "unglobClasspath.sc" - val testScript = scripts("/scripting").find { _.getName.matches(testScriptName) } match + val testScript = scripts("/scripting").find { _.name.matches(testScriptName) } match case None => sys.error(s"test script not found: ${testScriptName}") case Some(file) => file @@ -73,7 +86,7 @@ class ClasspathTests: printf("bash is [%s]\n", bashExe) if packBinScalaExists then - val bashCmdline = s"SCALA_OPTS= $relpath" + val bashCmdline = s"set +x ; SCALA_OPTS= $relpath" val cmd = Array(bashExe, "-c", bashCmdline) cmd.foreach { printf("[%s]\n", _) } @@ -81,105 +94,9 @@ class ClasspathTests: // test script reports the classpath it sees val scriptOutput = exec(cmd:_*) val scriptCp = findTaggedLine("unglobbed classpath", scriptOutput) + printf("%s\n", scriptCp) val classpathJars = scriptCp.split(psep).map { _.getName }.sorted.distinct //classpathJars.foreach { printf("%s\n", _) } assert(classpathJars.size > 1) } - -//////////////// end of tests //////////////// -lazy val cwd = Paths.get(".").toAbsolutePath -lazy val wildcardEntry = "dist/target/pack/lib/*" - -def listJars(dir: String) = - val packlibDir = Paths.get(dir).toFile - if packlibDir.isDirectory then - packlibDir.listFiles.toList.map { _.getName }.filter { _.endsWith(".jar") } - else - Nil - -import scala.jdk.CollectionConverters._ -lazy val env:Map[String, String] = System.getenv.asScala.toMap - -// script output expected as ": " -def findTaggedLine(tag: String, lines: Seq[String]): String = - lines.find { _.startsWith(tag) } match - case None => - lines.foreach { System.err.printf("line[%s]\n", _) } - sys.error(s"no $tag: found in script output") - case Some(cwd) => cwd.dropWhile( _ != ' ').trim // discard tag - -def exec(cmd: String *): Seq[String] = Process(cmd).lazyLines_!.toList - -def which(str:String) = - var out = "" - path.find { entry => - val it = Paths.get(entry).toAbsolutePath - it.toFile.isDirectory && { - var testpath = s"$it/$str".norm - val test = Paths.get(testpath) - if test.toFile.exists then - out = testpath - true - else - val test = Paths.get(s"$it/$str.exe".norm) - if test.toFile.exists then - out = testpath - true - else - false - } - } - - out - -def bashExe = which("bash") -def unameExe = which("uname") -def path = envOrElse("PATH", "").split(psep).toList -def psep = sys.props("path.separator") - -def cygwin = ostype == "cygwin" -def mingw = ostype == "mingw" -def msys = ostype == "msys" -def winshell = cygwin || mingw || msys - -def ostypeFull = if unameExe.nonEmpty then exec(unameExe).mkString else "" -def ostype = ostypeFull.toLowerCase.takeWhile{ cc => cc >= 'a' && cc <='z' || cc >= 'A' && cc <= 'Z' } - -extension(p:Path) - def relpath: Path = cwd.relativize(p) - def norm: String = p.toString.replace('\\', '/') - -extension(path: String) - def getName: String = norm.replaceAll(".*/", "") - - // Normalize path separator, convert relative path to absolute - def norm: String = - path.replace('\\', '/') match { - case s if s.secondChar == ":" => s // .drop(2) // path without drive letter - case s if s.startsWith("./") => s.drop(2) - case s => s - } - - def parent: String = norm.replaceAll("/[^/]*$", "") - - // convert to absolute path relative to cwd. - def absPath: String = norm match - case str if str.isAbsolute => norm - case _ => Paths.get(userDir, norm).toString.norm - - def isDir: Boolean = Files.isDirectory(Paths.get(path)) - - def toUrl: String = Paths.get(absPath).toUri.toURL.toString - - // Treat norm paths with a leading '/' as absolute. - // Windows java.io.File#isAbsolute treats them as relative. - def isAbsolute = path.norm.startsWith("/") || (isWin && path.secondChar == ":") - def secondChar: String = path.take(2).drop(1).mkString("") - -extension (str: String) def dropExtension = - str.reverse.dropWhile(_ != '.').drop(1).reverse - -//extension(f: File) def absPath = -//f.getAbsolutePath.replace('\\', '/') - diff --git a/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala b/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala new file mode 100644 index 000000000000..a37918f93ed2 --- /dev/null +++ b/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala @@ -0,0 +1,292 @@ +package dotty +package tools +package scripting + +import java.io.File +import java.nio.file.{Path, Paths, Files} + +import dotty.tools.dotc.config.Properties.* + +import scala.sys.process.* +import scala.jdk.CollectionConverters.* + +/** + * Common Code for supporting scripting tests. + * To override the path to the bash executable, set TEST_BASH= + * To specify where `dist/target/pack/bin` resides, set TEST_CWD= + * Test scripts run in a bash env, so paths are converted to forward slash via .norm. + */ +object ScriptTestEnv { + def osname: String = sys.props("os.name").toLowerCase + def psep: String = sys.props("path.separator") + def userDir: String = sys.props("user.dir").norm + def testCwd = envOrElse("TEST_CWD", "").norm // optional working directory TEST_CWD + + def whichJava: String = whichExe("java") + def whichBash: String = whichExe("bash") + + lazy val workingDirectory: String = { + val dirstr = if testCwd.nonEmpty then + printf("TEST_CWD set to [%s]\n", testCwd) + testCwd + else + userDir // userDir, if TEST_CWD not set + + // issue warning if things don't look right + val test = Paths.get(s"$dirstr/dist/target/pack/bin").normalize + if !test.isDirectory then + printf("warning: not found below working directory: %s\n", test.norm) + + printf("working directory is [%s]\n", dirstr) + dirstr + } + + def envPath: String = envOrElse("PATH", "") + // remove duplicate entries in path + def supplementedPath: String = s"dist/target/pack/bin$psep$envJavaHome/bin$psep$envScalaHome/bin$psep$envPath".norm + def adjustedPathEntries: List[String] = supplementedPath.norm.split(psep).toList.distinct + def adjustedPath: String = adjustedPathEntries.mkString(psep) + def envPathEntries: List[String] = envPath.split(psep).toList.distinct + + def bashExe: String = envOrElse("TEST_BASH", whichBash) + + def unameExe = which("uname") + def ostypeFull = if unameExe.nonEmpty then exec(unameExe).mkString else "" + def ostype = ostypeFull.toLowerCase.takeWhile{ cc => cc >= 'a' && cc <='z' || cc >= 'A' && cc <= 'Z' } + + def cygwin = ostype == "cygwin" + def mingw = ostype == "mingw" + def msys = ostype == "msys" + def winshell: Boolean = cygwin || mingw || msys + + def which(str: String) = + var out = "" + // must not use adjusted path here! (causes recursive call / stack overflow) + envPathEntries.find { entry => + val it = Paths.get(entry).toAbsolutePath.normalize + it.toFile.isDirectory && { + var testpath = s"$it/$str".norm + val test = Paths.get(testpath) + if test.toFile.exists then + out = testpath + true + else + val test = Paths.get(s"$it/$str.exe".norm) + if test.toFile.exists then + out = testpath + true + else + false + } + } + out + + def whichExe(basename: String): String = + val exeName = if (osname.toLowerCase.startsWith("windows")) s"$basename.exe" else basename + which(exeName) + + /* returned values are: + * validTest: Boolean - false if permissions problems occur, true otherwise + * exitVal: Int - the conventional return error code, where zero implies "no errors". + * stdout: Seq[String] - the lines captured from STDOUT + * stderr: Seq[String] - the lines captured from STDERR + */ + def bashCommand(cmdstr: String, additionalEnvPairs: List[(String, String)] = Nil): (Boolean, Int, Seq[String], Seq[String]) = { + var (stdout, stderr) = (List.empty[String], List.empty[String]) + if bashExe.toFile.exists then + def q = "\"" + printf("bashCmd: %s -c %s\n", bashExe, s"$q$cmdstr$q") + val cmd = Seq(bashExe, "-c", cmdstr) + val envPairs = testEnvPairs ++ additionalEnvPairs + val proc = Process(cmd, None, envPairs *) + val exitVal = proc ! ProcessLogger ( + (out: String) => stdout ::= out, + (err: String) => stderr ::= err + ) + // a misconfigured environment (e.g., script is not executable) can prevent script execution + val validTest = !stderr.exists(_.contains("Permission denied")) + if ! validTest then + printf("\nunable to execute script, return value is %d\n", exitVal) + stderr.foreach { System.err.printf("stderr [%s]\n", _) } + + (validTest, exitVal, stdout.reverse, stderr.reverse) + else + (false, -1, Nil, Nil) + } + + def execCmd(command: String, options: String *): Seq[String] = + val cmd = (command :: options.toList).toSeq + for { + line <- Process(cmd).lazyLines_! + } yield line + + + def packBinDir = "dist/target/pack/bin" + def packLibDir = "dist/target/pack/lib" + def packBinScalaExists: Boolean = Files.exists(Paths.get(s"$packBinDir/scala")) + + def listJars(dir: String): List[File] = + val packlibDir = Paths.get(dir).toFile + if packlibDir.isDirectory then + packlibDir.listFiles.toList.filter { _.getName.endsWith(".jar") } + else + Nil + + // script output expected as ": " + def findTaggedLine(tag: String, lines: Seq[String]): String = + lines.map { stripColors(_) }.find { _.startsWith(tag) } match + case None => + lines.foreach { System.err.printf("line[%s]\n", _) } + sys.error(s"no $tag: found in script output") + case Some(cwd) => cwd.dropWhile( _ != ' ').trim // discard tag + + def stripColors(line:String): String = + // ESC has be seen in the wild replaced by "\u2190" + // Also, BOM marker appears as  + lazy val colorsRegex = "(\u001b|\u2190)\\[[0-9;]*m|".r + colorsRegex.replaceAllIn(line,"") + + def exec(cmd: String *): Seq[String] = Process(cmd).lazyLines_!.toList + + def script2jar(scriptFile: File) = + val jarName = s"${scriptFile.getName.dropExtension}.jar" + File(scriptFile.getParent, jarName) + + def showScriptUnderTest(scriptFile: File): Unit = + printf("===> test script name [%s]\n", scriptFile.getName) + + def callExecutableJar(script: File, jar: File, scriptArgs: Array[String] = Array.empty[String]) = { + import scala.sys.process._ + val cmd = Array("java", s"-Dscript.path=${script.getName}", "-jar", jar.absPath) + ++ scriptArgs + Process(cmd).lazyLines_!.foreach { println } + } + + //////////////////////////////////////////////////////////////////////////////// + + def createArgsFile(): String = + val utfCharset = java.nio.charset.StandardCharsets.UTF_8.name + val path = Files.createTempFile("scriptingTest", ".args") + val text = s"-classpath ${workingDirectory.absPath}" + Files.write(path, text.getBytes(utfCharset)) + path.toFile.getAbsolutePath.norm + + def fixHome(s: String): String = + s.startsWith("~") match { + case false => s + case true => s.replaceFirst("~", userHome) + } + + extension(s: String) { + def norm: String = s.replace('\\', '/') // bash expects forward slash + def noDrive = if s.secondChar == ":" then s.drop(2).norm else s.norm + def toPath: Path = Paths.get(fixHome(s)) // .toAbsolutePath + def toFile: File = File(s) + def absPath: String = s.toFile.absPath + def relpath: String = s.norm.replaceFirst(s"${cwd.norm}/","") + def isFile: Boolean = s.toFile.isFile + def isDirectory: Boolean = s.toFile.isDirectory + def exists: Boolean = s.toFile.exists + def name: String = s.toFile.getName + def getName: String = s.toFile.getName + def dropExtension: String = s.reverse.dropWhile(_ != '.').drop(1).reverse + def parent(up: Int): String = s.norm.split("/").reverse.drop(up).reverse.mkString("/") + def secondChar: String = s.take(2).drop(1).mkString("") + } + + extension(p: Path) { + def norm: String = p.normalize.toString.replace('\\', '/') + def noDrive = p.norm match { + case str if str.drop(1).take(1) == ":" => str.drop(2) + case str => str + } + def name: String = p.toFile.getName + def relpath: Path = cwd.relativize(p).normalize + def files: Seq[File] = p.toFile.files + def parent: String = norm.replaceAll("/[^/]*$", "") + + // convert to absolute path relative to cwd. + def absPath: String = if (p.isAbsolute) p.norm else Paths.get(userDir, p.norm).norm + + def isDir: Boolean = Files.isDirectory(p) + def isDirectory: Boolean = p.toFile.isDirectory + def isFile: Boolean = p.toFile.isFile + + def toUrl: String = Paths.get(absPath).toUri.toURL.toString + + // Treat norm paths with a leading '/' as absolute (Windows java.io.File#isAbsolute treats them as relative) + def isAbsolute = p.norm.startsWith("/") || (isWin && p.norm.secondChar == ":") + } + + extension(f: File) { + def name = f.getName + def norm: String = f.toPath.normalize.norm + def absPath: String = f.getAbsolutePath.norm + def relpath: Path = f.toPath.relpath + def files: Seq[File] = f.listFiles.toList + def parentDir: Path = f.toPath.getParent + } + + lazy val cwd: Path = Paths.get(".").toAbsolutePath.normalize + + lazy val (scalacPath: String, scalaPath: String) = { + val scalac = s"$workingDirectory/dist/target/pack/bin/scalac".toPath.normalize + val scala = s"$workingDirectory/dist/target/pack/bin/scala".toPath.normalize + (scalac.norm, scala.norm) + } + + + // use optional TEST_BASH if defined, otherwise, bash must be in PATH + + // envScalaHome is: + // dist/target/pack, if present + // else, SCALA_HOME if defined + // else, not defined + lazy val envScalaHome = + printf("scalacPath: %s\n", scalacPath.norm) + if scalacPath.isFile then scalacPath.replaceAll("/bin/scalac", "") + else envOrElse("SCALA_HOME", "not-found").norm + + lazy val javaParent: String = whichJava.parent(2) + lazy val envJavaHome: String = envOrElse("JAVA_HOME", javaParent) + lazy val cyghome = envOrElse("CYGWIN", "") + lazy val msyshome = envOrElse("MSYS", "") + + // remove xtrace, if present, add :igncr: if not present + lazy val shellopts: String = { + val value: String = envOrElse("SHELLOPTS", "braceexpand:hashall:igncr:ignoreeof:monitor:vi") + val list: List[String] = value.split(":").toList + val minlist = list.filter { + case "igncr" | "xtrace" => false + case _ => true + } + if isWin then + "igncr" :: minlist + else + minlist + }.mkString(":") + + lazy val testEnvPairs = { + val pairs = List( + ("JAVA_HOME", envJavaHome), + ("SCALA_HOME", envScalaHome), + ("PATH", adjustedPath), + ("CYGWIN", cyghome), + ("MSYS", msyshome), + ("SHELLOPTS", shellopts), + ).filter { case (name, valu) => valu.nonEmpty } + for (k, v) <- pairs do + printf("%s : %s\n", k ,v) + pairs + } + + // if unable to execute bash commands, this prevents invalid tests from failing + lazy val passInvalidTests = envOrElse("PASS_INVALID_TESTS", "").nonEmpty + + def verifyValid(validTest: Boolean): Boolean = + // !validTest implies unable to execute scripts via bash (e.g., permissions, or bash not found, etc.) + if !validTest && !passInvalidTests then + assert(validTest == true, s"unable to call script via bash -c") + + validTest +} diff --git a/compiler/test/dotty/tools/scripting/ScriptingTests.scala b/compiler/test/dotty/tools/scripting/ScriptingTests.scala index 922564d4ff58..7ddab2b55424 100644 --- a/compiler/test/dotty/tools/scripting/ScriptingTests.scala +++ b/compiler/test/dotty/tools/scripting/ScriptingTests.scala @@ -8,49 +8,13 @@ import java.nio.file.Path import org.junit.Test import vulpix.TestConfiguration - +import ScriptTestEnv.* /** Runs all tests contained in `compiler/test-resources/scripting/` */ class ScriptingTests: - extension (str: String) def dropExtension = - str.reverse.dropWhile(_ != '.').drop(1).reverse - - extension(f: File) def absPath = - f.getAbsolutePath.replace('\\', '/') - // classpath tests managed by scripting.ClasspathTests.scala def testFiles = scripts("/scripting").filter { ! _.getName.toLowerCase.contains("classpath") } - def script2jar(scriptFile: File) = - val jarName = s"${scriptFile.getName.dropExtension}.jar" - File(scriptFile.getParent, jarName) - - def showScriptUnderTest(scriptFile: File): Unit = - printf("===> test script name [%s]\n", scriptFile.getName) - - val argss: Map[String, Array[String]] = ( - for - argFile <- testFiles - if argFile.getName.endsWith(".args") - name = argFile.getName.dropExtension - scriptArgs = readLines(argFile).toArray - yield name -> scriptArgs).toMap - - def scalaFilesWithArgs(extension: String) = ( - for - scriptFile <- testFiles - if scriptFile.getName.endsWith(extension) - name = scriptFile.getName.dropExtension - scriptArgs = argss.getOrElse(name, Array.empty[String]) - yield scriptFile -> scriptArgs).toList.sortBy { (file, args) => file.getName } - - def callExecutableJar(script: File, jar: File, scriptArgs: Array[String] = Array.empty[String]) = { - import scala.sys.process._ - val cmd = Array("java", s"-Dscript.path=${script.getName}", "-jar", jar.absPath) - ++ scriptArgs - Process(cmd).lazyLines_!.foreach { println } - } - /* * Call .scala scripts without -save option, verify no jar created */ @@ -71,7 +35,7 @@ class ScriptingTests: printf("mainClass from ScriptingDriver: %s\n", mainClass) true // call compiled script main method } - assert(! unexpectedJar.exists, s"not expecting jar file: ${unexpectedJar.absPath}") + assert( !unexpectedJar.exists, s"not expecting jar file: ${unexpectedJar.absPath}" ) /* * Call .sc scripts without -save option, verify no jar created @@ -89,7 +53,7 @@ class ScriptingTests: ) ++ scriptArgs Main.main(mainArgs) - assert(! unexpectedJar.exists, s"not expecting jar file: ${unexpectedJar.absPath}") + assert( !unexpectedJar.exists, s"not expecting jar file: ${unexpectedJar.absPath}") /* * Call .sc scripts with -save option, verify jar is created. @@ -125,7 +89,7 @@ class ScriptingTests: // verify main method not called when false is returned printf("testing script compile, with no call to script main method.\n") touchedFile.delete - assert(!touchedFile.exists, s"unable to delete ${touchedFile}") + assert( !touchedFile.exists, s"unable to delete ${touchedFile}" ) ScriptingDriver( compilerArgs = Array("-classpath", TestConfiguration.basicClasspath), scriptFile = scriptFile, @@ -174,12 +138,44 @@ class ScriptingTests: assert(expectedJar.exists, s"unable to create executable jar [$expectedJar]") touchedFile.delete - assert(!touchedFile.exists, s"unable to delete ${touchedFile}") + assert( !touchedFile.exists, s"unable to delete ${touchedFile}" ) printf("calling executable jar %s\n", expectedJar) callExecutableJar(scriptFile, expectedJar) if touchedFile.exists then printf("success: executable jar created file %s\n", touchedFile) assert( touchedFile.exists, s"expected to find file ${touchedFile}" ) +/////////////////////////////////// def touchFileScript = testFiles.find(_.getName == "touchFile.sc").get + def touchedFile = File("touchedFile.out") + + def script2jar(scriptFile: File) = + val jarName = s"${scriptFile.getName.dropExtension}.jar" + File(scriptFile.getParent, jarName) + + def showScriptUnderTest(scriptFile: File): Unit = + printf("===> test script name [%s]\n", scriptFile.getName) + + def argss: Map[String, Array[String]] = ( + for + argFile <- testFiles + if argFile.getName.endsWith(".args") + name = argFile.getName.dropExtension + scriptArgs = readLines(argFile).toArray + yield name -> scriptArgs).toMap + + def scalaFilesWithArgs(extension: String) = ( + for + scriptFile <- testFiles + if scriptFile.getName.endsWith(extension) + name = scriptFile.getName.dropExtension + scriptArgs = argss.getOrElse(name, Array.empty[String]) + yield scriptFile -> scriptArgs).toList.sortBy { (file, args) => file.getName } + + def callExecutableJar(script: File, jar: File, scriptArgs: Array[String] = Array.empty[String]) = { + import scala.sys.process._ + val cmd = Array("java", s"-Dscript.path=${script.getName}", "-jar", jar.absPath) + ++ scriptArgs + Process(cmd).lazyLines_!.foreach { println } + } diff --git a/dist/bin/scala b/dist/bin/scala index 8a87d6d0d8a0..b3116b2706b3 100755 --- a/dist/bin/scala +++ b/dist/bin/scala @@ -45,6 +45,16 @@ while [[ $# -gt 0 ]]; do addScala "$1" shift ;; + -classpath*) + if [ "$1" != "${1##* }" ]; then + # hashbang-combined args "-classpath 'lib/*'" + A=$1 ; shift # consume $1 before adding its substrings back + set -- $A "$@" # split $1 on whitespace and put it back + else + addScala "$1" + shift + fi + ;; *) addScala "$1" shift From 77dd6e198e0c40b952b3f46bc3ecf0ba7f116588 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Wed, 15 Dec 2021 15:46:29 +0100 Subject: [PATCH 0924/1244] Check for splices in quoted macro parameters Closes #12225 --- compiler/src/dotty/tools/dotc/transform/Splicer.scala | 9 ++++++++- tests/neg-macros/i12225.scala | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 tests/neg-macros/i12225.scala diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala index 06162ef513fa..49b6f5564620 100644 --- a/compiler/src/dotty/tools/dotc/transform/Splicer.scala +++ b/compiler/src/dotty/tools/dotc/transform/Splicer.scala @@ -149,7 +149,14 @@ object Splicer { case Typed(expr, _) => checkIfValidArgument(expr) case Apply(Select(Apply(fn, quoted :: Nil), nme.apply), _) if fn.symbol == defn.QuotedRuntime_exprQuote => - // OK + val noSpliceChecker = new TreeTraverser { + def traverse(tree: Tree)(using Context): Unit = tree match + case Spliced(_) => + report.error("Quoted argument of macros may not have splices", tree.srcPos) + case _ => + traverseChildren(tree) + } + noSpliceChecker.traverse(quoted) case Apply(TypeApply(fn, List(quoted)), _)if fn.symbol == defn.QuotedTypeModule_of => // OK diff --git a/tests/neg-macros/i12225.scala b/tests/neg-macros/i12225.scala new file mode 100644 index 000000000000..66d619aad634 --- /dev/null +++ b/tests/neg-macros/i12225.scala @@ -0,0 +1,7 @@ +object TestMacro { + inline def test[T](inline t: T): T = ${ identity('{ identity(${ identity('{ identity(${ identity('t) }) }) }) }) } // error +} + +object Test { + TestMacro.test("x") +} From 85087b819b0eea4a0d4078e3db611eb7e622c35f Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 6 Dec 2021 15:01:48 +0100 Subject: [PATCH 0925/1244] Also consider private symbols in implicit scope of type Fixes #14013 --- .../src/dotty/tools/dotc/typer/Implicits.scala | 2 +- tests/neg/i14013.scala | 15 +++++++++++++++ tests/pos/i14013.scala | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 tests/neg/i14013.scala create mode 100644 tests/pos/i14013.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index cc058cfc2c6e..3b4d3dc899f4 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -288,7 +288,7 @@ object Implicits: } override def isAccessible(ref: TermRef)(using Context): Boolean = - ref.symbol.exists && !ref.symbol.is(Private) + ref.symbol.exists override def toString: String = i"OfTypeImplicits($tp), companions = ${companionRefs.showAsList}%, %; refs = $refs%, %." diff --git a/tests/neg/i14013.scala b/tests/neg/i14013.scala new file mode 100644 index 000000000000..96b2e7c0cdd7 --- /dev/null +++ b/tests/neg/i14013.scala @@ -0,0 +1,15 @@ +object Foo1 { + case class Bar(i: Int) + + private implicit class BarOps(bar: Bar) { + def twice = Bar(bar.i * 2) + } +} + +class Foo { + def bar = Foo.Bar(1).twice // error +} + +object App extends App { + println((new Foo).bar) +} \ No newline at end of file diff --git a/tests/pos/i14013.scala b/tests/pos/i14013.scala new file mode 100644 index 000000000000..351a5c303b9d --- /dev/null +++ b/tests/pos/i14013.scala @@ -0,0 +1,15 @@ +object Foo { + case class Bar(i: Int) + + private implicit class BarOps(bar: Bar) { + def twice = Bar(bar.i * 2) + } +} + +class Foo { + def bar = Foo.Bar(1).twice +} + +object App extends App { + println((new Foo).bar) +} \ No newline at end of file From b70d52260b4e87a0bfa7fcb5ff3879e97c5c6ef7 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 17 Dec 2021 12:15:09 +0100 Subject: [PATCH 0926/1244] Flesh out test --- tests/pos/i14013.scala | 52 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/tests/pos/i14013.scala b/tests/pos/i14013.scala index 351a5c303b9d..d20112392002 100644 --- a/tests/pos/i14013.scala +++ b/tests/pos/i14013.scala @@ -1,3 +1,33 @@ +import LightTypeTagInheritance._ + +trait LightTypeTagRef + +object LightTypeTagInheritance { + private final case class Ctx(self: LightTypeTagInheritance) { + def next(): Ctx = Ctx(self) + } + private implicit final class CtxExt(private val ctx: Ctx) extends AnyVal { + def isChild(selfT0: LightTypeTagRef, thatT0: LightTypeTagRef): Boolean = ctx.self.isChild(ctx.next())(selfT0, thatT0) + } +} + +class LightTypeTagInheritance { + + def isChild(s: LightTypeTagRef, t: LightTypeTagRef): Boolean = { + isChild(new Ctx(this))(s, t) + } + + private def isChild(ctx: Ctx)(s: LightTypeTagRef, t: LightTypeTagRef): Boolean = { + ctx.isChild(s, t) + } + +} + +object App extends App { + println(LightTypeTagInheritance) +} + + object Foo { case class Bar(i: Int) @@ -10,6 +40,24 @@ class Foo { def bar = Foo.Bar(1).twice } -object App extends App { +object App2 extends App { println((new Foo).bar) -} \ No newline at end of file +} + +object Foo2 { + case class Bar(i: Int) + + private given BarOps: AnyRef with { + extension (bar: Bar) + def twice: Bar = Bar(bar.i * 2) + } +} + +class Foo2 { + def bar = Foo2.Bar(1).twice +} + +object App3 extends App { + println((new Foo2).bar) +} + From edfda04871890424d2f6133f96fa0f14332865e7 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 9 Dec 2021 13:22:48 +0100 Subject: [PATCH 0927/1244] Avoid field/field clashes There needs to be a special alignment of planetary body to obtain two fields that have different names for Dotty (one has a FieldName, the other a regular name), but that still map to the same underlying name. This is now detected and resolved. Fixes #13862 --- .../src/dotty/tools/dotc/core/NameKinds.scala | 1 + .../src/dotty/tools/dotc/core/NameTags.scala | 3 +++ .../tools/dotc/transform/Constructors.scala | 23 +++++++++++++++++++ tests/run/i13862.scala | 11 +++++++++ 4 files changed, 38 insertions(+) create mode 100644 tests/run/i13862.scala diff --git a/compiler/src/dotty/tools/dotc/core/NameKinds.scala b/compiler/src/dotty/tools/dotc/core/NameKinds.scala index 2b3806e48f79..0e9ccecb18c8 100644 --- a/compiler/src/dotty/tools/dotc/core/NameKinds.scala +++ b/compiler/src/dotty/tools/dotc/core/NameKinds.scala @@ -369,6 +369,7 @@ object NameKinds { val FieldName: SuffixNameKind = new SuffixNameKind(FIELD, "$$local") { override def mkString(underlying: TermName, info: ThisInfo) = underlying.toString } + val ExplicitFieldName: SuffixNameKind = new SuffixNameKind(EXPLICITFIELD, "$field") val ExtMethName: SuffixNameKind = new SuffixNameKind(EXTMETH, "$extension") val ParamAccessorName: SuffixNameKind = new SuffixNameKind(PARAMACC, "$accessor") val ModuleClassName: SuffixNameKind = new SuffixNameKind(OBJECTCLASS, "$", optInfoString = "ModuleClass") diff --git a/compiler/src/dotty/tools/dotc/core/NameTags.scala b/compiler/src/dotty/tools/dotc/core/NameTags.scala index 5628adbd6f89..59dfaa3d437b 100644 --- a/compiler/src/dotty/tools/dotc/core/NameTags.scala +++ b/compiler/src/dotty/tools/dotc/core/NameTags.scala @@ -37,6 +37,9 @@ object NameTags extends TastyFormat.NameTags { final val AVOIDLOWER = 36 final val AVOIDBOTH = 37 + inline val EXPLICITFIELD = 38 // An explicitly named field, introduce to avoid a clash + // with a regular field of the underlying name + def nameTagToString(tag: Int): String = tag match { case UTF8 => "UTF8" case QUALIFIED => "QUALIFIED" diff --git a/compiler/src/dotty/tools/dotc/transform/Constructors.scala b/compiler/src/dotty/tools/dotc/transform/Constructors.scala index b5b8ae7cd3e4..86a7232e3d8d 100644 --- a/compiler/src/dotty/tools/dotc/transform/Constructors.scala +++ b/compiler/src/dotty/tools/dotc/transform/Constructors.scala @@ -9,7 +9,9 @@ import dotty.tools.dotc.core.StdNames._ import ast._ import Trees._ import Flags._ +import Names.Name import NameOps._ +import NameKinds.{FieldName, ExplicitFieldName} import SymUtils._ import Symbols._ import Decorators._ @@ -249,7 +251,28 @@ class Constructors extends MiniPhase with IdentityDenotTransformer { thisPhase = splitStats(stats1) case Nil => } + + /** Check that we do not have both a private field with name `x` and a private field + * with name `FieldName(x)`. These will map to the same JVM name and therefore cause + * a duplicate field error. If that case arises (as in i13862.scala), use an explicit + * name `x$field` instead of `FieldName(x). + */ + def checkNoFieldClashes() = + val fieldNames = mutable.HashSet[Name]() + for case field: ValDef <- clsStats do + field.symbol.name match + case FieldName(_) => + case name => fieldNames += name + for case field: ValDef <- clsStats do + field.symbol.name match + case fldName @ FieldName(name) if fieldNames.contains(name) => + val newName = ExplicitFieldName(name) + report.log(i"avoid field/field conflict by renaming $fldName to $newName") + field.symbol.copySymDenotation(name = newName).installAfter(thisPhase) + case _ => + splitStats(tree.body) + checkNoFieldClashes() // The initializers for the retained accessors */ val copyParams = accessors flatMap { acc => diff --git a/tests/run/i13862.scala b/tests/run/i13862.scala new file mode 100644 index 000000000000..4577f65e50d9 --- /dev/null +++ b/tests/run/i13862.scala @@ -0,0 +1,11 @@ +trait Foo(val num: Int) // a trait with a parameter stored in a val + +class Bar(num: Int) extends Foo(num): // an extending class with a parameter of the same name + def bar = this.num // implicitly creates another num in Bar + +@main def Test = Bar(123) + +class Bar2(n: Int) extends Foo(n): // an extending class with a parameter of the same name + private val num = n + def bar = this.num // implicitly creates another num in Bar + From 3bbaf4275aa8baa6432593268eb72c4134523200 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Fri, 17 Dec 2021 14:24:07 +0100 Subject: [PATCH 0928/1244] Fix Java 8 CI --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1e9a145127bf..aa7a7a773a99 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -403,7 +403,7 @@ jobs: - name: Test run: | - ./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test" + ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test" ./project/scripts/bootstrapCmdTests publish_nightly: From 9e357d057c45f9192fd0c6f6504f6ec0b06e70ee Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 6 Dec 2021 12:53:10 +0100 Subject: [PATCH 0929/1244] Retain HasDefaultParams flag on export. Fixes #14020 --- compiler/src/dotty/tools/dotc/core/Flags.scala | 2 +- compiler/src/dotty/tools/dotc/typer/Namer.scala | 1 + tests/run/i14020.check | 3 +++ tests/run/i14020.scala | 13 +++++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 tests/run/i14020.check create mode 100644 tests/run/i14020.scala diff --git a/compiler/src/dotty/tools/dotc/core/Flags.scala b/compiler/src/dotty/tools/dotc/core/Flags.scala index cb590e2384a0..817ae575581a 100644 --- a/compiler/src/dotty/tools/dotc/core/Flags.scala +++ b/compiler/src/dotty/tools/dotc/core/Flags.scala @@ -531,7 +531,7 @@ object Flags { val RetainedModuleClassFlags: FlagSet = RetainedModuleValAndClassFlags | Enum /** Flags retained in export forwarders */ - val RetainedExportFlags = Given | Implicit | Inline | Transparent + val RetainedExportFlags = Given | Implicit | Inline | Transparent | HasDefaultParams | NoDefaultParams /** Flags that apply only to classes */ val ClassOnlyFlags = Sealed | Open | Abstract.toTypeFlags diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala index ed124b7a2fc8..a50409bcb6ff 100644 --- a/compiler/src/dotty/tools/dotc/typer/Namer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala @@ -1142,6 +1142,7 @@ class Namer { typer: Typer => (StableRealizable, ExprType(path.tpe.select(sym))) else (EmptyFlags, mbr.info.ensureMethodic) + sym.hasDefaultParams // ensure HasDefaultParams and NoDefaultParams flags are set var mbrFlags = Exported | Method | Final | maybeStable | sym.flags & RetainedExportFlags if sym.is(ExtensionMethod) then mbrFlags |= ExtensionMethod val forwarderName = checkNoConflict(alias, isPrivate = false, span) diff --git a/tests/run/i14020.check b/tests/run/i14020.check new file mode 100644 index 000000000000..420d0f6f5bfc --- /dev/null +++ b/tests/run/i14020.check @@ -0,0 +1,3 @@ +Hello you +Hello John +Hello you diff --git a/tests/run/i14020.scala b/tests/run/i14020.scala new file mode 100644 index 000000000000..60b0caaf1a67 --- /dev/null +++ b/tests/run/i14020.scala @@ -0,0 +1,13 @@ +class A: + def greeting(name: String = "you") = s"Hello $name" + +class B: + val a = A() + export a.* + +@main def Test = + val b = B() + + println(b.a.greeting()) // works + println(b.greeting("John")) // works + println(b.greeting()) // nope ! \ No newline at end of file From 5018700da60cdb684aaf36dea5d40876b5e75539 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 7 Dec 2021 11:45:07 +0100 Subject: [PATCH 0930/1244] Make export of default getters work also with named and given exports --- .../src/dotty/tools/dotc/typer/Namer.scala | 60 +++++++++++++------ tests/run/i14020.check | 4 ++ tests/run/i14020.scala | 24 +++++++- 3 files changed, 68 insertions(+), 20 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala index a50409bcb6ff..fbb38afed73c 100644 --- a/compiler/src/dotty/tools/dotc/typer/Namer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala @@ -1096,6 +1096,26 @@ class Namer { typer: Typer => else Yes } + def defaultGetters(sym: TermSymbol): List[Symbol] = + def recur(params: List[Symbol], paramss: List[List[Symbol]], n: Int): List[Symbol] = + params match + case param :: params1 => + def otherGetters = + recur(params1, paramss, if param.isType then n else n + 1) + if param.is(HasDefault) then + val getterName = DefaultGetterName(sym.name, n) + val getter = path.tpe.member(DefaultGetterName(sym.name, n)).symbol + assert(getter.exists, i"$path does not have a default getter named $getterName") + getter :: otherGetters + else + otherGetters + case Nil => + paramss match + case params1 :: paramss1 => recur(params1, paramss1, n) + case Nil => Nil + recur(Nil, sym.paramSymss, 0) + .showing(i"default getters of $sym, ${sym.paramSymss.nestedMap(_.flagsString)} = $result") + /** Add a forwarder with name `alias` or its type name equivalent to `mbr`, * provided `mbr` is accessible and of the right implicit/non-implicit kind. */ @@ -1151,20 +1171,18 @@ class Namer { typer: Typer => forwarder.info = avoidPrivateLeaks(forwarder) forwarder.addAnnotations(sym.annotations) - val forwarderDef = - if (forwarder.isType) tpd.TypeDef(forwarder.asType) - else { - import tpd._ - val ref = path.select(sym.asTerm) - val ddef = tpd.DefDef(forwarder.asTerm, prefss => - ref.appliedToArgss(adaptForwarderParams(Nil, sym.info, prefss)) - ) - if forwarder.isInlineMethod then - PrepareInlineable.registerInlineInfo(forwarder, ddef.rhs) - ddef - } - - buf += forwarderDef.withSpan(span) + if forwarder.isType then + buf += tpd.TypeDef(forwarder.asType).withSpan(span) + else + import tpd._ + val ref = path.select(sym.asTerm) + val ddef = tpd.DefDef(forwarder.asTerm, prefss => + ref.appliedToArgss(adaptForwarderParams(Nil, sym.info, prefss))) + if forwarder.isInlineMethod then + PrepareInlineable.registerInlineInfo(forwarder, ddef.rhs) + buf += ddef.withSpan(span) + for getter <- defaultGetters(sym.asTerm) do + addForwarder(getter.name.asTermName, getter, span) end addForwarder def addForwardersNamed(name: TermName, alias: TermName, span: Span): Unit = @@ -1188,11 +1206,15 @@ class Namer { typer: Typer => def isCaseClassSynthesized(mbr: Symbol) = fromCaseClass && defn.caseClassSynthesized.contains(mbr) for mbr <- path.tpe.membersBasedOnFlags(required = EmptyFlags, excluded = PrivateOrSynthetic) do - if !mbr.symbol.isSuperAccessor && !isCaseClassSynthesized(mbr.symbol) then - // Scala 2 superaccessors have neither Synthetic nor Artfact set, so we - // need to filter them out here (by contrast, Scala 3 superaccessors are Artifacts) - // Symbols from base traits of case classes that will get synthesized implementations - // at PostTyper are also excluded. + if !mbr.symbol.isSuperAccessor + // Scala 2 superaccessors have neither Synthetic nor Artfact set, so we + // need to filter them out here (by contrast, Scala 3 superaccessors are Artifacts) + // Symbols from base traits of case classes that will get synthesized implementations + // at PostTyper are also excluded. + && !isCaseClassSynthesized(mbr.symbol) + && !mbr.symbol.name.is(DefaultGetterName) + // default getters are exported with the members they belong to + then val alias = mbr.name.toTermName if mbr.symbol.is(Given) then if !seen.contains(alias) && mbr.matchesImportBound(givenBound) then diff --git a/tests/run/i14020.check b/tests/run/i14020.check index 420d0f6f5bfc..304f6c16f72a 100644 --- a/tests/run/i14020.check +++ b/tests/run/i14020.check @@ -1,3 +1,7 @@ Hello you Hello John Hello you +Hello you +Hello John +Hello you +bark: Woof! diff --git a/tests/run/i14020.scala b/tests/run/i14020.scala index 60b0caaf1a67..3a2d9cc5a080 100644 --- a/tests/run/i14020.scala +++ b/tests/run/i14020.scala @@ -5,9 +5,31 @@ class B: val a = A() export a.* +class C: + val a = A() + export a.greeting + @main def Test = val b = B() println(b.a.greeting()) // works println(b.greeting("John")) // works - println(b.greeting()) // nope ! \ No newline at end of file + println(b.greeting()) // nope ! + + val c = C() + + println(c.a.greeting()) // works + println(c.greeting("John")) // works + println(c.greeting()) // nope ! + + val w = Wolf() + import w.given + + println(summon[String]) // error: I found: w.bark(/* missing */summon[String]) + +class Dog: + given bark(using msg: String = "Woof!"): String = s"bark: $msg" + +class Wolf: + private val dog = Dog() + export dog.given // needs to be `export dog.{given, *}` to export the default arguments From 1e8513885a42f603ba0f01dc75e661c45fb65d1c Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 7 Dec 2021 12:05:20 +0100 Subject: [PATCH 0931/1244] Simplify --- .../src/dotty/tools/dotc/typer/Namer.scala | 36 ++++++++----------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala index fbb38afed73c..2eed7e9a0785 100644 --- a/compiler/src/dotty/tools/dotc/typer/Namer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala @@ -1096,25 +1096,16 @@ class Namer { typer: Typer => else Yes } - def defaultGetters(sym: TermSymbol): List[Symbol] = - def recur(params: List[Symbol], paramss: List[List[Symbol]], n: Int): List[Symbol] = - params match - case param :: params1 => - def otherGetters = - recur(params1, paramss, if param.isType then n else n + 1) - if param.is(HasDefault) then - val getterName = DefaultGetterName(sym.name, n) - val getter = path.tpe.member(DefaultGetterName(sym.name, n)).symbol - assert(getter.exists, i"$path does not have a default getter named $getterName") - getter :: otherGetters - else - otherGetters - case Nil => - paramss match - case params1 :: paramss1 => recur(params1, paramss1, n) - case Nil => Nil - recur(Nil, sym.paramSymss, 0) - .showing(i"default getters of $sym, ${sym.paramSymss.nestedMap(_.flagsString)} = $result") + def foreachDefaultGetterOf(sym: TermSymbol, op: TermSymbol => Unit): Unit = + var n = 0 + for params <- sym.paramSymss; param <- params do + if param.isTerm then + if param.is(HasDefault) then + val getterName = DefaultGetterName(sym.name, n) + val getter = path.tpe.member(DefaultGetterName(sym.name, n)).symbol + assert(getter.exists, i"$path does not have a default getter named $getterName") + op(getter.asTerm) + n += 1 /** Add a forwarder with name `alias` or its type name equivalent to `mbr`, * provided `mbr` is accessible and of the right implicit/non-implicit kind. @@ -1138,6 +1129,7 @@ class Namer { typer: Typer => if canForward(mbr) == CanForward.Yes then val sym = mbr.symbol + val hasDefaults = sym.hasDefaultParams // compute here to ensure HasDefaultParams and NoDefaultParams flags are set val forwarder = if mbr.isType then val forwarderName = checkNoConflict(alias.toTypeName, isPrivate = false, span) @@ -1162,7 +1154,6 @@ class Namer { typer: Typer => (StableRealizable, ExprType(path.tpe.select(sym))) else (EmptyFlags, mbr.info.ensureMethodic) - sym.hasDefaultParams // ensure HasDefaultParams and NoDefaultParams flags are set var mbrFlags = Exported | Method | Final | maybeStable | sym.flags & RetainedExportFlags if sym.is(ExtensionMethod) then mbrFlags |= ExtensionMethod val forwarderName = checkNoConflict(alias, isPrivate = false, span) @@ -1181,8 +1172,9 @@ class Namer { typer: Typer => if forwarder.isInlineMethod then PrepareInlineable.registerInlineInfo(forwarder, ddef.rhs) buf += ddef.withSpan(span) - for getter <- defaultGetters(sym.asTerm) do - addForwarder(getter.name.asTermName, getter, span) + if hasDefaults then + foreachDefaultGetterOf(sym.asTerm, + getter => addForwarder(getter.name.asTermName, getter, span)) end addForwarder def addForwardersNamed(name: TermName, alias: TermName, span: Span): Unit = From ffb4532f3ce5ebeaf1581e1d80b74b7f287c996a Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 7 Dec 2021 12:36:58 +0100 Subject: [PATCH 0932/1244] Fix flags of export forwarders --- compiler/src/dotty/tools/dotc/core/Flags.scala | 2 +- compiler/src/dotty/tools/dotc/core/SymDenotations.scala | 2 +- compiler/src/dotty/tools/dotc/typer/Namer.scala | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Flags.scala b/compiler/src/dotty/tools/dotc/core/Flags.scala index 817ae575581a..cb590e2384a0 100644 --- a/compiler/src/dotty/tools/dotc/core/Flags.scala +++ b/compiler/src/dotty/tools/dotc/core/Flags.scala @@ -531,7 +531,7 @@ object Flags { val RetainedModuleClassFlags: FlagSet = RetainedModuleValAndClassFlags | Enum /** Flags retained in export forwarders */ - val RetainedExportFlags = Given | Implicit | Inline | Transparent | HasDefaultParams | NoDefaultParams + val RetainedExportFlags = Given | Implicit | Inline | Transparent /** Flags that apply only to classes */ val ClassOnlyFlags = Sealed | Open | Abstract.toTypeFlags diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala index 9d55f43dff25..2f7e3debfa6f 100644 --- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala @@ -930,7 +930,7 @@ object SymDenotations { def hasDefaultParams(using Context): Boolean = if ctx.erasedTypes then false else if is(HasDefaultParams) then true - else if is(NoDefaultParams) then false + else if is(NoDefaultParams) || !is(Method) then false else val result = rawParamss.nestedExists(_.is(HasDefault)) diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala index 2eed7e9a0785..799817851e1f 100644 --- a/compiler/src/dotty/tools/dotc/typer/Namer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala @@ -1154,7 +1154,9 @@ class Namer { typer: Typer => (StableRealizable, ExprType(path.tpe.select(sym))) else (EmptyFlags, mbr.info.ensureMethodic) - var mbrFlags = Exported | Method | Final | maybeStable | sym.flags & RetainedExportFlags + var flagMask = RetainedExportFlags + if sym.isTerm then flagMask |= HasDefaultParams | NoDefaultParams + var mbrFlags = Exported | Method | Final | maybeStable | sym.flags & flagMask if sym.is(ExtensionMethod) then mbrFlags |= ExtensionMethod val forwarderName = checkNoConflict(alias, isPrivate = false, span) newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span) From 37cad997c0f76afd8039059c1821e21c09759a2e Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 10 Dec 2021 18:12:07 +0100 Subject: [PATCH 0933/1244] Fix inline + export combination Exported functions could be inline, but that did not work at all. This should be fixed by this commit. --- compiler/src/dotty/tools/dotc/typer/Namer.scala | 2 +- tests/run/i14020.scala | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala index 799817851e1f..4bca5c50cf77 100644 --- a/compiler/src/dotty/tools/dotc/typer/Namer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala @@ -1162,7 +1162,7 @@ class Namer { typer: Typer => newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span) forwarder.info = avoidPrivateLeaks(forwarder) - forwarder.addAnnotations(sym.annotations) + forwarder.addAnnotations(sym.annotations.filterConserve(_.symbol != defn.BodyAnnot)) if forwarder.isType then buf += tpd.TypeDef(forwarder.asType).withSpan(span) diff --git a/tests/run/i14020.scala b/tests/run/i14020.scala index 3a2d9cc5a080..86123874c034 100644 --- a/tests/run/i14020.scala +++ b/tests/run/i14020.scala @@ -1,12 +1,15 @@ class A: def greeting(name: String = "you") = s"Hello $name" +class A2: + inline def greeting(name: String = "you") = s"Hello $name" + class B: val a = A() export a.* class C: - val a = A() + val a = A2() export a.greeting @main def Test = @@ -27,6 +30,7 @@ class C: println(summon[String]) // error: I found: w.bark(/* missing */summon[String]) + class Dog: given bark(using msg: String = "Woof!"): String = s"bark: $msg" From 723ae96e8f6ae51f4f199b6708c61cacbf771fd2 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 15 Dec 2021 23:31:33 +0000 Subject: [PATCH 0934/1244] Fix reachability by retaining spaces of Prod params When intersecting a product type space with a type space, if the two types aren't related, we must retain the spaces of the parameters, otherwise the intersection will represent a bigger space of values that it should (leading to a false positive unreachability warning). I actually think that the first condition, `isSubType(tp1, tp2)`, should be true, because `Bar` is a subtype of `Foo[X]`, provided `X` is instantiated to `Nothing`. Maybe that's not isSubType but something else (because we want forSome X, not forAll X). But, either way, fixing that the intersection doesn't overpromise (i.e. lie) is a good fix anyways. --- .../dotty/tools/dotc/transform/patmat/Space.scala | 12 +++++++++--- tests/patmat/i14102.min.scala | 7 +++++++ tests/patmat/i14102.scala | 8 ++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 tests/patmat/i14102.min.scala create mode 100644 tests/patmat/i14102.scala diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala index af7083f66f77..13310299ed00 100644 --- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala +++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala @@ -212,14 +212,20 @@ trait SpaceLogic { if (isSubType(tp2, tp1)) b else if (canDecompose(tp1)) tryDecompose1(tp1) else if (isSubType(tp1, tp2)) a // problematic corner case: inheriting a case class - else intersectUnrelatedAtomicTypes(tp1, tp2) + else intersectUnrelatedAtomicTypes(tp1, tp2) match + case Typ(tp, _) => Prod(tp, fun, ss) + case sp => sp case (Prod(tp1, fun, ss), Typ(tp2, _)) => if (isSubType(tp1, tp2)) a else if (canDecompose(tp2)) tryDecompose2(tp2) else if (isSubType(tp2, tp1)) a // problematic corner case: inheriting a case class - else intersectUnrelatedAtomicTypes(tp1, tp2) + else intersectUnrelatedAtomicTypes(tp1, tp2) match + case Typ(tp, _) => Prod(tp, fun, ss) + case sp => sp case (Prod(tp1, fun1, ss1), Prod(tp2, fun2, ss2)) => - if (!isSameUnapply(fun1, fun2)) intersectUnrelatedAtomicTypes(tp1, tp2) + if (!isSameUnapply(fun1, fun2)) intersectUnrelatedAtomicTypes(tp1, tp2) match + case Typ(tp, _) => Prod(tp, fun1, ss1) + case sp => sp else if (ss1.zip(ss2).exists(p => simplify(intersect(p._1, p._2)) == Empty)) Empty else Prod(tp1, fun1, ss1.zip(ss2).map((intersect _).tupled)) } diff --git a/tests/patmat/i14102.min.scala b/tests/patmat/i14102.min.scala new file mode 100644 index 000000000000..fe92c7bc164a --- /dev/null +++ b/tests/patmat/i14102.min.scala @@ -0,0 +1,7 @@ +trait Foo[-X] +case class Bar(n: Int) extends Foo[Nothing] + +def test[X](foo: Foo[X]) = foo match + case Bar(1) => + case Bar(_) => + case _ => diff --git a/tests/patmat/i14102.scala b/tests/patmat/i14102.scala new file mode 100644 index 000000000000..75aa983710fb --- /dev/null +++ b/tests/patmat/i14102.scala @@ -0,0 +1,8 @@ +trait T[-X] +case class CC[-X](x: List[T[X]]) extends T[Nothing] +case class Id[-X](x: String) extends T[X] + +def f[X](tree: T[X]) = tree match + case CC(Id("hi") :: Nil) => ??? + case CC(refs) => ??? + case _ => ??? From 884c2c5f5d85adc92b8bb50e78f0f56fe494e583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Mon, 20 Dec 2021 17:43:56 +0100 Subject: [PATCH 0935/1244] Set reference version to 3.1.1-RC2 --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 460fdd4ae89a..a18e37db9772 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -59,7 +59,7 @@ object DottyJSPlugin extends AutoPlugin { } object Build { - val referenceVersion = "3.1.1-RC1" + val referenceVersion = "3.1.1-RC2" val baseVersion = "3.1.2-RC1" From 4c64c2b6f8a5c5beff98ffdc4c447b77719d415e Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 20 Dec 2021 18:29:56 +0100 Subject: [PATCH 0936/1244] Fix `derivedPolyProto` to use the correct result type The method parameter was called `resultType` but inside the method we use `resType` which is the result type of the existing PolyProto instance, so TypeMaps never updated the result type of a PolyProto before. According to git blame, this typo was introduced when the class parameter was renamed back in 2015 in b5c3a28f1eabada74827e34743dc264e583f7479. --- compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala | 2 +- tests/neg/i14145.scala | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 tests/neg/i14145.scala diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala index 800af19e9f78..76fcb77d8c30 100644 --- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -582,7 +582,7 @@ object ProtoTypes { override def isMatchedBy(tp: Type, keepConstraint: Boolean)(using Context): Boolean = canInstantiate(tp) || tp.member(nme.apply).hasAltWith(d => canInstantiate(d.info)) - def derivedPolyProto(targs: List[Tree], resultType: Type): PolyProto = + def derivedPolyProto(targs: List[Tree], resType: Type): PolyProto = if ((targs eq this.targs) && (resType eq this.resType)) this else PolyProto(targs, resType) diff --git a/tests/neg/i14145.scala b/tests/neg/i14145.scala new file mode 100644 index 000000000000..e9619ae9d756 --- /dev/null +++ b/tests/neg/i14145.scala @@ -0,0 +1,4 @@ +val l: List[Option[Int]] = List(None, Some(1), None) + +@main def m15 = + l.collectFirst(Some.unapply.unlift[Option[Int], Int]) // error From c61afebc40f8caad10c2a8fd679669b947b23b91 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 21 Dec 2021 15:27:00 +0100 Subject: [PATCH 0937/1244] Upload safer exceptions paper --- docs/docs/reference/experimental/canthrow.md | 7 ++++++- .../experimental/safer-exceptions.pdf | Bin 0 -> 761970 bytes 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 docs/docs/reference/experimental/safer-exceptions.pdf diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md index c6957b534e07..44bb12ce6dba 100644 --- a/docs/docs/reference/experimental/canthrow.md +++ b/docs/docs/reference/experimental/canthrow.md @@ -1,6 +1,6 @@ --- layout: doc-page -title: "CanThrow Abilities" +title: "CanThrow Capabilities" movedTo: https://docs.scala-lang.org/scala3/reference/experimental/canthrow.html --- @@ -275,3 +275,8 @@ And it would have many other applications besides: Exceptions are a special case But even without these additional mechanisms, exception checking is already useful as it is. It gives a clear path forward to make code that uses exceptions safer, better documented, and easier to refactor. The only loophole arises for scoped capabilities - here we have to verify manually that these capabilities do not escape. Specifically, a `try` always has to be placed in the same computation stage as the throws that it enables. Put another way: If the status quo is 0% static checking since 100% is too painful, then an alternative that gives you 95% static checking with great ergonomics looks like a win. And we might still get to 100% in the future. + +For more info, see also our [paper at the ACM Scala Symposium 2021]( +https://github.com/lampepfl/dotty/docs/docs/reference/experimental/safer-exceptions.pdf). + + diff --git a/docs/docs/reference/experimental/safer-exceptions.pdf b/docs/docs/reference/experimental/safer-exceptions.pdf new file mode 100644 index 0000000000000000000000000000000000000000..1a10ab6c0e469e69881bb78078fcd113706ed7da GIT binary patch literal 761970 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%0ATXbSCv~|8v7>@D#!%k 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
pbjekhzmFm~`YsIPqu-_^;Q^vNW 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

na$N^TAl^voh!Pfi>C;?dUs37GxDEVt8 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 z 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

ow~4EU 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

McKJAl68&1mccN!Ao9{aCJ!mRt!M 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
2iuG?nA_a3ODyBgZKAIR;SnDv6id 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

4X&XmF<}aB#lwAE)S+y3NR)jOXS_OX@ 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[QQ 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

mV9u`i~=f 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 Date: Tue, 21 Dec 2021 19:12:55 +0100 Subject: [PATCH 0938/1244] Fix link to safer-exceptions paper --- docs/docs/reference/experimental/canthrow.md | 3 +-- .../experimental => resources}/safer-exceptions.pdf | Bin 2 files changed, 1 insertion(+), 2 deletions(-) rename docs/{docs/reference/experimental => resources}/safer-exceptions.pdf (100%) diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md index 44bb12ce6dba..58a9db62b763 100644 --- a/docs/docs/reference/experimental/canthrow.md +++ b/docs/docs/reference/experimental/canthrow.md @@ -276,7 +276,6 @@ But even without these additional mechanisms, exception checking is already usef Put another way: If the status quo is 0% static checking since 100% is too painful, then an alternative that gives you 95% static checking with great ergonomics looks like a win. And we might still get to 100% in the future. -For more info, see also our [paper at the ACM Scala Symposium 2021]( -https://github.com/lampepfl/dotty/docs/docs/reference/experimental/safer-exceptions.pdf). +For more info, see also our [paper at the ACM Scala Symposium 2021](resources/safer-exceptions.pdf). diff --git a/docs/docs/reference/experimental/safer-exceptions.pdf b/docs/resources/safer-exceptions.pdf similarity index 100% rename from docs/docs/reference/experimental/safer-exceptions.pdf rename to docs/resources/safer-exceptions.pdf From 8554839837a4c022fca7558ab6d99ced7775148c Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Tue, 22 Jun 2021 15:00:36 +0200 Subject: [PATCH 0939/1244] Add failing test for #11861 --- .../source-dependencies/inline-rec/A.scala | 5 ++++ .../source-dependencies/inline-rec/B.scala | 5 ++++ .../source-dependencies/inline-rec/C.scala | 3 +++ .../source-dependencies/inline-rec/build.sbt | 25 +++++++++++++++++++ .../inline-rec/changes/A1.scala | 5 ++++ .../inline-rec/changes/C1.scala | 3 +++ .../source-dependencies/inline-rec/dbg.sbt | 3 +++ .../inline-rec/project/CompileState.scala | 4 +++ .../project/DottyInjectedPlugin.scala | 11 ++++++++ sbt-test/source-dependencies/inline-rec/test | 7 ++++++ 10 files changed, 71 insertions(+) create mode 100644 sbt-test/source-dependencies/inline-rec/A.scala create mode 100644 sbt-test/source-dependencies/inline-rec/B.scala create mode 100644 sbt-test/source-dependencies/inline-rec/C.scala create mode 100644 sbt-test/source-dependencies/inline-rec/build.sbt create mode 100644 sbt-test/source-dependencies/inline-rec/changes/A1.scala create mode 100644 sbt-test/source-dependencies/inline-rec/changes/C1.scala create mode 100644 sbt-test/source-dependencies/inline-rec/dbg.sbt create mode 100644 sbt-test/source-dependencies/inline-rec/project/CompileState.scala create mode 100644 sbt-test/source-dependencies/inline-rec/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/source-dependencies/inline-rec/test diff --git a/sbt-test/source-dependencies/inline-rec/A.scala b/sbt-test/source-dependencies/inline-rec/A.scala new file mode 100644 index 000000000000..6bf7ee29cda2 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec/A.scala @@ -0,0 +1,5 @@ +object A { + inline def callInline: Int = inlinedInt + + inline def inlinedInt: Int = 23 +} diff --git a/sbt-test/source-dependencies/inline-rec/B.scala b/sbt-test/source-dependencies/inline-rec/B.scala new file mode 100644 index 000000000000..2b4bd09c6e23 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec/B.scala @@ -0,0 +1,5 @@ +class B { + def main(args: Array[String]): Unit = { + assert(A.callInline == C.expected) + } +} diff --git a/sbt-test/source-dependencies/inline-rec/C.scala b/sbt-test/source-dependencies/inline-rec/C.scala new file mode 100644 index 000000000000..3b32f0026167 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec/C.scala @@ -0,0 +1,3 @@ +object C { + def expected: Int = 23 +} diff --git a/sbt-test/source-dependencies/inline-rec/build.sbt b/sbt-test/source-dependencies/inline-rec/build.sbt new file mode 100644 index 000000000000..1036709ccfc1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec/build.sbt @@ -0,0 +1,25 @@ +import sbt.internal.inc.Analysis +import complete.DefaultParsers._ + +// Reset compiler iterations, necessary because tests run in batch mode +val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") +recordPreviousIterations := { + val log = streams.value.log + CompileState.previousIterations = { + val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + previousAnalysis match { + case None => + log.info("No previous analysis detected") + 0 + case Some(a: Analysis) => a.compilations.allCompilations.size + } + } +} + +val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") + +checkIterations := { + val expected: Int = (Space ~> NatBasic).parsed + val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + assert(expected == actual, s"Expected $expected compilations, got $actual") +} diff --git a/sbt-test/source-dependencies/inline-rec/changes/A1.scala b/sbt-test/source-dependencies/inline-rec/changes/A1.scala new file mode 100644 index 000000000000..32941f30d8ab --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec/changes/A1.scala @@ -0,0 +1,5 @@ +object A { + inline def callInline: Int = inlinedInt + + inline def inlinedInt: Int = 47 +} diff --git a/sbt-test/source-dependencies/inline-rec/changes/C1.scala b/sbt-test/source-dependencies/inline-rec/changes/C1.scala new file mode 100644 index 000000000000..377d5add6ca8 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec/changes/C1.scala @@ -0,0 +1,3 @@ +object C { + def expected: Int = 47 +} diff --git a/sbt-test/source-dependencies/inline-rec/dbg.sbt b/sbt-test/source-dependencies/inline-rec/dbg.sbt new file mode 100644 index 000000000000..f9a522c9e610 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec/dbg.sbt @@ -0,0 +1,3 @@ +logLevel := Level.Debug +incOptions in ThisBuild ~= { _.withApiDebug(true) } +incOptions in ThisBuild ~= { _.withRelationsDebug(true) } diff --git a/sbt-test/source-dependencies/inline-rec/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec/project/CompileState.scala new file mode 100644 index 000000000000..078db9c7bf56 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec/project/CompileState.scala @@ -0,0 +1,4 @@ +// This is necessary because tests are run in batch mode +object CompileState { + @volatile var previousIterations: Int = -1 +} diff --git a/sbt-test/source-dependencies/inline-rec/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/source-dependencies/inline-rec/test b/sbt-test/source-dependencies/inline-rec/test new file mode 100644 index 000000000000..1716f03c6c82 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec/test @@ -0,0 +1,7 @@ +> compile +> recordPreviousIterations +# Force recompilation of B because A.inlinedInt, called by A.callInline, has changed +$ copy-file changes/A1.scala A.scala +> compile +# 1 to recompile A, then 1 more to recompile B due to A.inlinedInt change +> checkIterations 2 From f2d7f1e91f862e89297d94c81186a066bb5aea19 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Tue, 22 Jun 2021 16:21:30 +0200 Subject: [PATCH 0940/1244] fix #11861, mix in nested inline def or val --- .../src/dotty/tools/dotc/sbt/ExtractAPI.scala | 130 ++++++++++++++---- .../src/dotty/tools/dotc/sbt/package.scala | 5 + .../inline-rec-change-inline/A.scala | 5 + .../inline-rec-change-inline/B.scala | 5 + .../inline-rec-change-inline/C.scala | 3 + .../inline-rec-change-inline/build.sbt | 25 ++++ .../inline-rec-change-inline/changes/B1.scala | 5 + .../project/CompileState.scala | 4 + .../project/DottyInjectedPlugin.scala | 11 ++ .../inline-rec-change-inline/test | 9 ++ .../inline-rec-change-param/A.scala | 5 + .../inline-rec-change-param/B.scala | 5 + .../inline-rec-change-param/C.scala | 3 + .../inline-rec-change-param/build.sbt | 25 ++++ .../inline-rec-change-param/changes/B1.scala | 5 + .../project/CompileState.scala | 4 + .../project/DottyInjectedPlugin.scala | 11 ++ .../inline-rec-change-param/test | 9 ++ .../inline-rec-change-res-transparent/A.scala | 5 + .../inline-rec-change-res-transparent/B.scala | 5 + .../inline-rec-change-res-transparent/C.scala | 3 + .../build.sbt | 25 ++++ .../changes/B1.scala | 5 + .../project/CompileState.scala | 4 + .../project/DottyInjectedPlugin.scala | 11 ++ .../inline-rec-change-res-transparent/test | 9 ++ .../inline-rec-change-res/A.scala | 5 + .../inline-rec-change-res/B.scala | 5 + .../inline-rec-change-res/C.scala | 3 + .../inline-rec-change-res/build.sbt | 25 ++++ .../inline-rec-change-res/changes/B1.scala | 5 + .../project/CompileState.scala | 4 + .../project/DottyInjectedPlugin.scala | 11 ++ .../inline-rec-change-res/test | 9 ++ .../inline-rec-change-typaram/A.scala | 5 + .../inline-rec-change-typaram/B.scala | 5 + .../inline-rec-change-typaram/C.scala | 3 + .../inline-rec-change-typaram/build.sbt | 25 ++++ .../changes/B1.scala | 5 + .../project/CompileState.scala | 4 + .../project/DottyInjectedPlugin.scala | 11 ++ .../inline-rec-change-typaram/test | 9 ++ .../inline-rec-deep/A.scala | 5 + .../inline-rec-deep/B.scala | 5 + .../inline-rec-deep/C.scala | 5 + .../inline-rec-deep/D.scala | 3 + .../inline-rec-deep/build.sbt | 25 ++++ .../inline-rec-deep/changes/C1.scala | 5 + .../project/CompileState.scala | 4 + .../project/DottyInjectedPlugin.scala | 11 ++ .../source-dependencies/inline-rec-deep/test | 10 ++ .../inline-rec-mut/A.scala | 8 ++ .../inline-rec-mut/B.scala | 8 ++ .../inline-rec-mut/C.scala | 3 + .../inline-rec-mut/build.sbt | 25 ++++ .../inline-rec-mut/changes/B1.scala | 9 ++ .../inline-rec-mut/project/CompileState.scala | 4 + .../project/DottyInjectedPlugin.scala | 11 ++ .../source-dependencies/inline-rec-mut/test | 11 ++ .../inline-rec-val/A.scala | 5 + .../inline-rec-val/B.scala | 3 + .../inline-rec-val/build.sbt | 25 ++++ .../inline-rec-val/changes/A1.scala | 5 + .../inline-rec-val/project/CompileState.scala | 4 + .../project/DottyInjectedPlugin.scala | 11 ++ .../source-dependencies/inline-rec-val/test | 7 + .../source-dependencies/inline-rec/B.scala | 4 +- .../source-dependencies/inline-rec/C.scala | 3 - .../inline-rec/changes/C1.scala | 3 - .../source-dependencies/inline-rec/dbg.sbt | 3 - 70 files changed, 656 insertions(+), 39 deletions(-) create mode 100644 sbt-test/source-dependencies/inline-rec-change-inline/A.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-inline/B.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-inline/C.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-inline/build.sbt create mode 100644 sbt-test/source-dependencies/inline-rec-change-inline/changes/B1.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-inline/project/CompileState.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-inline/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-inline/test create mode 100644 sbt-test/source-dependencies/inline-rec-change-param/A.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-param/B.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-param/C.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-param/build.sbt create mode 100644 sbt-test/source-dependencies/inline-rec-change-param/changes/B1.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-param/project/CompileState.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-param/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-param/test create mode 100644 sbt-test/source-dependencies/inline-rec-change-res-transparent/A.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res-transparent/B.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res-transparent/C.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res-transparent/build.sbt create mode 100644 sbt-test/source-dependencies/inline-rec-change-res-transparent/changes/B1.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res-transparent/project/CompileState.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res-transparent/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res-transparent/test create mode 100644 sbt-test/source-dependencies/inline-rec-change-res/A.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res/B.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res/C.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res/build.sbt create mode 100644 sbt-test/source-dependencies/inline-rec-change-res/changes/B1.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res/project/CompileState.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-res/test create mode 100644 sbt-test/source-dependencies/inline-rec-change-typaram/A.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-typaram/B.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-typaram/C.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-typaram/build.sbt create mode 100644 sbt-test/source-dependencies/inline-rec-change-typaram/changes/B1.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-typaram/project/CompileState.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-typaram/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/source-dependencies/inline-rec-change-typaram/test create mode 100644 sbt-test/source-dependencies/inline-rec-deep/A.scala create mode 100644 sbt-test/source-dependencies/inline-rec-deep/B.scala create mode 100644 sbt-test/source-dependencies/inline-rec-deep/C.scala create mode 100644 sbt-test/source-dependencies/inline-rec-deep/D.scala create mode 100644 sbt-test/source-dependencies/inline-rec-deep/build.sbt create mode 100644 sbt-test/source-dependencies/inline-rec-deep/changes/C1.scala create mode 100644 sbt-test/source-dependencies/inline-rec-deep/project/CompileState.scala create mode 100644 sbt-test/source-dependencies/inline-rec-deep/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/source-dependencies/inline-rec-deep/test create mode 100644 sbt-test/source-dependencies/inline-rec-mut/A.scala create mode 100644 sbt-test/source-dependencies/inline-rec-mut/B.scala create mode 100644 sbt-test/source-dependencies/inline-rec-mut/C.scala create mode 100644 sbt-test/source-dependencies/inline-rec-mut/build.sbt create mode 100644 sbt-test/source-dependencies/inline-rec-mut/changes/B1.scala create mode 100644 sbt-test/source-dependencies/inline-rec-mut/project/CompileState.scala create mode 100644 sbt-test/source-dependencies/inline-rec-mut/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/source-dependencies/inline-rec-mut/test create mode 100644 sbt-test/source-dependencies/inline-rec-val/A.scala create mode 100644 sbt-test/source-dependencies/inline-rec-val/B.scala create mode 100644 sbt-test/source-dependencies/inline-rec-val/build.sbt create mode 100644 sbt-test/source-dependencies/inline-rec-val/changes/A1.scala create mode 100644 sbt-test/source-dependencies/inline-rec-val/project/CompileState.scala create mode 100644 sbt-test/source-dependencies/inline-rec-val/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/source-dependencies/inline-rec-val/test delete mode 100644 sbt-test/source-dependencies/inline-rec/C.scala delete mode 100644 sbt-test/source-dependencies/inline-rec/changes/C1.scala delete mode 100644 sbt-test/source-dependencies/inline-rec/dbg.sbt diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala index 6e198bbeada9..6c65c8f29c9b 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala @@ -599,7 +599,7 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { // an inline def in every class that extends its owner. To avoid this we // could store the hash as an annotation when pickling an inline def // and retrieve it here instead of computing it on the fly. - val inlineBodyHash = treeHash(inlineBody) + val inlineBodyHash = treeHash(inlineBody, inlineSym = s) annots += marker(inlineBodyHash.toString) } @@ -620,14 +620,110 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { * it should stay the same across compiler runs, compiler instances, * JVMs, etc. */ - def treeHash(tree: Tree): Int = + def treeHash(tree: Tree, inlineSym: Symbol): Int = import scala.util.hashing.MurmurHash3 + import core.Constants.* + + val seenInlines = mutable.HashSet.empty[Symbol] + + if inlineSym ne NoSymbol then + seenInlines += inlineSym // do not hash twice a recursive def + + def nameHash(n: Name, initHash: Int): Int = + val h = + if n.isTermName then + MurmurHash3.mix(initHash, TermNameHash) + else + MurmurHash3.mix(initHash, TypeNameHash) + + // The hashCode of the name itself is not stable across compiler instances + MurmurHash3.mix(h, n.toString.hashCode) + end nameHash + + def typeHash(tp: Type, initHash: Int): Int = + // Go through `apiType` to get a value with a stable hash, it'd + // be better to use Murmur here too instead of relying on + // `hashCode`, but that would essentially mean duplicating + // https://github.com/sbt/zinc/blob/develop/internal/zinc-apiinfo/src/main/scala/xsbt/api/HashAPI.scala + // and at that point we might as well do type hashing on our own + // representation. + var h = initHash + tp match + case ConstantType(c) => + h = constantHash(c, h) + case TypeBounds(lo, hi) => + h = MurmurHash3.mix(h, apiType(lo).hashCode) + h = MurmurHash3.mix(h, apiType(hi).hashCode) + case tp => + h = MurmurHash3.mix(h, apiType(tp).hashCode) + h + end typeHash + + def constantHash(c: Constant, initHash: Int): Int = + var h = MurmurHash3.mix(initHash, c.tag) + c.tag match + case NullTag => + // No value to hash, the tag is enough. + case ClazzTag => + h = typeHash(c.typeValue, h) + case _ => + h = MurmurHash3.mix(h, c.value.hashCode) + h + end constantHash + + /**An inline method that calls another inline method will eventually inline the call + * at a non-inline callsite, in this case if the implementation of the nested call + * changes, then the callsite will have a different API, we should hash the definition + */ + def inlineReferenceHash(ref: Symbol, rhs: Tree, initHash: Int): Int = + var h = initHash + + def paramssHash(paramss: List[List[Symbol]], initHash: Int): Int = paramss match + case Nil :: paramss1 => + paramssHash(paramss1, MurmurHash3.mix(initHash, EmptyParamHash)) + case params :: paramss1 => + var h = initHash + val paramsIt = params.iterator + while paramsIt.hasNext do + val param = paramsIt.next + h = nameHash(param.name, h) + h = typeHash(param.info, h) + if param.is(Inline) then + h = MurmurHash3.mix(h, InlineParamHash) // inline would change the generated code + paramssHash(paramss1, h) + case Nil => + initHash + end paramssHash + + h = paramssHash(ref.paramSymss, h) + h = typeHash(ref.info.finalResultType, h) + positionedHash(rhs, h) + end inlineReferenceHash + + def err(what: String, elem: Any, pos: Positioned, initHash: Int): Int = + internalError(i"Don't know how to produce a stable hash for $what", pos.sourcePos) + MurmurHash3.mix(initHash, elem.toString.hashCode) def positionedHash(p: ast.Positioned, initHash: Int): Int = + var h = initHash + p match case p: WithLazyField[?] => p.forceIfLazy case _ => + + p match + case ref: RefTree @unchecked => + val sym = ref.symbol + if sym.is(Inline, butNot = Param) && !seenInlines.contains(sym) then + seenInlines += sym // dont re-enter hashing this ref + sym.defTree match + case defTree: ValOrDefDef => + h = inlineReferenceHash(sym, defTree.rhs, h) + case _ => + h = err(i"inline method reference `${ref.name}`", ref.name, ref, h) + case _ => + // FIXME: If `p` is a tree we should probably take its type into account // when hashing it, but producing a stable hash for a type is not trivial // since the same type might have multiple representations, for method @@ -635,12 +731,11 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { // in Zinc that generates hashes from that, if we can reliably produce // stable hashes for types ourselves then we could bypass all that and // send Zinc hashes directly. - val h = MurmurHash3.mix(initHash, p.productPrefix.hashCode) + h = MurmurHash3.mix(h, p.productPrefix.hashCode) iteratorHash(p.productIterator, h) end positionedHash def iteratorHash(it: Iterator[Any], initHash: Int): Int = - import core.Constants._ var h = initHash while it.hasNext do it.next() match @@ -649,30 +744,11 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { case xs: List[?] => h = iteratorHash(xs.iterator, h) case c: Constant => - h = MurmurHash3.mix(h, c.tag) - c.tag match - case NullTag => - // No value to hash, the tag is enough. - case ClazzTag => - // Go through `apiType` to get a value with a stable hash, it'd - // be better to use Murmur here too instead of relying on - // `hashCode`, but that would essentially mean duplicating - // https://github.com/sbt/zinc/blob/develop/internal/zinc-apiinfo/src/main/scala/xsbt/api/HashAPI.scala - // and at that point we might as well do type hashing on our own - // representation. - val apiValue = apiType(c.typeValue) - h = MurmurHash3.mix(h, apiValue.hashCode) - case _ => - h = MurmurHash3.mix(h, c.value.hashCode) + h = constantHash(c, h) case n: Name => - // The hashCode of the name itself is not stable across compiler instances - h = MurmurHash3.mix(h, n.toString.hashCode) + h = nameHash(n, h) case elem => - internalError( - i"Don't know how to produce a stable hash for `$elem` of unknown class ${elem.getClass}", - tree.sourcePos) - - h = MurmurHash3.mix(h, elem.toString.hashCode) + h = err(i"`$elem` of unknown class ${elem.getClass}", elem, tree, h) h end iteratorHash @@ -691,6 +767,6 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { // annotated @org.junit.Test). api.Annotation.of( apiType(annot.tree.tpe), // Used by sbt to find tests to run - Array(api.AnnotationArgument.of("TREE_HASH", treeHash(annot.tree).toString))) + Array(api.AnnotationArgument.of("TREE_HASH", treeHash(annot.tree, inlineSym = NoSymbol).toString))) } } diff --git a/compiler/src/dotty/tools/dotc/sbt/package.scala b/compiler/src/dotty/tools/dotc/sbt/package.scala index d5f9a289c800..99a6b97bddef 100644 --- a/compiler/src/dotty/tools/dotc/sbt/package.scala +++ b/compiler/src/dotty/tools/dotc/sbt/package.scala @@ -5,6 +5,11 @@ import dotty.tools.dotc.core.Symbols.Symbol import dotty.tools.dotc.core.NameOps.stripModuleClassSuffix import dotty.tools.dotc.core.Names.Name +inline val TermNameHash = 1987 // 300th prime +inline val TypeNameHash = 1993 // 301st prime +inline val EmptyParamHash = 1997 // 302nd prime +inline val InlineParamHash = 1999 // 303rd prime + extension (sym: Symbol) def constructorName(using Context) = diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/A.scala b/sbt-test/source-dependencies/inline-rec-change-inline/A.scala new file mode 100644 index 000000000000..d06100a22564 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-inline/A.scala @@ -0,0 +1,5 @@ +object A { + + inline def callInline: Any = B.inlinedAny("yyy") + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/B.scala b/sbt-test/source-dependencies/inline-rec-change-inline/B.scala new file mode 100644 index 000000000000..61e61a620957 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-inline/B.scala @@ -0,0 +1,5 @@ +object B { + + inline def inlinedAny(x: String): x.type = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/C.scala b/sbt-test/source-dependencies/inline-rec-change-inline/C.scala new file mode 100644 index 000000000000..e6511852afa1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-inline/C.scala @@ -0,0 +1,3 @@ +class C { + val n = A.callInline +} diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/build.sbt b/sbt-test/source-dependencies/inline-rec-change-inline/build.sbt new file mode 100644 index 000000000000..1036709ccfc1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-inline/build.sbt @@ -0,0 +1,25 @@ +import sbt.internal.inc.Analysis +import complete.DefaultParsers._ + +// Reset compiler iterations, necessary because tests run in batch mode +val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") +recordPreviousIterations := { + val log = streams.value.log + CompileState.previousIterations = { + val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + previousAnalysis match { + case None => + log.info("No previous analysis detected") + 0 + case Some(a: Analysis) => a.compilations.allCompilations.size + } + } +} + +val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") + +checkIterations := { + val expected: Int = (Space ~> NatBasic).parsed + val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + assert(expected == actual, s"Expected $expected compilations, got $actual") +} diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-change-inline/changes/B1.scala new file mode 100644 index 000000000000..4a1c47d38572 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-inline/changes/B1.scala @@ -0,0 +1,5 @@ +object B { + + inline def inlinedAny(inline x: String): x.type = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-change-inline/project/CompileState.scala new file mode 100644 index 000000000000..078db9c7bf56 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-inline/project/CompileState.scala @@ -0,0 +1,4 @@ +// This is necessary because tests are run in batch mode +object CompileState { + @volatile var previousIterations: Int = -1 +} diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-change-inline/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-inline/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/source-dependencies/inline-rec-change-inline/test b/sbt-test/source-dependencies/inline-rec-change-inline/test new file mode 100644 index 000000000000..c06f4da8cd78 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-inline/test @@ -0,0 +1,9 @@ +> compile +> recordPreviousIterations +# Force recompilation of A because B.inlinedAny, called by A.callInline, has added +# the inline flag to one of its parameters. +$ copy-file changes/B1.scala B.scala +> compile +# 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change, +# then 1 final compilation to recompile C due to A.callInline change +> checkIterations 3 diff --git a/sbt-test/source-dependencies/inline-rec-change-param/A.scala b/sbt-test/source-dependencies/inline-rec-change-param/A.scala new file mode 100644 index 000000000000..d06100a22564 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-param/A.scala @@ -0,0 +1,5 @@ +object A { + + inline def callInline: Any = B.inlinedAny("yyy") + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-param/B.scala b/sbt-test/source-dependencies/inline-rec-change-param/B.scala new file mode 100644 index 000000000000..61e61a620957 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-param/B.scala @@ -0,0 +1,5 @@ +object B { + + inline def inlinedAny(x: String): x.type = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-param/C.scala b/sbt-test/source-dependencies/inline-rec-change-param/C.scala new file mode 100644 index 000000000000..e6511852afa1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-param/C.scala @@ -0,0 +1,3 @@ +class C { + val n = A.callInline +} diff --git a/sbt-test/source-dependencies/inline-rec-change-param/build.sbt b/sbt-test/source-dependencies/inline-rec-change-param/build.sbt new file mode 100644 index 000000000000..1036709ccfc1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-param/build.sbt @@ -0,0 +1,25 @@ +import sbt.internal.inc.Analysis +import complete.DefaultParsers._ + +// Reset compiler iterations, necessary because tests run in batch mode +val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") +recordPreviousIterations := { + val log = streams.value.log + CompileState.previousIterations = { + val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + previousAnalysis match { + case None => + log.info("No previous analysis detected") + 0 + case Some(a: Analysis) => a.compilations.allCompilations.size + } + } +} + +val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") + +checkIterations := { + val expected: Int = (Space ~> NatBasic).parsed + val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + assert(expected == actual, s"Expected $expected compilations, got $actual") +} diff --git a/sbt-test/source-dependencies/inline-rec-change-param/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-change-param/changes/B1.scala new file mode 100644 index 000000000000..5e0e374ed105 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-param/changes/B1.scala @@ -0,0 +1,5 @@ +object B { + + inline def inlinedAny(x: Any): x.type = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-param/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-change-param/project/CompileState.scala new file mode 100644 index 000000000000..078db9c7bf56 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-param/project/CompileState.scala @@ -0,0 +1,4 @@ +// This is necessary because tests are run in batch mode +object CompileState { + @volatile var previousIterations: Int = -1 +} diff --git a/sbt-test/source-dependencies/inline-rec-change-param/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-change-param/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-param/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/source-dependencies/inline-rec-change-param/test b/sbt-test/source-dependencies/inline-rec-change-param/test new file mode 100644 index 000000000000..22468b12f690 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-param/test @@ -0,0 +1,9 @@ +> compile +> recordPreviousIterations +# Force recompilation of A because B.inlinedAny, called by A.callInline, has changed +# the type of its parameters. +$ copy-file changes/B1.scala B.scala +> compile +# 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change, +# then 1 final compilation to recompile C due to A.callInline change +> checkIterations 3 diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/A.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/A.scala new file mode 100644 index 000000000000..d06100a22564 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/A.scala @@ -0,0 +1,5 @@ +object A { + + inline def callInline: Any = B.inlinedAny("yyy") + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/B.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/B.scala new file mode 100644 index 000000000000..8a04e33a0428 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/B.scala @@ -0,0 +1,5 @@ +object B { + + transparent inline def inlinedAny(x: String): x.type = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/C.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/C.scala new file mode 100644 index 000000000000..e6511852afa1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/C.scala @@ -0,0 +1,3 @@ +class C { + val n = A.callInline +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/build.sbt b/sbt-test/source-dependencies/inline-rec-change-res-transparent/build.sbt new file mode 100644 index 000000000000..1036709ccfc1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/build.sbt @@ -0,0 +1,25 @@ +import sbt.internal.inc.Analysis +import complete.DefaultParsers._ + +// Reset compiler iterations, necessary because tests run in batch mode +val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") +recordPreviousIterations := { + val log = streams.value.log + CompileState.previousIterations = { + val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + previousAnalysis match { + case None => + log.info("No previous analysis detected") + 0 + case Some(a: Analysis) => a.compilations.allCompilations.size + } + } +} + +val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") + +checkIterations := { + val expected: Int = (Space ~> NatBasic).parsed + val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + assert(expected == actual, s"Expected $expected compilations, got $actual") +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/changes/B1.scala new file mode 100644 index 000000000000..6cbe84dbb2b8 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/changes/B1.scala @@ -0,0 +1,5 @@ +object B { + + transparent inline def inlinedAny(x: String): String = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/project/CompileState.scala new file mode 100644 index 000000000000..078db9c7bf56 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/project/CompileState.scala @@ -0,0 +1,4 @@ +// This is necessary because tests are run in batch mode +object CompileState { + @volatile var previousIterations: Int = -1 +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-change-res-transparent/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res-transparent/test b/sbt-test/source-dependencies/inline-rec-change-res-transparent/test new file mode 100644 index 000000000000..7cd958b92dd6 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res-transparent/test @@ -0,0 +1,9 @@ +> compile +> recordPreviousIterations +# Force recompilation of A because B.inlinedAny, called by A.callInline, has changed +# the type of its result, while being an inline method. +$ copy-file changes/B1.scala B.scala +> compile +# 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change, +# then 1 final compilation to recompile C due to A.callInline change +> checkIterations 3 diff --git a/sbt-test/source-dependencies/inline-rec-change-res/A.scala b/sbt-test/source-dependencies/inline-rec-change-res/A.scala new file mode 100644 index 000000000000..d06100a22564 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res/A.scala @@ -0,0 +1,5 @@ +object A { + + inline def callInline: Any = B.inlinedAny("yyy") + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res/B.scala b/sbt-test/source-dependencies/inline-rec-change-res/B.scala new file mode 100644 index 000000000000..61e61a620957 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res/B.scala @@ -0,0 +1,5 @@ +object B { + + inline def inlinedAny(x: String): x.type = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res/C.scala b/sbt-test/source-dependencies/inline-rec-change-res/C.scala new file mode 100644 index 000000000000..e6511852afa1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res/C.scala @@ -0,0 +1,3 @@ +class C { + val n = A.callInline +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res/build.sbt b/sbt-test/source-dependencies/inline-rec-change-res/build.sbt new file mode 100644 index 000000000000..1036709ccfc1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res/build.sbt @@ -0,0 +1,25 @@ +import sbt.internal.inc.Analysis +import complete.DefaultParsers._ + +// Reset compiler iterations, necessary because tests run in batch mode +val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") +recordPreviousIterations := { + val log = streams.value.log + CompileState.previousIterations = { + val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + previousAnalysis match { + case None => + log.info("No previous analysis detected") + 0 + case Some(a: Analysis) => a.compilations.allCompilations.size + } + } +} + +val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") + +checkIterations := { + val expected: Int = (Space ~> NatBasic).parsed + val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + assert(expected == actual, s"Expected $expected compilations, got $actual") +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-change-res/changes/B1.scala new file mode 100644 index 000000000000..eaeef8d57ece --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res/changes/B1.scala @@ -0,0 +1,5 @@ +object B { + + inline def inlinedAny(x: String): String = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-change-res/project/CompileState.scala new file mode 100644 index 000000000000..078db9c7bf56 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res/project/CompileState.scala @@ -0,0 +1,4 @@ +// This is necessary because tests are run in batch mode +object CompileState { + @volatile var previousIterations: Int = -1 +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-change-res/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/source-dependencies/inline-rec-change-res/test b/sbt-test/source-dependencies/inline-rec-change-res/test new file mode 100644 index 000000000000..5972abf58136 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-res/test @@ -0,0 +1,9 @@ +> compile +> recordPreviousIterations +# Force recompilation of A because B.inlinedAny, called by A.callInline, has changed +# the type of its result. +$ copy-file changes/B1.scala B.scala +> compile +# 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change, +# then 1 final compilation to recompile C due to A.callInline change +> checkIterations 3 diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/A.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/A.scala new file mode 100644 index 000000000000..fadbc929841a --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-typaram/A.scala @@ -0,0 +1,5 @@ +object A { + + inline def callInline: Any = B.inlinedAny(List("yyy")) + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/B.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/B.scala new file mode 100644 index 000000000000..8501c4c676a0 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-typaram/B.scala @@ -0,0 +1,5 @@ +object B { + + inline def inlinedAny[F[_], T](x: F[T]): x.type = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/C.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/C.scala new file mode 100644 index 000000000000..e6511852afa1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-typaram/C.scala @@ -0,0 +1,3 @@ +class C { + val n = A.callInline +} diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/build.sbt b/sbt-test/source-dependencies/inline-rec-change-typaram/build.sbt new file mode 100644 index 000000000000..1036709ccfc1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-typaram/build.sbt @@ -0,0 +1,25 @@ +import sbt.internal.inc.Analysis +import complete.DefaultParsers._ + +// Reset compiler iterations, necessary because tests run in batch mode +val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") +recordPreviousIterations := { + val log = streams.value.log + CompileState.previousIterations = { + val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + previousAnalysis match { + case None => + log.info("No previous analysis detected") + 0 + case Some(a: Analysis) => a.compilations.allCompilations.size + } + } +} + +val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") + +checkIterations := { + val expected: Int = (Space ~> NatBasic).parsed + val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + assert(expected == actual, s"Expected $expected compilations, got $actual") +} diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/changes/B1.scala new file mode 100644 index 000000000000..73e33ccdfd96 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-typaram/changes/B1.scala @@ -0,0 +1,5 @@ +object B { + + inline def inlinedAny[F[X] >: List[X] <: List[X], T <: String](x: F[T]): x.type = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/project/CompileState.scala new file mode 100644 index 000000000000..078db9c7bf56 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-typaram/project/CompileState.scala @@ -0,0 +1,4 @@ +// This is necessary because tests are run in batch mode +object CompileState { + @volatile var previousIterations: Int = -1 +} diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-change-typaram/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-typaram/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/source-dependencies/inline-rec-change-typaram/test b/sbt-test/source-dependencies/inline-rec-change-typaram/test new file mode 100644 index 000000000000..7e18665f3c27 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-change-typaram/test @@ -0,0 +1,9 @@ +> compile +> recordPreviousIterations +# Force recompilation of A because B.inlinedAny, called by A.callInline, has changed +# the type of its type parameters. +$ copy-file changes/B1.scala B.scala +> compile +# 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change, +# then 1 final compilation to recompile C due to A.callInline change +> checkIterations 3 diff --git a/sbt-test/source-dependencies/inline-rec-deep/A.scala b/sbt-test/source-dependencies/inline-rec-deep/A.scala new file mode 100644 index 000000000000..799104b58ba3 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-deep/A.scala @@ -0,0 +1,5 @@ +object A { + + inline def callInline: Any = B.delegated + +} diff --git a/sbt-test/source-dependencies/inline-rec-deep/B.scala b/sbt-test/source-dependencies/inline-rec-deep/B.scala new file mode 100644 index 000000000000..4ed6616db186 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-deep/B.scala @@ -0,0 +1,5 @@ +object B { + + inline def delegated: Any = C.inlinedAny(x = "yyy", y = 23) + +} diff --git a/sbt-test/source-dependencies/inline-rec-deep/C.scala b/sbt-test/source-dependencies/inline-rec-deep/C.scala new file mode 100644 index 000000000000..57ce05b0d2cf --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-deep/C.scala @@ -0,0 +1,5 @@ +object C { + + inline def inlinedAny(x: String, y: Int): x.type = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-deep/D.scala b/sbt-test/source-dependencies/inline-rec-deep/D.scala new file mode 100644 index 000000000000..3f87831200d3 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-deep/D.scala @@ -0,0 +1,3 @@ +class D { + val n = A.callInline +} diff --git a/sbt-test/source-dependencies/inline-rec-deep/build.sbt b/sbt-test/source-dependencies/inline-rec-deep/build.sbt new file mode 100644 index 000000000000..1036709ccfc1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-deep/build.sbt @@ -0,0 +1,25 @@ +import sbt.internal.inc.Analysis +import complete.DefaultParsers._ + +// Reset compiler iterations, necessary because tests run in batch mode +val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") +recordPreviousIterations := { + val log = streams.value.log + CompileState.previousIterations = { + val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + previousAnalysis match { + case None => + log.info("No previous analysis detected") + 0 + case Some(a: Analysis) => a.compilations.allCompilations.size + } + } +} + +val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") + +checkIterations := { + val expected: Int = (Space ~> NatBasic).parsed + val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + assert(expected == actual, s"Expected $expected compilations, got $actual") +} diff --git a/sbt-test/source-dependencies/inline-rec-deep/changes/C1.scala b/sbt-test/source-dependencies/inline-rec-deep/changes/C1.scala new file mode 100644 index 000000000000..4456cc87e252 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-deep/changes/C1.scala @@ -0,0 +1,5 @@ +object C { + + inline def inlinedAny(y: Int, x: String): x.type = x + +} diff --git a/sbt-test/source-dependencies/inline-rec-deep/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-deep/project/CompileState.scala new file mode 100644 index 000000000000..078db9c7bf56 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-deep/project/CompileState.scala @@ -0,0 +1,4 @@ +// This is necessary because tests are run in batch mode +object CompileState { + @volatile var previousIterations: Int = -1 +} diff --git a/sbt-test/source-dependencies/inline-rec-deep/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-deep/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-deep/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/source-dependencies/inline-rec-deep/test b/sbt-test/source-dependencies/inline-rec-deep/test new file mode 100644 index 000000000000..5381ef195868 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-deep/test @@ -0,0 +1,10 @@ +> compile +> recordPreviousIterations +# Force recompilation of B because C.inlinedAny, called by B.delegated, has changed +# the order of its parameters. +$ copy-file changes/C1.scala C.scala +> compile +# 1 to recompile C, then 1 more to recompile B due to C.inlinedAny change, +# then 1 more to recompile A due to B.delegated change, then 1 final compilation +# to recompile D due to A.callInline change +> checkIterations 4 diff --git a/sbt-test/source-dependencies/inline-rec-mut/A.scala b/sbt-test/source-dependencies/inline-rec-mut/A.scala new file mode 100644 index 000000000000..31e281b8028f --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-mut/A.scala @@ -0,0 +1,8 @@ +object A { + inline def isEven(inline x: Int): Boolean = { + inline if x % 2 == 0 then + true + else + !B.isOdd(x) + } +} diff --git a/sbt-test/source-dependencies/inline-rec-mut/B.scala b/sbt-test/source-dependencies/inline-rec-mut/B.scala new file mode 100644 index 000000000000..d01bf3cc7265 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-mut/B.scala @@ -0,0 +1,8 @@ +object B { + inline def isOdd(inline x: Int): Boolean = { + inline if x % 2 != 0 then + true + else + !A.isEven(x) + } +} diff --git a/sbt-test/source-dependencies/inline-rec-mut/C.scala b/sbt-test/source-dependencies/inline-rec-mut/C.scala new file mode 100644 index 000000000000..d286cb59c060 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-mut/C.scala @@ -0,0 +1,3 @@ +class C { + val n = A.isEven(23) +} diff --git a/sbt-test/source-dependencies/inline-rec-mut/build.sbt b/sbt-test/source-dependencies/inline-rec-mut/build.sbt new file mode 100644 index 000000000000..1036709ccfc1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-mut/build.sbt @@ -0,0 +1,25 @@ +import sbt.internal.inc.Analysis +import complete.DefaultParsers._ + +// Reset compiler iterations, necessary because tests run in batch mode +val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") +recordPreviousIterations := { + val log = streams.value.log + CompileState.previousIterations = { + val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + previousAnalysis match { + case None => + log.info("No previous analysis detected") + 0 + case Some(a: Analysis) => a.compilations.allCompilations.size + } + } +} + +val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") + +checkIterations := { + val expected: Int = (Space ~> NatBasic).parsed + val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + assert(expected == actual, s"Expected $expected compilations, got $actual") +} diff --git a/sbt-test/source-dependencies/inline-rec-mut/changes/B1.scala b/sbt-test/source-dependencies/inline-rec-mut/changes/B1.scala new file mode 100644 index 000000000000..8849df65f516 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-mut/changes/B1.scala @@ -0,0 +1,9 @@ +object B { + inline def isOdd(inline x: Int): Boolean = { + inline if x % 2 == 0 then + val cached = A.isEven(x) + !(cached || cached) + else + true + } +} diff --git a/sbt-test/source-dependencies/inline-rec-mut/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-mut/project/CompileState.scala new file mode 100644 index 000000000000..078db9c7bf56 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-mut/project/CompileState.scala @@ -0,0 +1,4 @@ +// This is necessary because tests are run in batch mode +object CompileState { + @volatile var previousIterations: Int = -1 +} diff --git a/sbt-test/source-dependencies/inline-rec-mut/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-mut/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-mut/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/source-dependencies/inline-rec-mut/test b/sbt-test/source-dependencies/inline-rec-mut/test new file mode 100644 index 000000000000..0cca3a11d161 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-mut/test @@ -0,0 +1,11 @@ +> compile +> recordPreviousIterations +# Force recompilation of A because B.isOdd, called by A.isEven, +# has changed, this should force C to recompile +$ copy-file changes/B1.scala B.scala +> compile +# 1 to recompile B, then 1 more to recompile: +# - A due to B.isOdd change +# - B due to A.isEven change +# - C due to A.isEven change +> checkIterations 2 diff --git a/sbt-test/source-dependencies/inline-rec-val/A.scala b/sbt-test/source-dependencies/inline-rec-val/A.scala new file mode 100644 index 000000000000..21c4f75fd4f0 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-val/A.scala @@ -0,0 +1,5 @@ +object A { + inline def callInline: Int = inlinedInt + + inline val inlinedInt = 23 +} diff --git a/sbt-test/source-dependencies/inline-rec-val/B.scala b/sbt-test/source-dependencies/inline-rec-val/B.scala new file mode 100644 index 000000000000..eed1cb60271e --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-val/B.scala @@ -0,0 +1,3 @@ +class B { + val n = A.callInline +} diff --git a/sbt-test/source-dependencies/inline-rec-val/build.sbt b/sbt-test/source-dependencies/inline-rec-val/build.sbt new file mode 100644 index 000000000000..1036709ccfc1 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-val/build.sbt @@ -0,0 +1,25 @@ +import sbt.internal.inc.Analysis +import complete.DefaultParsers._ + +// Reset compiler iterations, necessary because tests run in batch mode +val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") +recordPreviousIterations := { + val log = streams.value.log + CompileState.previousIterations = { + val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + previousAnalysis match { + case None => + log.info("No previous analysis detected") + 0 + case Some(a: Analysis) => a.compilations.allCompilations.size + } + } +} + +val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") + +checkIterations := { + val expected: Int = (Space ~> NatBasic).parsed + val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + assert(expected == actual, s"Expected $expected compilations, got $actual") +} diff --git a/sbt-test/source-dependencies/inline-rec-val/changes/A1.scala b/sbt-test/source-dependencies/inline-rec-val/changes/A1.scala new file mode 100644 index 000000000000..2c687006f58f --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-val/changes/A1.scala @@ -0,0 +1,5 @@ +object A { + inline def callInline: Int = inlinedInt + + inline val inlinedInt = 47 +} diff --git a/sbt-test/source-dependencies/inline-rec-val/project/CompileState.scala b/sbt-test/source-dependencies/inline-rec-val/project/CompileState.scala new file mode 100644 index 000000000000..078db9c7bf56 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-val/project/CompileState.scala @@ -0,0 +1,4 @@ +// This is necessary because tests are run in batch mode +object CompileState { + @volatile var previousIterations: Int = -1 +} diff --git a/sbt-test/source-dependencies/inline-rec-val/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/inline-rec-val/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-val/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/source-dependencies/inline-rec-val/test b/sbt-test/source-dependencies/inline-rec-val/test new file mode 100644 index 000000000000..1716f03c6c82 --- /dev/null +++ b/sbt-test/source-dependencies/inline-rec-val/test @@ -0,0 +1,7 @@ +> compile +> recordPreviousIterations +# Force recompilation of B because A.inlinedInt, called by A.callInline, has changed +$ copy-file changes/A1.scala A.scala +> compile +# 1 to recompile A, then 1 more to recompile B due to A.inlinedInt change +> checkIterations 2 diff --git a/sbt-test/source-dependencies/inline-rec/B.scala b/sbt-test/source-dependencies/inline-rec/B.scala index 2b4bd09c6e23..eed1cb60271e 100644 --- a/sbt-test/source-dependencies/inline-rec/B.scala +++ b/sbt-test/source-dependencies/inline-rec/B.scala @@ -1,5 +1,3 @@ class B { - def main(args: Array[String]): Unit = { - assert(A.callInline == C.expected) - } + val n = A.callInline } diff --git a/sbt-test/source-dependencies/inline-rec/C.scala b/sbt-test/source-dependencies/inline-rec/C.scala deleted file mode 100644 index 3b32f0026167..000000000000 --- a/sbt-test/source-dependencies/inline-rec/C.scala +++ /dev/null @@ -1,3 +0,0 @@ -object C { - def expected: Int = 23 -} diff --git a/sbt-test/source-dependencies/inline-rec/changes/C1.scala b/sbt-test/source-dependencies/inline-rec/changes/C1.scala deleted file mode 100644 index 377d5add6ca8..000000000000 --- a/sbt-test/source-dependencies/inline-rec/changes/C1.scala +++ /dev/null @@ -1,3 +0,0 @@ -object C { - def expected: Int = 47 -} diff --git a/sbt-test/source-dependencies/inline-rec/dbg.sbt b/sbt-test/source-dependencies/inline-rec/dbg.sbt deleted file mode 100644 index f9a522c9e610..000000000000 --- a/sbt-test/source-dependencies/inline-rec/dbg.sbt +++ /dev/null @@ -1,3 +0,0 @@ -logLevel := Level.Debug -incOptions in ThisBuild ~= { _.withApiDebug(true) } -incOptions in ThisBuild ~= { _.withRelationsDebug(true) } From 62343981b61ee324efa4044e8ddcb63fad9f81ba Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Mon, 22 Nov 2021 17:45:59 +0100 Subject: [PATCH 0941/1244] type ahead symbols from the sourcepath to add defTrees --- .../src/dotty/tools/dotc/sbt/ExtractAPI.scala | 16 +++++++++++----- compiler/src/dotty/tools/dotc/sbt/package.scala | 1 + .../src/dotty/tools/dotc/typer/Implicits.scala | 2 +- library/src/scala/compiletime/package.scala | 1 - 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala index 6c65c8f29c9b..16606c6e2068 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala @@ -717,11 +717,17 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { val sym = ref.symbol if sym.is(Inline, butNot = Param) && !seenInlines.contains(sym) then seenInlines += sym // dont re-enter hashing this ref - sym.defTree match - case defTree: ValOrDefDef => - h = inlineReferenceHash(sym, defTree.rhs, h) - case _ => - h = err(i"inline method reference `${ref.name}`", ref.name, ref, h) + if sym.is(Method) then + Inliner.bodyToInline(sym) match // force typechecking of body if from source + case EmptyTree => + h = err("inline method reference", ref, p, h) + case rhs => + h = inlineReferenceHash(sym, rhs, h) + else + // inline value - its rhs should match its type + // no extra info is gained from hashing the rhs + h = MurmurHash3.mix(h, InlineValHash) + h = inlineReferenceHash(sym, EmptyTree, h) case _ => // FIXME: If `p` is a tree we should probably take its type into account diff --git a/compiler/src/dotty/tools/dotc/sbt/package.scala b/compiler/src/dotty/tools/dotc/sbt/package.scala index 99a6b97bddef..56503608a986 100644 --- a/compiler/src/dotty/tools/dotc/sbt/package.scala +++ b/compiler/src/dotty/tools/dotc/sbt/package.scala @@ -9,6 +9,7 @@ inline val TermNameHash = 1987 // 300th prime inline val TypeNameHash = 1993 // 301st prime inline val EmptyParamHash = 1997 // 302nd prime inline val InlineParamHash = 1999 // 303rd prime +inline val InlineValHash = 2003 // 304th prime extension (sym: Symbol) diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index 3b4d3dc899f4..c9c73c758115 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -980,7 +980,7 @@ trait Implicits: trace(s"search implicit ${pt.show}, arg = ${argument.show}: ${argument.tpe.show}", implicits, show = true) { record("inferImplicit") assert(ctx.phase.allowsImplicitSearch, - if (argument.isEmpty) i"missing implicit parameter of type $pt after typer" + if (argument.isEmpty) i"missing implicit parameter of type $pt after typer at phase ${ctx.phase.phaseName}" else i"type error: ${argument.tpe} does not conform to $pt${err.whyNoMatchStr(argument.tpe, pt)}") if pt.unusableForInference diff --git a/library/src/scala/compiletime/package.scala b/library/src/scala/compiletime/package.scala index d65fd235e0c3..754ce4d0b9d1 100644 --- a/library/src/scala/compiletime/package.scala +++ b/library/src/scala/compiletime/package.scala @@ -188,4 +188,3 @@ def byName[T](x: => T): T = x */ extension [T](x: T) transparent inline def asMatchable: x.type & Matchable = x.asInstanceOf[x.type & Matchable] - From bc6e486a9084e7ad6c8c539ecce652eb27b21fd1 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Wed, 15 Dec 2021 12:51:27 +0100 Subject: [PATCH 0942/1244] test extractAPI of inline from sourcepath --- project/scripts/bootstrapCmdTests | 18 ++++++++++++++++-- .../sourcepath-with-inline-api-hash/build.sbt | 17 +++++++++++++++++ .../changes/zz.new.scala | 7 +++++++ .../changes/zz.original.scala | 6 ++++++ .../project/build.properties | 1 + .../src/main/scala/a/Bar.scala | 5 +++++ 6 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/build.sbt create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.new.scala create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.original.scala create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties create mode 100644 tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/src/main/scala/a/Bar.scala diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrapCmdTests index d1ec6138acb3..472426b23b20 100755 --- a/project/scripts/bootstrapCmdTests +++ b/project/scripts/bootstrapCmdTests @@ -96,8 +96,8 @@ IFS=':=' read -ra versionProps < "$cwd/dist/target/pack/VERSION" # temporarily s [ -n ${versionProps[2]} ] || die "Expected non-empty 'version' property in $cwd/dist/target/pack/VERSION" scala_version=${versionProps[2]} -echo "testing -sourcepath with inlining" -# Here we will test that an inline method symbol loaded from the sourcepath (-sourcepath compiler option) +echo "testing -sourcepath with incremental compile: inlining changed inline def into a def" +# Here we will test that a changed inline method symbol loaded from the sourcepath (-sourcepath compiler option) # will have its `defTree` correctly set when its method body is required for inlining. # So far I have not found a way to replicate issue https://github.com/lampepfl/dotty/issues/13994 # with sbt scripted tests, if a way is found, move this test there. @@ -107,3 +107,17 @@ sbt_test_command="++${scala_version}!;clean;prepareSources;compile;copyChanges;c rm -rf "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/target" rm -rf "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/target" rm -f "$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline/src/main/scala/a/zz.scala" + +echo "testing -sourcepath with incremental compile: hashing reference to changed inline def from an inline def" +# Here we will test that a changed inline method symbol loaded from the sourcepath (-sourcepath compiler option) +# will have its `defTree` correctly set when its method body is hashed by extractAPI, when referenced from another +# inline method. +# So far I have not found a way to replicate https://github.com/lampepfl/dotty/pull/12931#discussion_r753212124 +# with sbt scripted tests, if a way is found, move this test there. +cwd=$(pwd) +sbt_test_dir="$cwd/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash" +sbt_test_command="++${scala_version}!;clean;prepareSources;compile;copyChanges;compile" +(cd "$sbt_test_dir" && "$SBT" "$sbt_test_command") +rm -rf "$sbt_test_dir/target" +rm -rf "$sbt_test_dir/project/target" +rm -f "$sbt_test_dir/src/main/scala/a/zz.scala" diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/build.sbt b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/build.sbt new file mode 100644 index 000000000000..4bff160ff55a --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/build.sbt @@ -0,0 +1,17 @@ +import java.util.Properties + +val prepareSources = taskKey[Unit]("Copy changes to the src directory") +val copyChanges = taskKey[Unit]("Copy changes to the src directory") + +val srcDir = settingKey[File]("The directory to copy changes to") +val changesDir = settingKey[File]("The directory to copy changes from") + +srcDir := (ThisBuild / baseDirectory).value / "src" / "main" / "scala" +changesDir := (ThisBuild / baseDirectory).value / "changes" + +prepareSources := IO.copyFile(changesDir.value / "zz.original.scala", srcDir.value / "a" / "zz.scala") +copyChanges := IO.copyFile(changesDir.value / "zz.new.scala", srcDir.value / "a" / "zz.scala") + +(Compile / scalacOptions) ++= Seq( + "-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(java.io.File.pathSeparator), +) diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.new.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.new.scala new file mode 100644 index 000000000000..fbf5cf7fb5e0 --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.new.scala @@ -0,0 +1,7 @@ +package a + +object Foo: // note that `Foo` is defined in `zz.scala` + class Local + inline def foo(using Local): Nothing = + ??? + ??? diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.original.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.original.scala new file mode 100644 index 000000000000..17a7488ccb1a --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/changes/zz.original.scala @@ -0,0 +1,6 @@ +package a + +object Foo: // note that `Foo` is defined in `zz.scala` + class Local + inline def foo(using Local): Nothing = + ??? diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties new file mode 100644 index 000000000000..10fd9eee04ac --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.5.5 diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/src/main/scala/a/Bar.scala b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/src/main/scala/a/Bar.scala new file mode 100644 index 000000000000..4d4b7eebe09e --- /dev/null +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/src/main/scala/a/Bar.scala @@ -0,0 +1,5 @@ +package a + +object Bar: + given Foo.Local() + inline def bar = Foo.foo // `Bar.bar` is inline, it will hash the body of `Foo.foo` From 739d2a5ceab22b988f1ed0855e101ab69b1a2288 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Wed, 15 Dec 2021 19:01:40 +0100 Subject: [PATCH 0943/1244] address comments move the responsibility of closing the inline loop to apiAnnotations, which hashes the inline body annotation. Also add a test for changing second parameter list of extension methods. --- .../src/dotty/tools/dotc/sbt/ExtractAPI.scala | 232 +++++++++++------- .../src/dotty/tools/dotc/sbt/package.scala | 4 +- .../extension-change-second-tparams/A.scala | 7 + .../extension-change-second-tparams/B.scala | 6 + .../extension-change-second-tparams/build.sbt | 25 ++ .../changes/A1.scala | 7 + .../project/CompileState.scala | 4 + .../project/DottyInjectedPlugin.scala | 11 + .../extension-change-second-tparams/test | 7 + 9 files changed, 217 insertions(+), 86 deletions(-) create mode 100644 sbt-test/source-dependencies/extension-change-second-tparams/A.scala create mode 100644 sbt-test/source-dependencies/extension-change-second-tparams/B.scala create mode 100644 sbt-test/source-dependencies/extension-change-second-tparams/build.sbt create mode 100644 sbt-test/source-dependencies/extension-change-second-tparams/changes/A1.scala create mode 100644 sbt-test/source-dependencies/extension-change-second-tparams/project/CompileState.scala create mode 100644 sbt-test/source-dependencies/extension-change-second-tparams/project/DottyInjectedPlugin.scala create mode 100644 sbt-test/source-dependencies/extension-change-second-tparams/test diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala index 16606c6e2068..de0fbb8de807 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala @@ -24,6 +24,7 @@ import java.io.PrintWriter import xsbti.api.DefinitionType import scala.collection.mutable +import scala.util.hashing.MurmurHash3 /** This phase sends a representation of the API of classes to sbt via callbacks. * @@ -143,6 +144,12 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { */ private val refinedTypeCache = new mutable.HashMap[(api.Type, api.Definition), api.Structure] + /** This cache is necessary to avoid infinite loops when hashing the body of inline definitions. + * Its keys represent the root inline definitions, and its values are seen inline references within + * the rhs of the key. If a symbol is present in the value set, then do not hash its signature or inline body. + */ + private val seenInlineCache = mutable.HashMap.empty[Symbol, mutable.HashSet[Symbol]] + private val allNonLocalClassesInSrc = new mutable.HashSet[xsbti.api.ClassLike] private val _mainClasses = new mutable.HashSet[String] @@ -219,7 +226,7 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { val structure = apiClassStructure(sym) val acc = apiAccess(sym) val modifiers = apiModifiers(sym) - val anns = apiAnnotations(sym).toArray + val anns = apiAnnotations(sym, inlineOrigin = NoSymbol).toArray val topLevel = sym.isTopLevelClass val childrenOfSealedClass = sym.sealedDescendants.sorted(classFirstSort).map(c => if (c.isClass) @@ -320,54 +327,97 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { } } - def apiDefinitions(defs: List[Symbol]): List[api.ClassDefinition] = { - defs.sorted(classFirstSort).map(apiDefinition) - } + def apiDefinitions(defs: List[Symbol]): List[api.ClassDefinition] = + defs.sorted(classFirstSort).map(apiDefinition(_, inlineOrigin = NoSymbol)) - def apiDefinition(sym: Symbol): api.ClassDefinition = { + /** `inlineOrigin` denotes an optional inline method that we are + * currently hashing the body of. If it exists, include extra information + * that is missing after erasure + */ + def apiDefinition(sym: Symbol, inlineOrigin: Symbol): api.ClassDefinition = { if (sym.isClass) { apiClass(sym.asClass) } else if (sym.isType) { apiTypeMember(sym.asType) } else if (sym.is(Mutable, butNot = Accessor)) { api.Var.of(sym.name.toString, apiAccess(sym), apiModifiers(sym), - apiAnnotations(sym).toArray, apiType(sym.info)) + apiAnnotations(sym, inlineOrigin).toArray, apiType(sym.info)) } else if (sym.isStableMember && !sym.isRealMethod) { api.Val.of(sym.name.toString, apiAccess(sym), apiModifiers(sym), - apiAnnotations(sym).toArray, apiType(sym.info)) + apiAnnotations(sym, inlineOrigin).toArray, apiType(sym.info)) } else { - apiDef(sym.asTerm) + apiDef(sym.asTerm, inlineOrigin) } } - def apiDef(sym: TermSymbol): api.Def = { + /** `inlineOrigin` denotes an optional inline method that we are + * currently hashing the body of. If it exists, include extra information + * that is missing after erasure + */ + def apiDef(sym: TermSymbol, inlineOrigin: Symbol): api.Def = { + + val inlineExtras = new mutable.ListBuffer[Int => Int] + + def mixInlineParam(p: Symbol): Unit = + if inlineOrigin.exists && p.is(Inline) then + inlineExtras += hashInlineParam(p) + + def inlineExtrasAnnot: Option[api.Annotation] = + Option.when(inlineOrigin.exists && inlineExtras.nonEmpty) { + marker(s"${hashList(inlineExtras.toList)("inlineExtras".hashCode)}") + } + + def tparamList(pt: TypeLambda): List[api.TypeParameter] = + pt.paramNames.lazyZip(pt.paramInfos).map((pname, pbounds) => + apiTypeParameter(pname.toString, 0, pbounds.lo, pbounds.hi) + ) + + def paramList(mt: MethodType, params: List[Symbol]): api.ParameterList = + val apiParams = params.lazyZip(mt.paramInfos).map((param, ptype) => + mixInlineParam(param) + api.MethodParameter.of( + param.name.toString, apiType(ptype), param.is(HasDefault), api.ParameterModifier.Plain)) + api.ParameterList.of(apiParams.toArray, mt.isImplicitMethod) + def paramLists(t: Type, paramss: List[List[Symbol]]): List[api.ParameterList] = t match { case pt: TypeLambda => paramLists(pt.resultType, paramss.drop(1)) case mt @ MethodTpe(pnames, ptypes, restpe) => assert(paramss.nonEmpty && paramss.head.hasSameLengthAs(pnames), i"mismatch for $sym, ${sym.info}, ${sym.paramSymss}") - val apiParams = paramss.head.lazyZip(ptypes).map((param, ptype) => - api.MethodParameter.of(param.name.toString, apiType(ptype), - param.is(HasDefault), api.ParameterModifier.Plain)) - api.ParameterList.of(apiParams.toArray, mt.isImplicitMethod) - :: paramLists(restpe, paramss.tail) + paramList(mt, paramss.head) :: paramLists(restpe, paramss.tail) case _ => Nil } - val tparams = sym.info match { + /** returns list of pairs of 1: the position in all parameter lists, and 2: a type parameter list */ + def tparamLists(t: Type, index: Int): List[(Int, List[api.TypeParameter])] = t match case pt: TypeLambda => - pt.paramNames.lazyZip(pt.paramInfos).map((pname, pbounds) => - apiTypeParameter(pname.toString, 0, pbounds.lo, pbounds.hi)) + (index, tparamList(pt)) :: tparamLists(pt.resultType, index + 1) + case mt: MethodType => + tparamLists(mt.resultType, index + 1) case _ => Nil - } + + val (tparams, tparamsExtras) = sym.info match + case pt: TypeLambda => + (tparamList(pt), tparamLists(pt.resultType, index = 1)) + case mt: MethodType => + (Nil, tparamLists(mt.resultType, index = 1)) + case _ => + (Nil, Nil) + val vparamss = paramLists(sym.info, sym.paramSymss) val retTp = sym.info.finalResultType.widenExpr + val tparamsExtraAnnot = Option.when(tparamsExtras.nonEmpty) { + marker(s"${hashTparamsExtras(tparamsExtras)("tparamsExtra".hashCode)}") + } + + val annotations = inlineExtrasAnnot ++: tparamsExtraAnnot ++: apiAnnotations(sym, inlineOrigin) + api.Def.of(sym.zincMangledName.toString, apiAccess(sym), apiModifiers(sym), - apiAnnotations(sym).toArray, tparams.toArray, vparamss.toArray, apiType(retTp)) + annotations.toArray, tparams.toArray, vparamss.toArray, apiType(retTp)) } def apiTypeMember(sym: TypeSymbol): api.TypeMember = { @@ -375,7 +425,7 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { val name = sym.name.toString val access = apiAccess(sym) val modifiers = apiModifiers(sym) - val as = apiAnnotations(sym) + val as = apiAnnotations(sym, inlineOrigin = NoSymbol) val tpe = sym.info if (sym.isAliasType) @@ -585,10 +635,13 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { sym.isOneOf(GivenOrImplicit), sym.is(Lazy), sym.is(Macro), sym.isSuperAccessor) } - def apiAnnotations(s: Symbol): List[api.Annotation] = { + /** `inlineOrigin` denotes an optional inline method that we are + * currently hashing the body of. + */ + def apiAnnotations(s: Symbol, inlineOrigin: Symbol): List[api.Annotation] = { val annots = new mutable.ListBuffer[api.Annotation] val inlineBody = Inliner.bodyToInline(s) - if (!inlineBody.isEmpty) { + if !inlineBody.isEmpty then // If the body of an inline def changes, all the reverse dependencies of // this method need to be recompiled. sbt has no way of tracking method // bodies, so we include the hash of the body of the method as part of the @@ -599,9 +652,18 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { // an inline def in every class that extends its owner. To avoid this we // could store the hash as an annotation when pickling an inline def // and retrieve it here instead of computing it on the fly. - val inlineBodyHash = treeHash(inlineBody, inlineSym = s) - annots += marker(inlineBodyHash.toString) - } + val root = + if inlineOrigin.exists then + inlineOrigin + else + assert(!seenInlineCache.contains(s)) + seenInlineCache.put(s, mutable.HashSet.empty) + s + if !seenInlineCache(root).contains(s) then + seenInlineCache(root) += s + val inlineBodyHash = treeHash(inlineBody, inlineOrigin = root) + annots += marker(inlineBodyHash.toString) + end if // In the Scala2 ExtractAPI phase we only extract annotations that extend // StaticAnnotation, but in Dotty we currently pickle all annotations so we @@ -619,16 +681,15 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { /** Produce a hash for a tree that is as stable as possible: * it should stay the same across compiler runs, compiler instances, * JVMs, etc. + * + * `inlineOrigin` denotes an optional inline method that we are hashing the body of, where `tree` could be + * its body, or the body of another method referenced in a call chain leading to `inlineOrigin`. + * + * If `inlineOrigin` is NoSymbol, then tree is the tree of an annotation. */ - def treeHash(tree: Tree, inlineSym: Symbol): Int = - import scala.util.hashing.MurmurHash3 + def treeHash(tree: Tree, inlineOrigin: Symbol): Int = import core.Constants.* - val seenInlines = mutable.HashSet.empty[Symbol] - - if inlineSym ne NoSymbol then - seenInlines += inlineSym // do not hash twice a recursive def - def nameHash(n: Name, initHash: Int): Int = val h = if n.isTermName then @@ -651,7 +712,7 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { tp match case ConstantType(c) => h = constantHash(c, h) - case TypeBounds(lo, hi) => + case TypeBounds(lo, hi) => // TODO when does this happen? h = MurmurHash3.mix(h, apiType(lo).hashCode) h = MurmurHash3.mix(h, apiType(hi).hashCode) case tp => @@ -671,38 +732,8 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { h end constantHash - /**An inline method that calls another inline method will eventually inline the call - * at a non-inline callsite, in this case if the implementation of the nested call - * changes, then the callsite will have a different API, we should hash the definition - */ - def inlineReferenceHash(ref: Symbol, rhs: Tree, initHash: Int): Int = - var h = initHash - - def paramssHash(paramss: List[List[Symbol]], initHash: Int): Int = paramss match - case Nil :: paramss1 => - paramssHash(paramss1, MurmurHash3.mix(initHash, EmptyParamHash)) - case params :: paramss1 => - var h = initHash - val paramsIt = params.iterator - while paramsIt.hasNext do - val param = paramsIt.next - h = nameHash(param.name, h) - h = typeHash(param.info, h) - if param.is(Inline) then - h = MurmurHash3.mix(h, InlineParamHash) // inline would change the generated code - paramssHash(paramss1, h) - case Nil => - initHash - end paramssHash - - h = paramssHash(ref.paramSymss, h) - h = typeHash(ref.info.finalResultType, h) - positionedHash(rhs, h) - end inlineReferenceHash - - def err(what: String, elem: Any, pos: Positioned, initHash: Int): Int = + def cannotHash(what: String, elem: Any, pos: Positioned): Unit = internalError(i"Don't know how to produce a stable hash for $what", pos.sourcePos) - MurmurHash3.mix(initHash, elem.toString.hashCode) def positionedHash(p: ast.Positioned, initHash: Int): Int = var h = initHash @@ -712,23 +743,16 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { p.forceIfLazy case _ => - p match - case ref: RefTree @unchecked => - val sym = ref.symbol - if sym.is(Inline, butNot = Param) && !seenInlines.contains(sym) then - seenInlines += sym // dont re-enter hashing this ref - if sym.is(Method) then - Inliner.bodyToInline(sym) match // force typechecking of body if from source - case EmptyTree => - h = err("inline method reference", ref, p, h) - case rhs => - h = inlineReferenceHash(sym, rhs, h) - else - // inline value - its rhs should match its type - // no extra info is gained from hashing the rhs - h = MurmurHash3.mix(h, InlineValHash) - h = inlineReferenceHash(sym, EmptyTree, h) - case _ => + if inlineOrigin.exists then + p match + case ref: RefTree @unchecked => + val sym = ref.symbol + if sym.is(Inline, butNot = Param) && !seenInlineCache(inlineOrigin).contains(sym) then + // An inline method that calls another inline method will eventually inline the call + // at a non-inline callsite, in this case if the implementation of the nested call + // changes, then the callsite will have a different API, we should hash the definition + h = MurmurHash3.mix(h, apiDefinition(sym, inlineOrigin).hashCode) + case _ => // FIXME: If `p` is a tree we should probably take its type into account // when hashing it, but producing a stable hash for a type is not trivial @@ -754,7 +778,7 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { case n: Name => h = nameHash(n, h) case elem => - h = err(i"`$elem` of unknown class ${elem.getClass}", elem, tree, h) + cannotHash(what = i"`$elem` of unknown class ${elem.getClass}", elem, tree) h end iteratorHash @@ -763,6 +787,48 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { MurmurHash3.finalizeHash(h, 0) end treeHash + /** Hash secondary type parameters in separate marker annotation. + * We hash them separately because the position of type parameters is important. + */ + private def hashTparamsExtras(tparamsExtras: List[(Int, List[api.TypeParameter])])(initHash: Int): Int = + + def mixTparams(tparams: List[api.TypeParameter])(initHash: Int) = + var h = initHash + var elems = tparams + while elems.nonEmpty do + h = MurmurHash3.mix(h, elems.head.hashCode) + elems = elems.tail + h + + def mixIndexAndTparams(index: Int, tparams: List[api.TypeParameter])(initHash: Int) = + mixTparams(tparams)(MurmurHash3.mix(initHash, index)) + + var h = initHash + var extras = tparamsExtras + var len = 0 + while extras.nonEmpty do + h = mixIndexAndTparams(index = extras.head(0), tparams = extras.head(1))(h) + extras = extras.tail + len += 1 + MurmurHash3.finalizeHash(h, len) + end hashTparamsExtras + + private def hashList(extraHashes: List[Int => Int])(initHash: Int): Int = + var h = initHash + var fs = extraHashes + var len = 0 + while fs.nonEmpty do + h = fs.head(h) + fs = fs.tail + len += 1 + MurmurHash3.finalizeHash(h, len) + + /** Mix in the name hash also because otherwise switching which + * parameter is inline will not affect the hash. + */ + private def hashInlineParam(p: Symbol)(h: Int) = + MurmurHash3.mix(p.name.toString.hashCode, MurmurHash3.mix(h, InlineParamHash)) + def apiAnnotation(annot: Annotation): api.Annotation = { // Like with inline defs, the whole body of the annotation and not just its // type is part of its API so we need to store its hash, but Zinc wants us @@ -773,6 +839,6 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { // annotated @org.junit.Test). api.Annotation.of( apiType(annot.tree.tpe), // Used by sbt to find tests to run - Array(api.AnnotationArgument.of("TREE_HASH", treeHash(annot.tree, inlineSym = NoSymbol).toString))) + Array(api.AnnotationArgument.of("TREE_HASH", treeHash(annot.tree, inlineOrigin = NoSymbol).toString))) } } diff --git a/compiler/src/dotty/tools/dotc/sbt/package.scala b/compiler/src/dotty/tools/dotc/sbt/package.scala index 56503608a986..379a2e45ce40 100644 --- a/compiler/src/dotty/tools/dotc/sbt/package.scala +++ b/compiler/src/dotty/tools/dotc/sbt/package.scala @@ -7,9 +7,7 @@ import dotty.tools.dotc.core.Names.Name inline val TermNameHash = 1987 // 300th prime inline val TypeNameHash = 1993 // 301st prime -inline val EmptyParamHash = 1997 // 302nd prime -inline val InlineParamHash = 1999 // 303rd prime -inline val InlineValHash = 2003 // 304th prime +inline val InlineParamHash = 1997 // 302nd prime extension (sym: Symbol) diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/A.scala b/sbt-test/source-dependencies/extension-change-second-tparams/A.scala new file mode 100644 index 000000000000..9726ab97fa95 --- /dev/null +++ b/sbt-test/source-dependencies/extension-change-second-tparams/A.scala @@ -0,0 +1,7 @@ +object A { + + class Box[T](val value: T) + + extension (box: Box[Int]) def map[I <: Int](f: Int => I): Box[I] = new Box(f(box.value)) + +} diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/B.scala b/sbt-test/source-dependencies/extension-change-second-tparams/B.scala new file mode 100644 index 000000000000..9faedc0666d3 --- /dev/null +++ b/sbt-test/source-dependencies/extension-change-second-tparams/B.scala @@ -0,0 +1,6 @@ +import A.Box +import A.map + +class B { + val n = Box(5).map(x => x * 3) +} diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/build.sbt b/sbt-test/source-dependencies/extension-change-second-tparams/build.sbt new file mode 100644 index 000000000000..1036709ccfc1 --- /dev/null +++ b/sbt-test/source-dependencies/extension-change-second-tparams/build.sbt @@ -0,0 +1,25 @@ +import sbt.internal.inc.Analysis +import complete.DefaultParsers._ + +// Reset compiler iterations, necessary because tests run in batch mode +val recordPreviousIterations = taskKey[Unit]("Record previous iterations.") +recordPreviousIterations := { + val log = streams.value.log + CompileState.previousIterations = { + val previousAnalysis = (previousCompile in Compile).value.analysis.asScala + previousAnalysis match { + case None => + log.info("No previous analysis detected") + 0 + case Some(a: Analysis) => a.compilations.allCompilations.size + } + } +} + +val checkIterations = inputKey[Unit]("Verifies the accumulated number of iterations of incremental compilation.") + +checkIterations := { + val expected: Int = (Space ~> NatBasic).parsed + val actual: Int = ((compile in Compile).value match { case a: Analysis => a.compilations.allCompilations.size }) - CompileState.previousIterations + assert(expected == actual, s"Expected $expected compilations, got $actual") +} diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/changes/A1.scala b/sbt-test/source-dependencies/extension-change-second-tparams/changes/A1.scala new file mode 100644 index 000000000000..505d037ceb6b --- /dev/null +++ b/sbt-test/source-dependencies/extension-change-second-tparams/changes/A1.scala @@ -0,0 +1,7 @@ +object A { + + class Box[T](val value: T) + + extension (box: Box[Int]) def map[I](f: Int => I): Box[I] = new Box(f(box.value)) + +} diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/project/CompileState.scala b/sbt-test/source-dependencies/extension-change-second-tparams/project/CompileState.scala new file mode 100644 index 000000000000..078db9c7bf56 --- /dev/null +++ b/sbt-test/source-dependencies/extension-change-second-tparams/project/CompileState.scala @@ -0,0 +1,4 @@ +// This is necessary because tests are run in batch mode +object CompileState { + @volatile var previousIterations: Int = -1 +} diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/project/DottyInjectedPlugin.scala b/sbt-test/source-dependencies/extension-change-second-tparams/project/DottyInjectedPlugin.scala new file mode 100644 index 000000000000..fb946c4b8c61 --- /dev/null +++ b/sbt-test/source-dependencies/extension-change-second-tparams/project/DottyInjectedPlugin.scala @@ -0,0 +1,11 @@ +import sbt._ +import Keys._ + +object DottyInjectedPlugin extends AutoPlugin { + override def requires = plugins.JvmPlugin + override def trigger = allRequirements + + override val projectSettings = Seq( + scalaVersion := sys.props("plugin.scalaVersion") + ) +} diff --git a/sbt-test/source-dependencies/extension-change-second-tparams/test b/sbt-test/source-dependencies/extension-change-second-tparams/test new file mode 100644 index 000000000000..9b96674ac362 --- /dev/null +++ b/sbt-test/source-dependencies/extension-change-second-tparams/test @@ -0,0 +1,7 @@ +> compile +> recordPreviousIterations +# Force recompilation of B because A.map, called by B.n, has changed +$ copy-file changes/A1.scala A.scala +> compile +# 1 to recompile A, then 1 more to recompile B due to A.map change +> checkIterations 2 From ea60ab564c3050f3f7682e144d4cbcbe97a846e8 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Thu, 16 Dec 2021 14:47:24 +0100 Subject: [PATCH 0944/1244] cache inherited inline body caches --- .../src/dotty/tools/dotc/sbt/ExtractAPI.scala | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala index de0fbb8de807..8cbe7d2a1d7c 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala @@ -149,6 +149,7 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { * the rhs of the key. If a symbol is present in the value set, then do not hash its signature or inline body. */ private val seenInlineCache = mutable.HashMap.empty[Symbol, mutable.HashSet[Symbol]] + private val inlineBodyCache = mutable.HashMap.empty[Symbol, Int] private val allNonLocalClassesInSrc = new mutable.HashSet[xsbti.api.ClassLike] private val _mainClasses = new mutable.HashSet[String] @@ -652,17 +653,27 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { // an inline def in every class that extends its owner. To avoid this we // could store the hash as an annotation when pickling an inline def // and retrieve it here instead of computing it on the fly. - val root = - if inlineOrigin.exists then - inlineOrigin - else - assert(!seenInlineCache.contains(s)) - seenInlineCache.put(s, mutable.HashSet.empty) - s - if !seenInlineCache(root).contains(s) then - seenInlineCache(root) += s - val inlineBodyHash = treeHash(inlineBody, inlineOrigin = root) + + def registerInlineHash(inlineBodyHash: Int): Unit = annots += marker(inlineBodyHash.toString) + + def nestedHash(root: Symbol): Unit = + if !seenInlineCache(root).contains(s) then + seenInlineCache(root) += s + registerInlineHash(treeHash(inlineBody, inlineOrigin = root)) + + def originHash(root: Symbol): Unit = + def computeHash(): Int = + assert(!seenInlineCache.contains(root)) + seenInlineCache.put(root, mutable.HashSet(root)) + val res = treeHash(inlineBody, inlineOrigin = root) + seenInlineCache.remove(root) + res + registerInlineHash(inlineBodyCache.getOrElseUpdate(root, computeHash())) + + if inlineOrigin.exists then nestedHash(root = inlineOrigin) + else originHash(root = s) + end if // In the Scala2 ExtractAPI phase we only extract annotations that extend From 775bf1bacbcf2efb904235815d9ba81cd70bb2f1 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Tue, 21 Dec 2021 16:45:13 +0100 Subject: [PATCH 0945/1244] address comments --- .../src/dotty/tools/dotc/sbt/ExtractAPI.scala | 90 +++++++------------ 1 file changed, 32 insertions(+), 58 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala index 8cbe7d2a1d7c..5bbc52e09a82 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala @@ -25,6 +25,7 @@ import xsbti.api.DefinitionType import scala.collection.mutable import scala.util.hashing.MurmurHash3 +import scala.util.chaining.* /** This phase sends a representation of the API of classes to sbt via callbacks. * @@ -141,14 +142,17 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { /** This cache is necessary to avoid unstable name hashing when `typeCache` is present, * see the comment in the `RefinedType` case in `computeType` * The cache key is (api of RefinedType#parent, api of RefinedType#refinedInfo). - */ + */ private val refinedTypeCache = new mutable.HashMap[(api.Type, api.Definition), api.Structure] - /** This cache is necessary to avoid infinite loops when hashing the body of inline definitions. - * Its keys represent the root inline definitions, and its values are seen inline references within - * the rhs of the key. If a symbol is present in the value set, then do not hash its signature or inline body. + /** This cache is necessary to avoid infinite loops when hashing an inline "Body" annotation. + * Its values are transitively seen inline references within a call chain starting from a single "origin" inline + * definition. Avoid hashing an inline "Body" annotation if its associated definition is already in the cache. + * Precondition: the cache is empty whenever we hash a new "origin" inline "Body" annotation. */ - private val seenInlineCache = mutable.HashMap.empty[Symbol, mutable.HashSet[Symbol]] + private val seenInlineCache = mutable.HashSet.empty[Symbol] + + /** This cache is optional, it avoids recomputing hashes of inline "Body" annotations. */ private val inlineBodyCache = mutable.HashMap.empty[Symbol, Int] private val allNonLocalClassesInSrc = new mutable.HashSet[xsbti.api.ClassLike] @@ -357,15 +361,18 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { */ def apiDef(sym: TermSymbol, inlineOrigin: Symbol): api.Def = { - val inlineExtras = new mutable.ListBuffer[Int => Int] + var seenInlineExtras = false + var inlineExtras = 41 def mixInlineParam(p: Symbol): Unit = if inlineOrigin.exists && p.is(Inline) then - inlineExtras += hashInlineParam(p) + seenInlineExtras = true + inlineExtras = hashInlineParam(p, inlineExtras) def inlineExtrasAnnot: Option[api.Annotation] = - Option.when(inlineOrigin.exists && inlineExtras.nonEmpty) { - marker(s"${hashList(inlineExtras.toList)("inlineExtras".hashCode)}") + val h = inlineExtras + Option.when(seenInlineExtras) { + marker(s"${MurmurHash3.finalizeHash(h, "inlineExtras".hashCode)}") } def tparamList(pt: TypeLambda): List[api.TypeParameter] = @@ -654,25 +661,15 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { // could store the hash as an annotation when pickling an inline def // and retrieve it here instead of computing it on the fly. - def registerInlineHash(inlineBodyHash: Int): Unit = - annots += marker(inlineBodyHash.toString) - - def nestedHash(root: Symbol): Unit = - if !seenInlineCache(root).contains(s) then - seenInlineCache(root) += s - registerInlineHash(treeHash(inlineBody, inlineOrigin = root)) + def hash[U](inlineOrigin: Symbol): Int = + assert(seenInlineCache.add(s)) // will fail if already seen, guarded by treeHash + treeHash(inlineBody, inlineOrigin) - def originHash(root: Symbol): Unit = - def computeHash(): Int = - assert(!seenInlineCache.contains(root)) - seenInlineCache.put(root, mutable.HashSet(root)) - val res = treeHash(inlineBody, inlineOrigin = root) - seenInlineCache.remove(root) - res - registerInlineHash(inlineBodyCache.getOrElseUpdate(root, computeHash())) + val inlineHash = + if inlineOrigin.exists then hash(inlineOrigin) + else inlineBodyCache.getOrElseUpdate(s, hash(inlineOrigin = s).tap(_ => seenInlineCache.clear())) - if inlineOrigin.exists then nestedHash(root = inlineOrigin) - else originHash(root = s) + annots += marker(inlineHash.toString) end if @@ -712,32 +709,19 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { MurmurHash3.mix(h, n.toString.hashCode) end nameHash - def typeHash(tp: Type, initHash: Int): Int = - // Go through `apiType` to get a value with a stable hash, it'd - // be better to use Murmur here too instead of relying on - // `hashCode`, but that would essentially mean duplicating - // https://github.com/sbt/zinc/blob/develop/internal/zinc-apiinfo/src/main/scala/xsbt/api/HashAPI.scala - // and at that point we might as well do type hashing on our own - // representation. - var h = initHash - tp match - case ConstantType(c) => - h = constantHash(c, h) - case TypeBounds(lo, hi) => // TODO when does this happen? - h = MurmurHash3.mix(h, apiType(lo).hashCode) - h = MurmurHash3.mix(h, apiType(hi).hashCode) - case tp => - h = MurmurHash3.mix(h, apiType(tp).hashCode) - h - end typeHash - def constantHash(c: Constant, initHash: Int): Int = var h = MurmurHash3.mix(initHash, c.tag) c.tag match case NullTag => // No value to hash, the tag is enough. case ClazzTag => - h = typeHash(c.typeValue, h) + // Go through `apiType` to get a value with a stable hash, it'd + // be better to use Murmur here too instead of relying on + // `hashCode`, but that would essentially mean duplicating + // https://github.com/sbt/zinc/blob/develop/internal/zinc-apiinfo/src/main/scala/xsbt/api/HashAPI.scala + // and at that point we might as well do type hashing on our own + // representation. + h = MurmurHash3.mix(h, apiType(c.typeValue).hashCode) case _ => h = MurmurHash3.mix(h, c.value.hashCode) h @@ -758,7 +742,7 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { p match case ref: RefTree @unchecked => val sym = ref.symbol - if sym.is(Inline, butNot = Param) && !seenInlineCache(inlineOrigin).contains(sym) then + if sym.is(Inline, butNot = Param) && !seenInlineCache.contains(sym) then // An inline method that calls another inline method will eventually inline the call // at a non-inline callsite, in this case if the implementation of the nested call // changes, then the callsite will have a different API, we should hash the definition @@ -824,20 +808,10 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { MurmurHash3.finalizeHash(h, len) end hashTparamsExtras - private def hashList(extraHashes: List[Int => Int])(initHash: Int): Int = - var h = initHash - var fs = extraHashes - var len = 0 - while fs.nonEmpty do - h = fs.head(h) - fs = fs.tail - len += 1 - MurmurHash3.finalizeHash(h, len) - /** Mix in the name hash also because otherwise switching which * parameter is inline will not affect the hash. */ - private def hashInlineParam(p: Symbol)(h: Int) = + private def hashInlineParam(p: Symbol, h: Int) = MurmurHash3.mix(p.name.toString.hashCode, MurmurHash3.mix(h, InlineParamHash)) def apiAnnotation(annot: Annotation): api.Annotation = { From 33181149f577010694abf1ce023d12a54121079f Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Wed, 22 Dec 2021 09:55:26 +0100 Subject: [PATCH 0946/1244] clarify comment about inlineBodyCache --- compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala index 5bbc52e09a82..3e0e148f7101 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala @@ -152,7 +152,9 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { */ private val seenInlineCache = mutable.HashSet.empty[Symbol] - /** This cache is optional, it avoids recomputing hashes of inline "Body" annotations. */ + /** This cache is optional, it avoids recomputing hashes of inline "Body" annotations, + * e.g. when a concrete inline method is inherited by a subclass. + */ private val inlineBodyCache = mutable.HashMap.empty[Symbol, Int] private val allNonLocalClassesInSrc = new mutable.HashSet[xsbti.api.ClassLike] @@ -654,12 +656,6 @@ private class ExtractAPICollector(using Context) extends ThunkHolder { // this method need to be recompiled. sbt has no way of tracking method // bodies, so we include the hash of the body of the method as part of the // signature we send to sbt. - // - // FIXME: The API of a class we send to Zinc includes the signatures of - // inherited methods, which means that we repeatedly compute the hash of - // an inline def in every class that extends its owner. To avoid this we - // could store the hash as an annotation when pickling an inline def - // and retrieve it here instead of computing it on the fly. def hash[U](inlineOrigin: Symbol): Int = assert(seenInlineCache.add(s)) // will fail if already seen, guarded by treeHash From d215d53710b838cb43c0e1ca136d4c65f58024c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 14 Dec 2021 13:38:49 +0100 Subject: [PATCH 0947/1244] Fix bug with extension groups not being filtered --- .../dotty_res/scripts/components/DocumentableList.js | 7 +++++++ .../dotty/tools/scaladoc/renderers/MemberRenderer.scala | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js b/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js index 42b779f79bea..3971598adc0a 100644 --- a/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js +++ b/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js @@ -47,6 +47,13 @@ class DocumentableList extends Component { return isElementVisible; }).length; + findRefs("span.groupHeader", listRef).forEach(h => { + const headerSiblings = this.state.list.getSectionListElementsRefs(h.parentNode).map(ref => this.state.list.toListElement(ref)) + const isHeaderVisible = headerSiblings.filter(s => this.state.list.isElementVisible(s, filter)) != 0 + + this.toggleDisplayStyles(isHeaderVisible, h) + }) + this.toggleDisplayStyles(isListVisible, listRef); return isListVisible; diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala index a0ccada4b160..506a5051eb8b 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala @@ -287,7 +287,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext .functionParameters(on.argsLists) .asInstanceOf[InlineSignatureBuilder].names.reverse val sig = typeSig ++ Signature(Plain(s"(${on.name}: ")) ++ on.signature ++ Signature(Plain(")")) ++ argsSig - MGroup(span(sig.map(renderElement)), members.sortBy(_.name).toSeq, on.name) + MGroup(span(cls := "groupHeader")(sig.map(renderElement)), members.sortBy(_.name).toSeq, on.name) }.toSeq div(cls := "membersList")(renderTabs( From cf21499752795fcd135c9207502522f43049b9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Fri, 17 Dec 2021 14:12:04 +0100 Subject: [PATCH 0948/1244] Better support for exports --- scaladoc-testcases/src/tests/exports.scala | 23 ---------- scaladoc-testcases/src/tests/exports1.scala | 45 +++++++++++++++++++ scaladoc-testcases/src/tests/exports2.scala | 12 +++++ scaladoc/src/dotty/tools/scaladoc/api.scala | 8 +++- .../scaladoc/renderers/MemberRenderer.scala | 9 ++-- .../tools/scaladoc/renderers/Resources.scala | 2 +- .../scaladoc/tasty/ClassLikeSupport.scala | 42 ++++++++++------- .../tools/scaladoc/tasty/TypesSupport.scala | 3 +- .../translators/FilterAttributes.scala | 2 +- .../translators/ScalaSignatureProvider.scala | 8 ++-- .../TranslatableSignaturesTestCases.scala | 2 + 11 files changed, 104 insertions(+), 52 deletions(-) delete mode 100644 scaladoc-testcases/src/tests/exports.scala create mode 100644 scaladoc-testcases/src/tests/exports1.scala create mode 100644 scaladoc-testcases/src/tests/exports2.scala diff --git a/scaladoc-testcases/src/tests/exports.scala b/scaladoc-testcases/src/tests/exports.scala deleted file mode 100644 index 4e1267680575..000000000000 --- a/scaladoc-testcases/src/tests/exports.scala +++ /dev/null @@ -1,23 +0,0 @@ -package tests -package exports - -class A: - def aDefInt: Int = 1 - def aDef1: 1 = 1 - val aValInt: Int = 1 - val aVal1: 1 = 1 - var aVarInt: Int = 1 - var aVar1: 1 = 1 - -object X: - def xDefInt: Int = 1 - def xDef1: 1 = 1 - val xValInt: Int = 1 - val xVal1: 1 = 1 - var xVarInt: Int = 1 - var xVar1: 1 = 1 - -class B: - val a = new A - export a._ - export X._ diff --git a/scaladoc-testcases/src/tests/exports1.scala b/scaladoc-testcases/src/tests/exports1.scala new file mode 100644 index 000000000000..8c47ddc94b79 --- /dev/null +++ b/scaladoc-testcases/src/tests/exports1.scala @@ -0,0 +1,45 @@ +package tests +package exports1 + +class A: //unexpected + def aDefInt: Int + = 1 + def aDef1: 1 + = 1 + val aValInt: Int + = 1 + val aVal1: 1 + = 1 + var aVarInt: Int + = 1 + var aVar1: 1 + = 1 + type HKT[T[_], X] //expected: final type HKT = [T[_], X] =>> HKT[T, X] + = T[X] + type SomeRandomType = (List[_] | Seq[_]) & String //expected: final type SomeRandomType = SomeRandomType + def x[T[_], X](x: X): HKT[T, X] + = ??? + def fn[T, U]: T => U + = ??? + object Object //expected: val Obj: Object.type + val x: HKT[List, Int] + = ??? + class Class(val a: Int, val b: Int) extends Serializable //expected: final type Class = Class + enum Enum: //expected: final type Enum = Enum + case A + case B(i: Int) + case C[T]() extends Enum + +object X: //unexpected + def xDefInt: Int + = 1 + def xDef1: 1 + = 1 + val xValInt: Int + = 1 + val xVal1: 1 + = 1 + var xVarInt: Int + = 1 + var xVar1: 1 + = 1 \ No newline at end of file diff --git a/scaladoc-testcases/src/tests/exports2.scala b/scaladoc-testcases/src/tests/exports2.scala new file mode 100644 index 000000000000..c6450265ab1b --- /dev/null +++ b/scaladoc-testcases/src/tests/exports2.scala @@ -0,0 +1,12 @@ +package tests +package exports2 + +import exports1._ + +class B: + val a: A + = new A + export a.{Object => Obj, _} + export X._ + def obj: Obj.type + = Obj diff --git a/scaladoc/src/dotty/tools/scaladoc/api.scala b/scaladoc/src/dotty/tools/scaladoc/api.scala index f7285a9da6ec..314dcc3c7261 100644 --- a/scaladoc/src/dotty/tools/scaladoc/api.scala +++ b/scaladoc/src/dotty/tools/scaladoc/api.scala @@ -64,7 +64,7 @@ enum Kind(val name: String): case Constructor(base: Kind.Def) extends Kind("def") case Var extends Kind("var") case Val extends Kind("val") - case Exported(m: Kind.Def) extends Kind("export") + case Exported(base: Kind) extends Kind("export") case Type(concreate: Boolean, opaque: Boolean, typeParams: Seq[TypeParameter]) extends Kind("type") // should we handle opaque as modifier? case Given(kind: Def | Class | Val.type, as: Option[Signature], conversion: Option[ImplicitConversion]) @@ -76,7 +76,7 @@ enum Kind(val name: String): enum Origin: case ImplicitlyAddedBy(name: String, dri: DRI) case ExtensionFrom(name: String, dri: DRI) - case ExportedFrom(name: String, dri: Option[DRI]) + case ExportedFrom(link: Option[Link]) case Overrides(overriddenMembers: Seq[Overridden]) case RegularlyDefined @@ -186,8 +186,12 @@ extension[T] (member: Member) def asLink: LinkToType = LinkToType(member.signature, member.dri, member.kind) def membersBy(op: Member => Boolean): Seq[Member] = member.members.filter(op) + def withDRI(dri: DRI): Member = member.copy(dri = dri) + def withMembers(newMembers: Seq[Member]): Member = member.copy(members = newMembers) + def withName(name: String): Member = member.copy(name = name) + def updateRecusivly(op: Member => Member): Member = val newMembers = member.members.map(_.updateRecusivly(op)) op(member).withMembers(newMembers) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala index 506a5051eb8b..19dd4e4b7403 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala @@ -120,10 +120,9 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext Seq("Implicitly added by ", renderLink(name, dri)) case Origin.ExtensionFrom(name, dri) => Seq("Extension method from ", renderLink(name, dri)) - case Origin.ExportedFrom(name, dri) => - val signatureName: TagArg = dri match - case Some(dri: DRI) => renderLink(name, dri) - case None => name + case Origin.ExportedFrom(Some(link)) => + val signatureName: TagArg = link match + case Link(name, dri) => renderLink(name, dri) Seq("Exported from ", signatureName) case _ => Nil } @@ -132,7 +131,7 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext val depStyle = if member.deprecated.isEmpty then "" else "deprecated" val nameClasses = cls := s"documentableName $depStyle" - val rawBuilder = ScalaSignatureProvider.rawSignature(member, InlineSignatureBuilder()) + val rawBuilder = ScalaSignatureProvider.rawSignature(member, InlineSignatureBuilder())() val inlineBuilder = rawBuilder.asInstanceOf[InlineSignatureBuilder] val kind :: modifiersRevered = inlineBuilder.preName val signature = inlineBuilder.names.reverse diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala index 3cb97316ad2f..7857c1bbd06a 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala @@ -145,7 +145,7 @@ trait Resources(using ctx: DocContext) extends Locations, Writer: case m: Member if m.kind != Kind.RootPackage => val descr = m.dri.asFileLocation def processMember(member: Member): Seq[JSON] = - val signatureBuilder = ScalaSignatureProvider.rawSignature(member, InlineSignatureBuilder()).asInstanceOf[InlineSignatureBuilder] + val signatureBuilder = ScalaSignatureProvider.rawSignature(member, InlineSignatureBuilder())().asInstanceOf[InlineSignatureBuilder] val sig = Signature(Plain(s"${member.kind.name} "), Plain(member.name)) ++ signatureBuilder.names.reverse val entry = mkEntry(member.dri, member.name, flattenToText(sig), descr, member.kind.name) val children = member diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala index 0ff21cda60c1..31e27e234332 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala @@ -149,21 +149,23 @@ trait ClassLikeSupport: } case dd: DefDef if !dd.symbol.isHiddenByVisibility && dd.symbol.isExported && !dd.symbol.isArtifact => - val exportedTarget = dd.rhs.collect { - case a: Apply => a.fun.asInstanceOf[Select] - case s: Select => s + dd.rhs.map { + case TypeApply(rhs, _) => rhs + case Apply(TypeApply(rhs, _), _) => rhs + case rhs => rhs + }.map(_.tpe.termSymbol).filter(_.exists).map(_.tree).map { + case v: ValDef if v.symbol.flags.is(Flags.Module) && !v.symbol.flags.is(Flags.Synthetic) => + v.symbol.owner -> Symbol.newVal(c.symbol, dd.name, v.tpt.tpe, Flags.Final, Symbol.noSymbol).tree + case other => other.symbol.owner -> other + }.flatMap { (originalOwner, tree) => + parseMember(c)(tree) + .map { m => m + .withDRI(dd.symbol.dri) + .withName(dd.symbol.normalizedName) + .withKind(Kind.Exported(m.kind)) + .withOrigin(Origin.ExportedFrom(Some(Link(originalOwner.normalizedName, originalOwner.dri)))) + } } - val functionName = exportedTarget.fold("function")(_.name) - val instanceName = exportedTarget.collect { - case Select(qualifier: Select, _) => qualifier.name - case Select(qualifier: Ident, _) => qualifier.tpe.typeSymbol.normalizedName - }.getOrElse("instance") - val dri = dd.rhs.collect { - case s: Select if s.symbol.isDefDef => s.symbol.dri - }.orElse(exportedTarget.map(_.qualifier.tpe.typeSymbol.dri)) - - Some(parseMethod(c, dd.symbol, specificKind = Kind.Exported(_)) - .withOrigin(Origin.ExportedFrom(s"$instanceName.$functionName", dri))) case dd: DefDef if !dd.symbol.isHiddenByVisibility && !dd.symbol.isSyntheticFunc && !dd.symbol.isExtensionMethod && !dd.symbol.isArtifact => Some(parseMethod(c, dd.symbol)) @@ -423,7 +425,17 @@ trait ClassLikeSupport: val defaultKind = Kind.Type(!isTreeAbstract(typeDef.rhs), typeDef.symbol.isOpaque, generics).asInstanceOf[Kind.Type] val kind = if typeDef.symbol.flags.is(Flags.Enum) then Kind.EnumCase(defaultKind) else defaultKind - mkMember(typeDef.symbol, kind, tpeTree.asSignature)(deprecated = typeDef.symbol.isDeprecated()) + + if typeDef.symbol.flags.is(Flags.Exported) + then { + val origin = Some(tpeTree).flatMap { + case TypeBoundsTree(l: TypeTree, h: TypeTree) if l.tpe == h.tpe => + Some(Link(l.tpe.typeSymbol.owner.name, l.tpe.typeSymbol.owner.dri)) + case _ => None + } + mkMember(typeDef.symbol, Kind.Exported(kind), tpeTree.asSignature)(deprecated = typeDef.symbol.isDeprecated(), origin = Origin.ExportedFrom(origin)) + } + else mkMember(typeDef.symbol, kind, tpeTree.asSignature)(deprecated = typeDef.symbol.isDeprecated()) def parseValDef(c: ClassDef, valDef: ValDef): Member = def defaultKind = if valDef.symbol.flags.is(Flags.Mutable) then Kind.Var else Kind.Val diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala index d825b7ab6c31..faa8b61f807f 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala @@ -305,7 +305,8 @@ trait TypesSupport: private def typeBoundsTreeOfHigherKindedType(using Quotes)(low: reflect.TypeRepr, high: reflect.TypeRepr) = import reflect._ def regularTypeBounds(low: TypeRepr, high: TypeRepr) = - typeBound(low, low = true) ++ typeBound(high, low = false) + if low == high then keyword(" = ").l ++ inner(low) + else typeBound(low, low = true) ++ typeBound(high, low = false) high.match case TypeLambda(params, paramBounds, resType) => if resType.typeSymbol == defn.AnyClass then diff --git a/scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala b/scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala index 0a1b62dcb4d6..1202e76a548c 100644 --- a/scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala +++ b/scaladoc/src/dotty/tools/scaladoc/translators/FilterAttributes.scala @@ -20,7 +20,7 @@ object FilterAttributes: private def origin(m: Member): Map[String, String] = m.origin match case Origin.ImplicitlyAddedBy(name, _) => Map("implicitly" -> s"by $name") case Origin.ExtensionFrom(name, _) => Map("extension" -> s"from $name") - case Origin.ExportedFrom(name, _) => Map("export" -> s"from $name") + case Origin.ExportedFrom(Some(link)) => Map("export" -> s"from ${link.name}}") case _ => Map.empty diff --git a/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala index d8f80f332b6d..0639b5af09bd 100644 --- a/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala +++ b/scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala @@ -2,12 +2,12 @@ package dotty.tools.scaladoc package translators object ScalaSignatureProvider: - def rawSignature(documentable: Member, builder: SignatureBuilder): SignatureBuilder = - documentable.kind match + def rawSignature(documentable: Member, builder: SignatureBuilder)(kind: Kind = documentable.kind): SignatureBuilder = + kind match case Kind.Extension(_, m) => extensionSignature(documentable, m, builder) case Kind.Exported(d) => - methodSignature(documentable, d, builder) + rawSignature(documentable, builder)(d) case d: Kind.Def => methodSignature(documentable, d, builder) case Kind.Constructor(d) => @@ -33,7 +33,7 @@ object ScalaSignatureProvider: case trt: Kind.Trait => traitSignature(documentable, trt, builder) case Kind.Val | Kind.Var | Kind.Implicit(Kind.Val, _) => - fieldSignature(documentable, documentable.kind.name, builder) + fieldSignature(documentable, kind.name, builder) case tpe: Kind.Type => typeSignature(tpe, documentable, builder) case Kind.Package => diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala index 9aced84c96d0..d85d2d960d2c 100644 --- a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala +++ b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala @@ -88,3 +88,5 @@ class SpecializedSignature extends SignatureTest("specializedSignature", Signatu class ContextBounds extends SignatureTest("contextBounds", SignatureTest.all) class FBoundedTypeParameters extends SignatureTest("fboundedTypeParameters", SignatureTest.all) + +class Exports extends SignatureTest("exports2", SignatureTest.all, sourceFiles = List("exports1", "exports2")) From b7fde05555345015c994c8d6078894920e585c6d Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Fri, 31 Dec 2021 00:16:18 +0100 Subject: [PATCH 0949/1244] docs: improve scaladocs for TastyFormat The main motivation behind this is to improve the reader experience when looking at the TastyFormat docs on https://scala-lang.org/api/3.x/dotty/tools/tasty/TastyFormat$.html since in its current format all spacing is lost. This instead utilizes code blocks in a valid scaladoc to ensure the spacing is kept. You can see what this should look like by looking at https://scala-lang.org/api/3.x/scala/quoted/Quotes$reflectModule.html which uses the same approach. Addresses https://github.com/lampepfl/dotty-feature-requests/issues/273 --- tasty/src/dotty/tools/tasty/TastyFormat.scala | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tasty/src/dotty/tools/tasty/TastyFormat.scala b/tasty/src/dotty/tools/tasty/TastyFormat.scala index 22922ed6d5f3..f4f72a6e7e19 100644 --- a/tasty/src/dotty/tools/tasty/TastyFormat.scala +++ b/tasty/src/dotty/tools/tasty/TastyFormat.scala @@ -10,15 +10,16 @@ lower case letter*_ are for explanation of semantic content only, they can be dropped without changing the grammar. Micro-syntax: - +```none LongInt = Digit* StopDigit -- big endian 2's complement, value fits in a Long w/o overflow Int = LongInt -- big endian 2's complement, fits in an Int w/o overflow Nat = LongInt -- non-negative value, fits in an Int without overflow Digit = 0 | ... | 127 StopDigit = 128 | ... | 255 -- value = digit - 128 +``` Macro-format: - +```none File = Header majorVersion_Nat minorVersion_Nat experimentalVersion_Nat VersionString UUID nameTable_Length Name* Section* Header = 0x5CA1AB1F @@ -48,13 +49,14 @@ Macro-format: // If positive, this is a NameRef for the fully qualified name of a term parameter. NameRef = Nat // ordinal number of name in name table, starting from 1. +``` Note: Unqualified names in the name table are strings. The context decides whether a name is a type-name or a term-name. The same string can represent both. Standard-Section: "ASTs" TopLevelStat* - +```none TopLevelStat = PACKAGE Length Path TopLevelStat* -- package path { topLevelStats } Stat @@ -220,22 +222,23 @@ Standard-Section: "ASTs" TopLevelStat* | CONTRAVARIANT Annotation = ANNOTATION Length tycon_Type fullAnnotation_Term -- An annotation, given (class) type of constructor, and full application tree +``` Note: The signature of a SELECTin or TERMREFin node is the signature of the selected symbol, not the signature of the reference. The latter undergoes an asSeenFrom but the former does not. Note: Tree tags are grouped into 5 categories that determine what follows, and thus allow to compute the size of the tagged tree in a generic way. - +```none Category 1 (tags 1-59) : tag Category 2 (tags 60-89) : tag Nat Category 3 (tags 90-109) : tag AST Category 4 (tags 110-127): tag Nat AST Category 5 (tags 128-255): tag Length - +``` Standard-Section: "Positions" LinesSizes Assoc* - +```none LinesSizes = Nat Nat* // Number of lines followed by the size of each line not counting the trailing `\n` Assoc = Header offset_Delta? offset_Delta? point_Delta? @@ -251,15 +254,17 @@ Standard-Section: "Positions" LinesSizes Assoc* SOURCE = 4 // Impossible as header, since addr_Delta = 0 implies that we refer to the // same tree as the previous one, but then hasStartDiff = 1 implies that // the tree's range starts later than the range of itself. +``` All elements of a position section are serialized as Ints Standard Section: "Comments" Comment* - +```none Comment = Length Bytes LongInt // Raw comment's bytes encoded as UTF-8, followed by the comment's coordinates. +``` - +* @syntax markdown **************************************************************************************/ object TastyFormat { From d760159a207091bab9047b4b82ff2b865c5b4aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Mon, 3 Jan 2022 10:04:12 +0100 Subject: [PATCH 0950/1244] Update year in Scaladoc script test --- project/scripts/cmdScaladocTests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index 4ddd52b432f7..fd3c4de85777 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -36,7 +36,7 @@ dist/target/pack/bin/scaladoc \ "-skip-by-id:scala.runtime.MatchCase" \ "-snippet-compiler:scaladoc-testcases/docs=compile" \ -siteroot scaladoc-testcases/docs \ - -project-footer "Copyright (c) 2002-2021, LAMP/EPFL" \ + -project-footer "Copyright (c) 2002-2022, LAMP/EPFL" \ -default-template static-site-main \ -author -groups -revision master -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts" From 0e1205ca866465031b6dca1f00167727bb8ee1ac Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 23 Dec 2021 08:47:08 -0800 Subject: [PATCH 0951/1244] festive holiday typo fixes if we misspell too many things, Santa won't visit Dotty --- compiler/src/dotty/tools/dotc/typer/Typer.scala | 2 +- .../{ReplCompillationUnit.scala => ReplCompilationUnit.scala} | 0 compiler/test/dotty/tools/repl/ReplCompilerTests.scala | 2 +- docs/docs/internals/dotty-internals-1-notes.md | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename compiler/src/dotty/tools/repl/{ReplCompillationUnit.scala => ReplCompilationUnit.scala} (100%) diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index a571f39c42bc..957a51532886 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -336,7 +336,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer * A package object should always be skipped if we look for a term. * That way we make sure we consider all overloaded alternatives of * a definition, even if they are in different source files. - * If we are looking for a type, a package object should ne skipped + * If we are looking for a type, a package object should be skipped * only if it does not contain opaque definitions. Package objects * with opaque definitions are significant, since opaque aliases * are only seen if the prefix is the this-type of the package object. diff --git a/compiler/src/dotty/tools/repl/ReplCompillationUnit.scala b/compiler/src/dotty/tools/repl/ReplCompilationUnit.scala similarity index 100% rename from compiler/src/dotty/tools/repl/ReplCompillationUnit.scala rename to compiler/src/dotty/tools/repl/ReplCompilationUnit.scala diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala index 87c493ecde6a..406826ad67b1 100644 --- a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala +++ b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala @@ -85,7 +85,7 @@ class ReplCompilerTests extends ReplTest { assertEquals("x: Int = 10", storedOutput().trim) } - @Test def defaultParamter = fromInitialState { implicit state => + @Test def defaultParameter = fromInitialState { implicit state => run("def foo(a: Int = 1): 1 = 1") assertEquals("def foo(a: Int): 1", storedOutput().trim) } diff --git a/docs/docs/internals/dotty-internals-1-notes.md b/docs/docs/internals/dotty-internals-1-notes.md index 8f3110bd91fb..899fb49438b3 100644 --- a/docs/docs/internals/dotty-internals-1-notes.md +++ b/docs/docs/internals/dotty-internals-1-notes.md @@ -88,7 +88,7 @@ on the structure of a tree is error-prone. ## Errors `dotc/typer/ErrorReporting.scala` -Sometimes there's an error during compilation, but we want to continue compilling (as opposed to failing outright), to +Sometimes there's an error during compilation, but we want to continue compiling (as opposed to failing outright), to uncover additional errors. In cases where a tree is expected but there's an error, we can use the `errorTree` methods in `ErrorReporting` to create From 097a95687fcaee0a8672bbc6eff8c24afe7a9d3c Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Tue, 4 Jan 2022 19:50:28 +0100 Subject: [PATCH 0952/1244] migrate gitter links to discord This follows up the announcement made on https://www.scala-lang.org/blog/2021/12/21/discord.html that Discord is now the official Scala chat. --- README.md | 4 ++-- docs/_layouts/main.html | 6 ------ docs/css/dottydoc.css | 29 ----------------------------- docs/css/frontpage.css | 6 ------ project/Build.scala | 2 +- project/scripts/cmdScaladocTests | 2 +- 6 files changed, 4 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index 30789723d25a..834f02bc01fd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Dotty ===== [![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster) -[![Join the chat at https://gitter.im/scala/scala](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/scala/scala?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://img.shields.io/discord/632150470000902164) * [Homepage](https://dotty.epfl.ch) * [Documentation](https://dotty.epfl.ch/docs) @@ -18,7 +18,7 @@ Building a Local Distribution Code of Conduct =============== Dotty uses the [Scala Code of Conduct](https://www.scala-lang.org/conduct.html) -for all communication and discussion. This includes both GitHub, Gitter chat and +for all communication and discussion. This includes both GitHub, Discord and other more direct lines of communication such as email. How to Contribute diff --git a/docs/_layouts/main.html b/docs/_layouts/main.html index 5a9a2c1f2254..51139f6080ac 100644 --- a/docs/_layouts/main.html +++ b/docs/_layouts/main.html @@ -8,9 +8,3 @@

{{ content }}
- - diff --git a/docs/css/dottydoc.css b/docs/css/dottydoc.css index 3dd8b13bfaa2..ca7613835ff0 100644 --- a/docs/css/dottydoc.css +++ b/docs/css/dottydoc.css @@ -211,21 +211,6 @@ aside.success { background-color: #ebfddd; } -/* gitter chat */ -.gitter-open-chat-button { - background-color: grey; -} -.gitter-open-chat-button:focus, .gitter-open-chat-button:hover { - background-color: var(--primary); -} -.gitter-open-chat-button:focus { - box-shadow: 0 0 8px var(--primary); -} -.gitter-chat-embed { - top: 40px; /* 50px (navbar) - 10px (aside's margin) */ - bottom: -10px; -} - /* media queries for bigger screens (dottydoc is mobile-first) */ @media (min-width: 576px) { .byline .author { @@ -252,20 +237,6 @@ aside.success { } } -.gitter-open-chat-button { - writing-mode: vertical-lr; - text-orientation: upright; - right: 0px; - bottom: 100px; - padding: 0.5em 0.25em 0.5em 0.25em; - border-bottom-left-radius: .5em; - border-top-right-radius: 0em; -} - -.gitter-open-chat-button.is-collapsed { - transform: translateX(120%); -} - header { position: static !important; width: 100% !important; diff --git a/docs/css/frontpage.css b/docs/css/frontpage.css index 722d4ba09802..a3a5c0d7dd8a 100644 --- a/docs/css/frontpage.css +++ b/docs/css/frontpage.css @@ -119,12 +119,6 @@ pre, code { line-height: 1.75em; } -/* gitter chat */ -.gitter-chat-embed { - top: 0; - bottom: 0; -} - aside { margin: 0; padding: 0; diff --git a/project/Build.scala b/project/Build.scala index a18e37db9772..3ee15efc21e9 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -329,7 +329,7 @@ object Build { "-project-logo", "docs/logo.svg", "-social-links:" + "github::https://github.com/lampepfl/dotty," + - "gitter::https://gitter.im/scala/scala," + + "discord::https://discord.com/invite/scala," + "twitter::https://twitter.com/scala_lang", // contains special definitions which are "transplanted" elsewhere // and which therefore confuse Scaladoc when accessed from this pkg diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index fd3c4de85777..e2eb8fd65470 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -30,7 +30,7 @@ dist/target/pack/bin/scaladoc \ "-skip-by-regex:.+\.internal($|\..+)" \ "-skip-by-regex:.+\.impl($|\..+)" \ -project-logo docs/logo.svg \ - -social-links:github::https://github.com/lampepfl/dotty,gitter::https://gitter.im/scala/scala,twitter::https://twitter.com/scala_lang \ + -social-links:github::https://github.com/lampepfl/dotty,discord::https://discord.com/invite/scala,twitter::https://twitter.com/scala_lang \ -Ygenerate-inkuire \ "-skip-by-id:scala.runtime.stdLibPatches" \ "-skip-by-id:scala.runtime.MatchCase" \ From edcb3e5769ea21d3c8805ea86bdd105a6f58e67f Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 8 Dec 2021 22:25:56 +0100 Subject: [PATCH 0953/1244] Harden erasure of PolyFunction apply's Fix in case qualifier is an intersection with a PolyFunction type. Fixes #13950 --- .../src/dotty/tools/dotc/transform/Erasure.scala | 16 +++++++++++++--- tests/pos/i13950.scala | 5 +++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 tests/pos/i13950.scala diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index 7a89a819677f..b08327d7ae25 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -667,8 +667,18 @@ object Erasure { def mapOwner(sym: Symbol): Symbol = if !sym.exists && tree.name == nme.apply then // PolyFunction apply Selects will not have a symbol, so deduce the owner - // from the typed the erasure of the original qualifier. - val owner = erasure(tree.qualifier.typeOpt).typeSymbol + // from the typed tree of the erasure of the original qualifier's PolyFunction type. + // Need to sidestep information loss in the erasure of AndTypes, see pos/i13950.scala. + val polyFunctionQualType = inContext(preErasureCtx) { + def narrowToPolyFun(tp: Type)(using Context): Type = + if tp.derivesFrom(defn.PolyFunctionClass) then + tp match + case AndType(tp1, tp2) => narrowToPolyFun(tp1).orElse(narrowToPolyFun(tp2)) + case _ => tp + else NoType + narrowToPolyFun(tree.qualifier.typeOpt.widen) + } + val owner = erasure(polyFunctionQualType).typeSymbol if defn.isFunctionClass(owner) then owner else NoSymbol else val owner = sym.maybeOwner @@ -687,7 +697,7 @@ object Erasure { val owner = mapOwner(origSym) val sym = if (owner eq origSym.maybeOwner) origSym else owner.info.decl(tree.name).symbol - assert(sym.exists, origSym.showLocated) + assert(sym.exists, i"no owner from $owner/${origSym.showLocated} in $tree") if owner == defn.ObjectClass then checkValue(qual1) diff --git a/tests/pos/i13950.scala b/tests/pos/i13950.scala new file mode 100644 index 000000000000..768786169cd0 --- /dev/null +++ b/tests/pos/i13950.scala @@ -0,0 +1,5 @@ +def example = + (1,2).map[[_] =>> Int]([C] => (x1: C) => x1 match { + case x2: ([V] => () => Int) => + x2[Int]() + }) \ No newline at end of file From c9daae02d660153f20a6636438319724fd4306e2 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Tue, 4 Jan 2022 15:28:54 +0100 Subject: [PATCH 0954/1244] Alternative approach to PolyFunction apply erasure The previous approach did not handle situations where the qualifier was not directly an AndType, but a type whose underlying type is an AndType like in example2 and example3 (this commit also minimizes the original example further). --- .../dotty/tools/dotc/core/TypeErasure.scala | 15 +++++++++----- .../dotty/tools/dotc/transform/Erasure.scala | 20 +++++++++---------- tests/pos/i13950.scala | 5 ----- tests/run/i13950.scala | 11 ++++++++++ 4 files changed, 30 insertions(+), 21 deletions(-) delete mode 100644 tests/pos/i13950.scala create mode 100644 tests/run/i13950.scala diff --git a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala index 6435d0622ebd..1473bcc559e2 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeErasure.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeErasure.scala @@ -524,6 +524,15 @@ object TypeErasure { case tp: OrType => hasStableErasure(tp.tp1) && hasStableErasure(tp.tp2) case _ => false } + + /** The erasure of `PolyFunction { def apply: $applyInfo }` */ + def erasePolyFunctionApply(applyInfo: Type)(using Context): Type = + assert(applyInfo.isInstanceOf[PolyType]) + val res = applyInfo.resultType + val paramss = res.paramNamess + assert(paramss.length == 1) + erasure(defn.FunctionType(paramss.head.length, + isContextual = res.isImplicitMethod, isErased = res.isErasedMethod)) } import TypeErasure._ @@ -597,11 +606,7 @@ class TypeErasure(sourceLanguage: SourceLanguage, semiEraseVCs: Boolean, isConst case ExprType(rt) => defn.FunctionType(0) case RefinedType(parent, nme.apply, refinedInfo) if parent.typeSymbol eq defn.PolyFunctionClass => - assert(refinedInfo.isInstanceOf[PolyType]) - val res = refinedInfo.resultType - val paramss = res.paramNamess - assert(paramss.length == 1) - this(defn.FunctionType(paramss.head.length, isContextual = res.isImplicitMethod, isErased = res.isErasedMethod)) + erasePolyFunctionApply(refinedInfo) case tp: TypeProxy => this(tp.underlying) case tp @ AndType(tp1, tp2) => diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index b08327d7ae25..91214341f650 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -668,18 +668,16 @@ object Erasure { if !sym.exists && tree.name == nme.apply then // PolyFunction apply Selects will not have a symbol, so deduce the owner // from the typed tree of the erasure of the original qualifier's PolyFunction type. - // Need to sidestep information loss in the erasure of AndTypes, see pos/i13950.scala. - val polyFunctionQualType = inContext(preErasureCtx) { - def narrowToPolyFun(tp: Type)(using Context): Type = - if tp.derivesFrom(defn.PolyFunctionClass) then - tp match - case AndType(tp1, tp2) => narrowToPolyFun(tp1).orElse(narrowToPolyFun(tp2)) - case _ => tp - else NoType - narrowToPolyFun(tree.qualifier.typeOpt.widen) + // We cannot simply call `erasure` on the qualifier because its erasure might be + // `Object` due to how we erase intersections (see pos/i13950.scala). + // Instead, we manually lookup the type of `apply` in the qualifier. + inContext(preErasureCtx) { + val qualTp = tree.qualifier.typeOpt.widen + if qualTp.derivesFrom(defn.PolyFunctionClass) then + erasePolyFunctionApply(qualTp.select(nme.apply).widen).classSymbol + else + NoSymbol } - val owner = erasure(polyFunctionQualType).typeSymbol - if defn.isFunctionClass(owner) then owner else NoSymbol else val owner = sym.maybeOwner if defn.specialErasure.contains(owner) then diff --git a/tests/pos/i13950.scala b/tests/pos/i13950.scala deleted file mode 100644 index 768786169cd0..000000000000 --- a/tests/pos/i13950.scala +++ /dev/null @@ -1,5 +0,0 @@ -def example = - (1,2).map[[_] =>> Int]([C] => (x1: C) => x1 match { - case x2: ([V] => () => Int) => - x2[Int]() - }) \ No newline at end of file diff --git a/tests/run/i13950.scala b/tests/run/i13950.scala new file mode 100644 index 000000000000..b8f93129beb8 --- /dev/null +++ b/tests/run/i13950.scala @@ -0,0 +1,11 @@ +def example(x: Any & ([V] => V => Int)) = + x[Int](1) +def example2(x: (Any & ([V] => V => Int)) @unchecked) = + x[Int](1) +def example3[S <: Any & ([V] => V => Int)](x: S) = + x[Int](1) + +@main def Test = + example([A] => (x: A) => 1) + example2([A] => (x: A) => 1) + example3([A] => (x: A) => 1) From cc215db92766bd7c786d543108e654b2c12ce44f Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 3 Jan 2022 12:19:18 +0100 Subject: [PATCH 0955/1244] Upgrade to SBT 1.6.1 --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 2a972edc4c28..4450993b1848 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -140,7 +140,7 @@ final case class SbtCommunityProject( case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome") case _ => Nil extraSbtArgs ++ sbtProps ++ List( - "-sbt-version", "1.5.7", + "-sbt-version", "1.6.1", "-Dsbt.supershell=false", s"-Ddotty.communitybuild.dir=$communitybuildDir", s"--addPluginSbtFile=$sbtPluginFilePath" diff --git a/project/build.properties b/project/build.properties index baf5ff3ec78b..3161d2146c63 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.7 +sbt.version=1.6.1 From b4858d2926132a3db48179a94d0e62ad07960398 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 4 Jan 2022 09:56:20 +0100 Subject: [PATCH 0956/1244] Update cmdTest to SBT 1.6.1 --- .../sourcepath-with-inline-api-hash/project/build.properties | 2 +- .../sourcepath-with-inline/project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties index 10fd9eee04ac..3161d2146c63 100644 --- a/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline-api-hash/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.6.1 diff --git a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties index 10fd9eee04ac..3161d2146c63 100644 --- a/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties +++ b/tests/cmdTest-sbt-tests/sourcepath-with-inline/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.6.1 From ea22e5e06e437eecd148024b0f0b4f7c41cd22d5 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 4 Jan 2022 09:57:31 +0100 Subject: [PATCH 0957/1244] Upgrade sbt-test to SBT 1.6.1 --- sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties index a919a9b5f46b..3161d2146c63 100644 --- a/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties +++ b/sbt-test/sbt-dotty/dotty-knowledge.i17/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.8 +sbt.version=1.6.1 From 48b9b80130096a5e09bf4bfded7fbdfc02d9d411 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 4 Jan 2022 09:58:12 +0100 Subject: [PATCH 0958/1244] Upgrade semanticdb to SBT 1.6.1 --- semanticdb/project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semanticdb/project/build.properties b/semanticdb/project/build.properties index 7c58a83abffb..3161d2146c63 100644 --- a/semanticdb/project/build.properties +++ b/semanticdb/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.6 +sbt.version=1.6.1 From 3fc58c469eac323ceb062e005dfbe34cd0a66db9 Mon Sep 17 00:00:00 2001 From: oronpo Date: Wed, 5 Jan 2022 11:25:33 -0500 Subject: [PATCH 0959/1244] Remove deprecation of `compiletime.ops.int.ToString` --- library/src/scala/compiletime/ops/int.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/scala/compiletime/ops/int.scala b/library/src/scala/compiletime/ops/int.scala index 3776e9e0d0d0..c1f95dbf952b 100644 --- a/library/src/scala/compiletime/ops/int.scala +++ b/library/src/scala/compiletime/ops/int.scala @@ -183,7 +183,7 @@ object int: * ``` * @syntax markdown */ - @deprecated("Use compiletime.ops.any.ToString instead.","3.2.0") + //@deprecated("Use compiletime.ops.any.ToString instead.","3.2.0") // uncomment when reaching 3.2.0 type ToString[X <: Int] <: String /** Long conversion of an `Int` singleton type. From a8c56108fdd7dc83f7226b2439347d65d167629f Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 6 Jan 2022 10:04:23 +0100 Subject: [PATCH 0960/1244] Support quoted PolyFunction Fixes #14180 --- compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala | 5 ----- tests/pos-macros/i14180/Macro_1.scala | 3 +++ tests/pos-macros/i14180/Test_2.scala | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 tests/pos-macros/i14180/Macro_1.scala create mode 100644 tests/pos-macros/i14180/Test_2.scala diff --git a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala index 0b323836d59a..6347e6bc4dec 100644 --- a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala +++ b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala @@ -91,11 +91,6 @@ object PickledQuotes { val quotedType = typeHole(idx, reifiedArgs) PickledQuotes.quotedTypeToTree(quotedType) } - case tree: Select => - // Retain selected members - val qual = transform(tree.qualifier) - qual.select(tree.symbol).withSpan(tree.span) - case tree => if tree.isDef then tree.symbol.annotations = tree.symbol.annotations.map { diff --git a/tests/pos-macros/i14180/Macro_1.scala b/tests/pos-macros/i14180/Macro_1.scala new file mode 100644 index 000000000000..ee6396c1d1d8 --- /dev/null +++ b/tests/pos-macros/i14180/Macro_1.scala @@ -0,0 +1,3 @@ +import scala.quoted._ +def impl(using Quotes): Expr[Unit] = + '{ ([V] => (v: V) => println(v)).apply[Int](2) } diff --git a/tests/pos-macros/i14180/Test_2.scala b/tests/pos-macros/i14180/Test_2.scala new file mode 100644 index 000000000000..a98ba87e8729 --- /dev/null +++ b/tests/pos-macros/i14180/Test_2.scala @@ -0,0 +1,2 @@ +inline def foo = ${ impl } +def example = foo From afd18c8bd0422bd961728e9453417e2ac684c666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Mon, 10 Jan 2022 10:36:56 +0100 Subject: [PATCH 0961/1244] Bump liqp to latest version --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 3ee15efc21e9..5773fab61cdb 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1345,7 +1345,7 @@ object Build { ) }.taskValue, libraryDependencies ++= Dependencies.flexmarkDeps ++ Seq( - "nl.big-o" % "liqp" % "0.6.8", + "nl.big-o" % "liqp" % "0.8.2", "org.jsoup" % "jsoup" % "1.13.1", // Needed to process .html files for static site Dependencies.`jackson-dataformat-yaml`, From 54261348bab41bce4ba252305e7efa0fd31f2457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Mon, 10 Jan 2022 11:24:56 +0100 Subject: [PATCH 0962/1244] Add liqp dependencies to scripts --- dist/bin/scaladoc | 6 ++++-- dist/bin/scaladoc.bat | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dist/bin/scaladoc b/dist/bin/scaladoc index f09bf27812c0..a3a23a1accea 100755 --- a/dist/bin/scaladoc +++ b/dist/bin/scaladoc @@ -73,6 +73,8 @@ classpathArgs () { CLASS_PATH+="$(find_lib "*liqp*")$PSEP" CLASS_PATH+="$(find_lib "*jsoup*")$PSEP" CLASS_PATH+="$(find_lib "*jackson-dataformat-yaml*")$PSEP" + CLASS_PATH+="$(find_lib "*jackson-datatype-jsr310*")$PSEP" + CLASS_PATH+="$(find_lib "*strftime4j*")$PSEP" CLASS_PATH+="$(find_lib "*scala-asm*")$PSEP" CLASS_PATH+="$(find_lib "*compiler-interface*")$PSEP" CLASS_PATH+="$(find_lib "*jline-reader*")$PSEP" @@ -82,7 +84,7 @@ classpathArgs () { CLASS_PATH+="$(find_lib "*flexmark-formatter*")$PSEP" CLASS_PATH+="$(find_lib "*autolink-0.6*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-jira-converter*")$PSEP" - CLASS_PATH+="$(find_lib "*antlr-3*")$PSEP" + CLASS_PATH+="$(find_lib "*antlr4*")$PSEP" CLASS_PATH+="$(find_lib "*jackson-annotations*")$PSEP" CLASS_PATH+="$(find_lib "*jackson-core*")$PSEP" CLASS_PATH+="$(find_lib "*jackson-databind*")$PSEP" @@ -94,7 +96,7 @@ classpathArgs () { CLASS_PATH+="$(find_lib "*flexmark-ext-tables*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-ext-ins*")$PSEP" CLASS_PATH+="$(find_lib "*flexmark-ext-superscript*")$PSEP" - CLASS_PATH+="$(find_lib "*antlr-runtime*")$PSEP" + CLASS_PATH+="$(find_lib "*antlr4-runtime*")$PSEP" CLASS_PATH+="$(find_lib "*ST4*")" jvm_cp_args="-classpath \"$CLASS_PATH\"" diff --git a/dist/bin/scaladoc.bat b/dist/bin/scaladoc.bat index 17823d488e56..698f2a7c36f1 100644 --- a/dist/bin/scaladoc.bat +++ b/dist/bin/scaladoc.bat @@ -120,6 +120,8 @@ call :updateClasspath "flexmark-ext-yaml-front-matter" call :updateClasspath "liqp" call :updateClasspath "jsoup" call :updateClasspath "jackson-dataformat-yaml" +call :updateClasspath "jackson-datatype-jsr310" +call :updateClasspath "strftime4j" call :updateClasspath "scala-asm" call :updateClasspath "compiler-interface" call :updateClasspath "jline-reader" @@ -129,7 +131,7 @@ call :updateClasspath "flexmark-util" call :updateClasspath "flexmark-formatter" call :updateClasspath "autolink-0.6" call :updateClasspath "flexmark-jira-converter" -call :updateClasspath "antlr-3" +call :updateClasspath "antlr4" call :updateClasspath "jackson-annotations" call :updateClasspath "jackson-core" call :updateClasspath "jackson-databind" @@ -141,7 +143,7 @@ call :updateClasspath "jna-5" call :updateClasspath "flexmark-ext-tables" call :updateClasspath "flexmark-ext-ins" call :updateClasspath "flexmark-ext-superscript" -call :updateClasspath "antlr-runtime-3" +call :updateClasspath "antlr4-runtime" call :updateClasspath "ST4" goto :eof From 41af2c42e3dbf95c2036de3ab4e07a009dade36b Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 3 Jan 2022 14:46:11 +0100 Subject: [PATCH 0963/1244] Remove unnecessary main arg from tests --- compiler/test/dotty/tools/vulpix/ChildJVMMain.java | 2 +- tests/run/absoverride.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/test/dotty/tools/vulpix/ChildJVMMain.java b/compiler/test/dotty/tools/vulpix/ChildJVMMain.java index 65e40f3bbbac..a6873ead1968 100644 --- a/compiler/test/dotty/tools/vulpix/ChildJVMMain.java +++ b/compiler/test/dotty/tools/vulpix/ChildJVMMain.java @@ -14,7 +14,7 @@ public class ChildJVMMain { private static void runMain(String dir) throws Exception { Method meth = null; - Object[] args = new Object[]{ new String[]{ "jvm" } }; + Object[] args = new Object[]{ new String[]{ } }; try { String jcp = System.getProperty("java.class.path"); String sep = File.pathSeparator; diff --git a/tests/run/absoverride.scala b/tests/run/absoverride.scala index 0301498935a0..6e3c7318c487 100644 --- a/tests/run/absoverride.scala +++ b/tests/run/absoverride.scala @@ -34,7 +34,7 @@ class Iter2(s: String) extends StringIterator(s) with SyncIterator with LoggedIterator; object Test { def main(args: Array[String]): Unit = { - class Iter extends StringIterator(args(0)) with RichIterator with SyncIterator with LoggedIterator + class Iter extends StringIterator("jvm") with RichIterator with SyncIterator with LoggedIterator val iter = new Iter iter foreach Console.println } From 54de800017ee4ca7ba0c365ba8c884d5c73ef59e Mon Sep 17 00:00:00 2001 From: Hugo van Rijswijk Date: Mon, 10 Jan 2022 17:25:27 +0100 Subject: [PATCH 0964/1244] Fix Scala.JS source map URIs Dotty publishes release versions without a `v` in the tag, but the Scala.JS source map URI configuration is published with a `v` prefix. This causes incorrect source map URLs like: https://raw.githubusercontent.com/lampepfl/dotty/v3.1.0/library/src/scala/IArray.scala (this is in the current releases JAR). This commit fixes the source map URIs to no longer use the `v` prefix. --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 5773fab61cdb..ef6781ee199f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -828,7 +828,7 @@ object Build { if (isRelease) { val baseURI = (LocalRootProject / baseDirectory).value.toURI val dottyVersion = version.value - Seq(s"-scalajs-mapSourceURI:$baseURI->$dottyGithubRawUserContentUrl/v$dottyVersion/") + Seq(s"-scalajs-mapSourceURI:$baseURI->$dottyGithubRawUserContentUrl/$dottyVersion/") } else { Nil } From 0c5b5a5efc6e28ab5f47558c23f645245a7a963f Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Mon, 3 Jan 2022 04:59:36 -0800 Subject: [PATCH 0965/1244] Clear temp var for captured var expr to permit GC --- .../tools/dotc/transform/CapturedVars.scala | 67 ++++++++++++------- tests/run/i14198.scala | 60 +++++++++++++++++ tests/run/liftedTry.scala | 23 ++++++- 3 files changed, 123 insertions(+), 27 deletions(-) create mode 100644 tests/run/i14198.scala diff --git a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala index 7b6d7ee64cd2..876bffea7348 100644 --- a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala +++ b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala @@ -10,6 +10,7 @@ import core.Decorators._ import core.StdNames.nme import core.Names._ import core.NameKinds.TempResultName +import core.Constants._ import ast.Trees._ import util.Store import collection.mutable @@ -17,7 +18,8 @@ import collection.mutable /** This phase translates variables that are captured in closures to * heap-allocated refs. */ -class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisPhase => +class CapturedVars extends MiniPhase with IdentityDenotTransformer: + thisPhase => import ast.tpd._ /** the following two members override abstract members in Transform */ @@ -45,6 +47,9 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisPhase = val boxedRefClasses: collection.Set[Symbol] = refClassKeys.flatMap(k => Set(refClass(k), volatileRefClass(k))) + + val objectRefClasses: collection.Set[Symbol] = + Set(refClass(defn.ObjectClass), volatileRefClass(defn.ObjectClass)) } private var myRefInfo: RefInfo = null @@ -123,32 +128,44 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisPhase = } /** If assignment is to a boxed ref type, e.g. - * - * intRef.elem = expr - * - * rewrite using a temporary var to - * - * val ev$n = expr - * intRef.elem = ev$n - * - * That way, we avoid the problem that `expr` might contain a `try` that would - * run on a non-empty stack (which is illegal under JVM rules). Note that LiftTry - * has already run before, so such `try`s would not be eliminated. - * - * Also: If the ref type lhs is followed by a cast (can be an artifact of nested translation), - * drop the cast. - */ - override def transformAssign(tree: Assign)(using Context): Tree = { - def recur(lhs: Tree): Tree = lhs match { - case TypeApply(Select(qual, nme.asInstanceOf_), _) => - val Select(_, nme.elem) = qual + * + * intRef.elem = expr + * + * rewrite using a temporary var to + * + * val ev$n = expr + * intRef.elem = ev$n + * + * That way, we avoid the problem that `expr` might contain a `try` that would + * run on a non-empty stack (which is illegal under JVM rules). Note that LiftTry + * has already run before, so such `try`s would not be eliminated. + * + * If the ref type lhs is followed by a cast (can be an artifact of nested translation), + * drop the cast. + * + * If the ref type is `ObjectRef` or `VolatileObjectRef`, immediately assign `null` + * to the temporary to make the underlying target of the reference available for + * garbage collection. Nullification is omitted if the `expr` is already `null`. + * + * var ev$n: RHS = expr + * objRef.elem = ev$n + * ev$n = null.asInstanceOf[RHS] + */ + override def transformAssign(tree: Assign)(using Context): Tree = + def absolved: Boolean = tree.rhs match + case Literal(Constant(null)) | Typed(Literal(Constant(null)), _) => true + case _ => false + def recur(lhs: Tree): Tree = lhs match + case TypeApply(Select(qual@Select(_, nme.elem), nme.asInstanceOf_), _) => recur(qual) case Select(_, nme.elem) if refInfo.boxedRefClasses.contains(lhs.symbol.maybeOwner) => - val tempDef = transformFollowing(SyntheticValDef(TempResultName.fresh(), tree.rhs)) - transformFollowing(Block(tempDef :: Nil, cpy.Assign(tree)(lhs, ref(tempDef.symbol)))) + val tempDef = transformFollowing { + ValDef(newSymbol(ctx.owner, TempResultName.fresh(), Mutable | Synthetic, tree.rhs.tpe.widen, coord = tree.rhs.span), tree.rhs) + } + val update = cpy.Assign(tree)(lhs, ref(tempDef.symbol)) + def reset = cpy.Assign(tree)(ref(tempDef.symbol), nullLiteral.cast(tempDef.symbol.info)) + val res = if refInfo.objectRefClasses(lhs.symbol.maybeOwner) && !absolved then reset else unitLiteral + transformFollowing(Block(tempDef :: update :: Nil, res)) case _ => tree - } recur(tree.lhs) - } -} diff --git a/tests/run/i14198.scala b/tests/run/i14198.scala new file mode 100644 index 000000000000..94ac07ee5d84 --- /dev/null +++ b/tests/run/i14198.scala @@ -0,0 +1,60 @@ + +import java.lang.ref.WeakReference +import java.util.concurrent.atomic.AtomicReference + +final class Mark + +object Test: + + def main(args: Array[String]): Unit = + myTest + trying + + final def myAssert(cond: => Boolean): Unit = assert(cond) + + def terminally(cond: => Boolean): Unit = + System.gc() + var n = 10 + while (n > 0 && !cond) + do + System.gc() + Thread.`yield`() + //print(".") + n -= 1 + assert(cond) + + def myTest: Unit = + val ref = new AtomicReference[WeakReference[AnyRef]] + var mark: AnyRef = null + assert(ref.compareAndSet(null, WeakReference(Mark()))) + mark = ref.get().get() + myAssert(mark ne null) // in theory this could fail, but it isn't + mark = null + terminally(ref.get().get() == null) + + def trying: Unit = + def ignore[A]: (Throwable => A) = _ => null.asInstanceOf[A] + var i: Int = 21 + var s: String = "hello" + var r: WeakReference[String] = null + def f(n: => Int) = n + n + 1 + def g(x: => String) = + r = WeakReference(x + "/" + x) + r.get() + i = try f(i) catch ignore + s = try g(s) catch ignore + assert(s == "hello/hello") + assert(r.get() == "hello/hello") + s = null + terminally(r.get() == null) + s = "bye" + s = try g(s) catch ignore + assert(s == "bye/bye") + assert(r.get() == "bye/bye") + s = null.asInstanceOf[String] + terminally(r.get() == null) + @volatile var z: String = "whoa" + z = try g(z) catch ignore + assert(r.get() == "whoa/whoa") + z = null + terminally(r.get() == null) diff --git a/tests/run/liftedTry.scala b/tests/run/liftedTry.scala index ff9af98eca32..0a158b5a0ba2 100644 --- a/tests/run/liftedTry.scala +++ b/tests/run/liftedTry.scala @@ -16,7 +16,7 @@ object Test { assert(x == 1) assert(foo(2) == 2) assert(foo(try raise(3) catch handle) == 3) - Tr.foo + assert(Tr.foo == 3) } } @@ -24,7 +24,26 @@ object Tr { def fun(a: Int => Unit) = a(2) def foo: Int = { var s = 1 - s = try {fun(s = _); 3} catch{ case ex: Throwable => val x = 4; s = x; 5 } + s = try {fun(s = _); 3} catch { case ex: Throwable => val x = 4; s = x; 5 } s } } + +/* was: +Caused by: java.lang.VerifyError: Inconsistent stackmap frames at branch target 33 +Exception Details: + Location: + Tr$.foo()I @30: goto + Reason: + Current frame's stack size doesn't match stackmap. + Current Frame: + bci: @30 + flags: { } + locals: { 'Tr$', 'scala/runtime/IntRef', 'java/lang/Throwable', integer } + stack: { integer } + Stackmap Frame: + bci: @33 + flags: { } + locals: { 'Tr$', 'scala/runtime/IntRef' } + stack: { top, integer } + */ From 8ac7fe2c2b691232ca2bf01db87a4965887b89f1 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Mon, 10 Jan 2022 11:55:51 -0800 Subject: [PATCH 0966/1244] Add flags to SyntheticValDef --- compiler/src/dotty/tools/dotc/ast/tpd.scala | 4 ++-- compiler/src/dotty/tools/dotc/transform/CapturedVars.scala | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index 39e24208e3e0..1334a4f73016 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -206,8 +206,8 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { def ValDef(sym: TermSymbol, rhs: LazyTree = EmptyTree)(using Context): ValDef = ta.assignType(untpd.ValDef(sym.name, TypeTree(sym.info), rhs), sym) - def SyntheticValDef(name: TermName, rhs: Tree)(using Context): ValDef = - ValDef(newSymbol(ctx.owner, name, Synthetic, rhs.tpe.widen, coord = rhs.span), rhs) + def SyntheticValDef(name: TermName, rhs: Tree, flags: FlagSet = EmptyFlags)(using Context): ValDef = + ValDef(newSymbol(ctx.owner, name, Synthetic | flags, rhs.tpe.widen, coord = rhs.span), rhs) def DefDef(sym: TermSymbol, paramss: List[List[Symbol]], resultType: Type, rhs: Tree)(using Context): DefDef = diff --git a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala index 876bffea7348..6e04ac1f2e96 100644 --- a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala +++ b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala @@ -159,9 +159,7 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer: case TypeApply(Select(qual@Select(_, nme.elem), nme.asInstanceOf_), _) => recur(qual) case Select(_, nme.elem) if refInfo.boxedRefClasses.contains(lhs.symbol.maybeOwner) => - val tempDef = transformFollowing { - ValDef(newSymbol(ctx.owner, TempResultName.fresh(), Mutable | Synthetic, tree.rhs.tpe.widen, coord = tree.rhs.span), tree.rhs) - } + val tempDef = transformFollowing(SyntheticValDef(TempResultName.fresh(), tree.rhs, flags = Mutable)) val update = cpy.Assign(tree)(lhs, ref(tempDef.symbol)) def reset = cpy.Assign(tree)(ref(tempDef.symbol), nullLiteral.cast(tempDef.symbol.info)) val res = if refInfo.objectRefClasses(lhs.symbol.maybeOwner) && !absolved then reset else unitLiteral From 9eac14a0262197d3780ba7ba485497f56bcd810c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 11 Jan 2022 09:53:41 +0100 Subject: [PATCH 0967/1244] Bump jackson version to 2.12.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6ed36cb681ad..23ee5b7b0427 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ import sbt._ * to ensure the same version of the dependency is used in all projects */ object Dependencies { - private val jacksonVersion = "2.9.8" + private val jacksonVersion = "2.12.1" val `jackson-databind` = "com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion val `jackson-dataformat-yaml` = From aaa2a754f0a52390bd087bd83bce1fafd1d4becd Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 2 Dec 2021 13:53:00 +0000 Subject: [PATCH 0968/1244] repl: Dedup setup & warning between initialCtx & :settings --- .../src/dotty/tools/repl/ReplDriver.scala | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala index ceeceb12f669..2687a2e70579 100644 --- a/compiler/src/dotty/tools/repl/ReplDriver.scala +++ b/compiler/src/dotty/tools/repl/ReplDriver.scala @@ -74,11 +74,17 @@ class ReplDriver(settings: Array[String], val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions | Mode.Interactive) rootCtx.setSetting(rootCtx.settings.YcookComments, true) rootCtx.setSetting(rootCtx.settings.YreadComments, true) + setupRootCtx(settings, rootCtx) + } + + private def setupRootCtx(settings: Array[String], rootCtx: Context) = { setup(settings, rootCtx) match - case Some((files, ictx)) => + case Some((files, ictx)) => inContext(ictx) { shouldStart = true - ictx.base.initialize()(using ictx) + if files.nonEmpty then out.println(i"Ignoring spurious arguments: $files%, %") + ictx.base.initialize() ictx + } case None => shouldStart = false rootCtx @@ -423,14 +429,7 @@ class ReplDriver(settings: Array[String], out.println(s"${s.name} = ${if s.value == "" then "\"\"" else s.value}") state case _ => - setup(tokenize(arg).toArray, rootCtx) match - case Some((files, ictx)) => - inContext(ictx) { - if files.nonEmpty then out.println(i"Ignoring spurious arguments: $files%, %") - ictx.base.initialize()(using ictx) - rootCtx = ictx - } - case _ => + rootCtx = setupRootCtx(tokenize(arg).toArray, rootCtx) state.copy(context = rootCtx) case Quit => From 8ddd885e77c1ead41d76f7c6c17805a2e7edcd1e Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 2 Dec 2021 14:12:11 +0000 Subject: [PATCH 0969/1244] repl: Add compiler options to :reset --- compiler/src/dotty/tools/repl/ParseResult.scala | 7 ++++--- compiler/src/dotty/tools/repl/ReplDriver.scala | 12 ++++++------ compiler/test-resources/repl/reset-command | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 compiler/test-resources/repl/reset-command diff --git a/compiler/src/dotty/tools/repl/ParseResult.scala b/compiler/src/dotty/tools/repl/ParseResult.scala index bc0305c17944..5d414ecf9b34 100644 --- a/compiler/src/dotty/tools/repl/ParseResult.scala +++ b/compiler/src/dotty/tools/repl/ParseResult.scala @@ -88,7 +88,8 @@ object Settings { /** Reset the session to the initial state from when the repl program was * started */ -case object Reset extends Command { +case class Reset(arg: String) extends Command +object Reset { val command: String = ":reset" } @@ -110,7 +111,7 @@ case object Help extends Command { |:type evaluate the type of the given expression |:doc print the documentation for the given expression |:imports show import history - |:reset reset the repl to its initial state, forgetting all session entries + |:reset [options] reset the repl to its initial state, forgetting all session entries |:settings update compiler options, if possible """.stripMargin } @@ -130,7 +131,7 @@ object ParseResult { Quit.command -> (_ => Quit), Quit.alias -> (_ => Quit), Help.command -> (_ => Help), - Reset.command -> (_ => Reset), + Reset.command -> (arg => Reset(arg)), Imports.command -> (_ => Imports), Load.command -> (arg => Load(arg)), TypeOf.command -> (arg => TypeOf(arg)), diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala index 2687a2e70579..eda69b7c1ed7 100644 --- a/compiler/src/dotty/tools/repl/ReplDriver.scala +++ b/compiler/src/dotty/tools/repl/ReplDriver.scala @@ -70,11 +70,11 @@ class ReplDriver(settings: Array[String], override def sourcesRequired: Boolean = false /** Create a fresh and initialized context with IDE mode enabled */ - private def initialCtx = { + private def initialCtx(settings: List[String]) = { val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions | Mode.Interactive) rootCtx.setSetting(rootCtx.settings.YcookComments, true) rootCtx.setSetting(rootCtx.settings.YreadComments, true) - setupRootCtx(settings, rootCtx) + setupRootCtx(this.settings ++ settings, rootCtx) } private def setupRootCtx(settings: Array[String], rootCtx: Context) = { @@ -99,8 +99,8 @@ class ReplDriver(settings: Array[String], * such, when the user enters `:reset` this method should be called to reset * everything properly */ - protected def resetToInitial(): Unit = { - rootCtx = initialCtx + protected def resetToInitial(settings: List[String] = Nil): Unit = { + rootCtx = initialCtx(settings) if (rootCtx.settings.outputDir.isDefault(using rootCtx)) rootCtx = rootCtx.fresh .setSetting(rootCtx.settings.outputDir, new VirtualDirectory("")) @@ -378,8 +378,8 @@ class ReplDriver(settings: Array[String], out.println(Help.text) state - case Reset => - resetToInitial() + case Reset(arg) => + resetToInitial(tokenize(arg)) initialState case Imports => diff --git a/compiler/test-resources/repl/reset-command b/compiler/test-resources/repl/reset-command new file mode 100644 index 000000000000..1f10820534b2 --- /dev/null +++ b/compiler/test-resources/repl/reset-command @@ -0,0 +1,15 @@ +scala> def f(thread: Thread) = thread.stop() +there were 1 deprecation warning(s); re-run with -deprecation for details +def f(thread: Thread): Unit + +scala>:reset -deprecation + +scala> def f(thread: Thread) = thread.stop() +1 warning found +-- Deprecation Warning: -------------------------------------------------------- +1 | def f(thread: Thread) = thread.stop() + | ^^^^^^^^^^^ + |method stop in class Thread is deprecated since : see corresponding Javadoc for more information. +def f(thread: Thread): Unit + +scala> From e21b55e3d9830513e7024b689ede740dbbea6dca Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 19 Dec 2021 15:52:34 +0000 Subject: [PATCH 0970/1244] tests: Move toolArgsFor out of PatmatExhaustivityTest --- .../dotty/tools/dotc/CompilationUnit.scala | 2 +- .../transform/PatmatExhaustivityTest.scala | 21 +----------- compiler/test/dotty/tools/utils.scala | 33 +++++++++++++++---- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/CompilationUnit.scala b/compiler/src/dotty/tools/dotc/CompilationUnit.scala index 9b12cc9ade94..3c73b1126889 100644 --- a/compiler/src/dotty/tools/dotc/CompilationUnit.scala +++ b/compiler/src/dotty/tools/dotc/CompilationUnit.scala @@ -122,7 +122,7 @@ object CompilationUnit { NoSource } else if (!source.file.exists) { - report.error(s"not found: ${source.file.path}") + report.error(s"source file not found: ${source.file.path}") NoSource } else source diff --git a/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala b/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala index 7d9c77a439bf..6a9f0c74a56f 100644 --- a/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala +++ b/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala @@ -10,9 +10,8 @@ import reporting.TestReporter import dotty.tools.io.Directory import java.io._ -import java.nio.file.{Files, Path => JPath} +import java.nio.file.{Path => JPath} -import scala.io.Source._ import org.junit.Test class PatmatExhaustivityTest { @@ -79,22 +78,4 @@ class PatmatExhaustivityTest { println(msg) } - - // inspect given files for tool args of the form `tool: args` - // if args string ends in close comment, drop the `*` `/` - // if split, parse the args string as command line. - // (from scala.tools.partest.nest.Runner#toolArgsFor) - private def toolArgsFor(files: List[JPath]): List[String] = { - import scala.jdk.OptionConverters._ - import config.CommandLineParser.tokenize - files.flatMap { path => - val tag = "scalac:" - val endc = "*" + "/" // be forgiving of /* scalac: ... */ - def stripped(s: String) = s.substring(s.indexOf(tag) + tag.length).stripSuffix(endc) - val args = scala.util.Using.resource(Files.lines(path, scala.io.Codec.UTF8.charSet))( - _.limit(10).filter(_.contains(tag)).map(stripped).findAny.toScala - ) - args.map(tokenize).getOrElse(Nil) - } - } } diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala index 84d295ea0046..868d883b5862 100644 --- a/compiler/test/dotty/tools/utils.scala +++ b/compiler/test/dotty/tools/utils.scala @@ -3,8 +3,9 @@ package tools import java.io.File import java.nio.charset.StandardCharsets.UTF_8 +import java.nio.file.{Files, Path => JPath} -import scala.io.Source +import scala.io.{Codec, Source} import scala.reflect.ClassTag import scala.util.Using.resource import scala.util.chaining.given @@ -25,11 +26,10 @@ extension (f: File) def absPath = extension (str: String) def dropExtension = str.reverse.dropWhile(_ != '.').drop(1).reverse -private def withFile[T](file: File)(action: Source => T): T = - resource(Source.fromFile(file, UTF_8.name))(action) - -def readLines(f: File): List[String] = withFile(f)(_.getLines.toList) -def readFile(f: File): String = withFile(f)(_.mkString) +private +def withFile[T](file: File)(action: Source => T)(using Codec): T = resource(Source.fromFile(file))(action) +def readLines(f: File)(using codec: Codec = Codec.UTF8): List[String] = withFile(f)(_.getLines.toList) +def readFile(f: File)(using codec: Codec = Codec.UTF8): String = withFile(f)(_.mkString) private object Unthrown extends ControlThrowable @@ -43,3 +43,24 @@ def assertThrows[T <: Throwable: ClassTag](p: T => Boolean)(body: => Any): Unit case failed: T => throw AssertionError(s"Exception failed check: $failed").tap(_.addSuppressed(failed)) case NonFatal(other) => throw AssertionError(s"Wrong exception: expected ${implicitly[ClassTag[T]]} but was ${other.getClass.getName}").tap(_.addSuppressed(other)) end assertThrows + +def toolArgsFor(files: List[JPath])(using codec: Codec = Codec.UTF8): List[String] = + files.flatMap(path => toolArgsParse(readLines(path.toFile))) + +// Inspect the first 10 of the given lines for compiler options of the form +// `// scalac: args`, `/* scalac: args`, ` * scalac: args`. +// If args string ends in close comment, drop the `*` `/`. +// If split, parse the args string as a command line. +// (from scala.tools.partest.nest.Runner#toolArgsFor) +def toolArgsParse(lines: List[String]): List[String] = { + val tag = "scalac:" + val endc = "*" + "/" // be forgiving of /* scalac: ... */ + def stripped(s: String) = s.substring(s.indexOf(tag) + tag.length).stripSuffix(endc) + val args = lines.to(LazyList).take(10).filter { s => + s.contains("// " + tag) + || s.contains("/* " + tag) + || s.contains(" * " + tag) + // but avoid picking up comments like "% scalac ./a.scala" and "$ scalac a.scala" + }.map(stripped).headOption + args.map(dotc.config.CommandLineParser.tokenize).getOrElse(Nil) +} From 1189903b923fb211339cb5e7882c7d9b46c2ece0 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sun, 19 Dec 2021 21:52:58 +0000 Subject: [PATCH 0971/1244] tests: Bring tool args reading to REPL tests And, by doing so, reinstate the repl/i13208 script. --- .../test-resources/{pending => }/repl/i13208.scala | 6 ++++-- compiler/test/dotty/tools/repl/ReplTest.scala | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) rename compiler/test-resources/{pending => }/repl/i13208.scala (72%) diff --git a/compiler/test-resources/pending/repl/i13208.scala b/compiler/test-resources/repl/i13208.scala similarity index 72% rename from compiler/test-resources/pending/repl/i13208.scala rename to compiler/test-resources/repl/i13208.scala index d56e997c406e..6401d23bcfe4 100644 --- a/compiler/test-resources/pending/repl/i13208.scala +++ b/compiler/test-resources/repl/i13208.scala @@ -1,11 +1,13 @@ // scalac: -source:future -deprecation scala> type M[X] = X match { case Int => String case _ => Int } --- Deprecation Warning: +1 warning found +-- Deprecation Warning: -------------------------------------------------------- 1 | type M[X] = X match { case Int => String case _ => Int } | ^ | `_` is deprecated for wildcard arguments of types: use `?` instead scala> type N[X] = X match { case List[_] => Int } --- Deprecation Warning: +1 warning found +-- Deprecation Warning: -------------------------------------------------------- 1 | type N[X] = X match { case List[_] => Int } | ^ | `_` is deprecated for wildcard arguments of types: use `?` instead diff --git a/compiler/test/dotty/tools/repl/ReplTest.scala b/compiler/test/dotty/tools/repl/ReplTest.scala index 454fe7fb34f8..5bb6298a937b 100644 --- a/compiler/test/dotty/tools/repl/ReplTest.scala +++ b/compiler/test/dotty/tools/repl/ReplTest.scala @@ -64,11 +64,13 @@ extends ReplDriver(options, new PrintStream(out, true, StandardCharsets.UTF_8.na val expectedOutput = lines.flatMap(filterEmpties) val actualOutput = { - resetToInitial() + val opts = toolArgsParse(lines.take(1)) + val (optsLine, inputLines) = if opts.isEmpty then ("", lines) else (lines.head, lines.drop(1)) + resetToInitial(opts) - assert(lines.head.startsWith(prompt), + assert(inputLines.head.startsWith(prompt), s"""Each script must start with the prompt: "$prompt"""") - val inputRes = lines.filter(_.startsWith(prompt)) + val inputRes = inputLines.filter(_.startsWith(prompt)) val buf = new ArrayBuffer[String] inputRes.foldLeft(initialState) { (state, input) => @@ -76,7 +78,7 @@ extends ReplDriver(options, new PrintStream(out, true, StandardCharsets.UTF_8.na out.linesIterator.foreach(buf.append) nstate } - buf.toList.flatMap(filterEmpties) + (optsLine :: buf.toList).flatMap(filterEmpties) } if !FileDiff.matches(actualOutput, expectedOutput) then From 2ae5de562ebb028dd4ae0f2f563b8b1e9c3802ac Mon Sep 17 00:00:00 2001 From: Stephane MICHELOUD Date: Thu, 30 Dec 2021 23:04:42 +0100 Subject: [PATCH 0972/1244] more fixes in docs --- .../implicit-conversions-spec.md | 6 +- .../changed-features/implicit-conversions.md | 7 +- .../changed-features/implicit-resolution.md | 2 +- .../changed-features/interpolation-escapes.md | 2 +- .../changed-features/main-functions.md | 22 +- .../changed-features/pattern-bindings.md | 5 +- .../changed-features/structural-types.md | 19 +- .../contextual/context-functions-spec.md | 3 +- docs/docs/reference/contextual/givens.md | 4 +- .../dropped-features/delayed-init.md | 6 +- .../dropped-features/package-objects.md | 2 +- .../reference/dropped-features/symlits.md | 18 +- docs/docs/reference/experimental/canthrow.md | 50 +- .../experimental/erased-defs-spec.md | 3 +- .../reference/experimental/erased-defs.md | 4 +- .../experimental/named-typeargs-spec.md | 2 + .../experimental/numeric-literals.md | 27 +- docs/docs/reference/language-versions.md | 18 +- .../reference/new-types/intersection-types.md | 2 +- .../reference/new-types/type-lambdas-spec.md | 1 - .../other-new-features/experimental-defs.md | 518 +++++++++--------- .../other-new-features/explicit-nulls.md | 18 +- .../reference/other-new-features/export.md | 2 +- .../other-new-features/kind-polymorphism.md | 4 +- .../reference/other-new-features/matchable.md | 21 +- .../other-new-features/opaques-details.md | 14 +- .../other-new-features/open-classes.md | 12 +- .../other-new-features/targetName.md | 20 +- .../threadUnsafe-annotation.md | 4 +- .../other-new-features/transparent-traits.md | 12 +- .../reference/other-new-features/type-test.md | 12 +- docs/docs/reference/soft-modifier.md | 4 +- docs/docs/reference/syntax.md | 3 +- 33 files changed, 431 insertions(+), 416 deletions(-) diff --git a/docs/docs/reference/changed-features/implicit-conversions-spec.md b/docs/docs/reference/changed-features/implicit-conversions-spec.md index 47cfd941bf02..b4ab97355036 100644 --- a/docs/docs/reference/changed-features/implicit-conversions-spec.md +++ b/docs/docs/reference/changed-features/implicit-conversions-spec.md @@ -12,7 +12,7 @@ defined by either: - An `implicit def` which has type `S => T` or `(=> S) => T` - An implicit value which has type `Conversion[S, T]` -The standard library defines an abstract class `Conversion`: +The standard library defines an abstract class [`Conversion`](https://scala-lang.org/api/3.x/scala/Conversion.html): ```scala package scala @@ -86,7 +86,7 @@ Note that implicit conversions are also affected by the [changes to implicit res ## Motivation for the changes -The introduction of [`scala.Conversion`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/Conversion.scala) +The introduction of [`scala.Conversion`](https://scala-lang.org/api/3.x/scala/Conversion.html) in Scala 3 and the decision to restrict implicit values of this type to be considered as potential views comes from the desire to remove surprising behavior from the language: @@ -102,7 +102,7 @@ This snippet contains a type error. The right-hand side of `val x` does not conform to type `String`. In Scala 2, the compiler will use `m` as an implicit conversion from `Int` to `String`, whereas Scala 3 will report a type error, because `Map` isn't an instance of -`Conversion`. +[`Conversion`](https://scala-lang.org/api/3.x/scala/Conversion.html). ## Migration path diff --git a/docs/docs/reference/changed-features/implicit-conversions.md b/docs/docs/reference/changed-features/implicit-conversions.md index 2ee2583d3cd8..69737d5b6bf9 100644 --- a/docs/docs/reference/changed-features/implicit-conversions.md +++ b/docs/docs/reference/changed-features/implicit-conversions.md @@ -28,9 +28,10 @@ Defining an implicit conversion will emit a warning unless the import ## Examples -The first example is taken from `scala.Predef`. Thanks to this -implicit conversion, it is possible to pass a `scala.Int` to a Java -method that expects a `java.lang.Integer` +The first example is taken from [`scala.Predef`](https://scala-lang.org/api/3.x/scala/Predef$.html). +Thanks to this implicit conversion, it is possible to pass a +[`scala.Int`](https://scala-lang.org/api/3.x/scala/Int.html) +to a Java method that expects a `java.lang.Integer` ```scala import scala.language.implicitConversions diff --git a/docs/docs/reference/changed-features/implicit-resolution.md b/docs/docs/reference/changed-features/implicit-resolution.md index 435104a12024..cf8af361b787 100644 --- a/docs/docs/reference/changed-features/implicit-resolution.md +++ b/docs/docs/reference/changed-features/implicit-resolution.md @@ -110,7 +110,7 @@ which means that the alternative `c` would be chosen as solution! Scala 2's somewhat puzzling behavior with respect to ambiguity has been exploited to implement the analogue of a "negated" search in implicit resolution, where a query `Q1` fails if some other query `Q2` succeeds and `Q1` succeeds if `Q2` fails. With the new cleaned up behavior -these techniques no longer work. But there is now a new special type `scala.util.NotGiven` +these techniques no longer work. But there is now a new special type [`scala.util.NotGiven`](https://scala-lang.org/api/3.x/scala/util/NotGiven.html) which implements negation directly. For any query type `Q`, `NotGiven[Q]` succeeds if and only if the implicit search for `Q` fails. diff --git a/docs/docs/reference/changed-features/interpolation-escapes.md b/docs/docs/reference/changed-features/interpolation-escapes.md index d5b3a82d94cc..6c9afa9d85cb 100644 --- a/docs/docs/reference/changed-features/interpolation-escapes.md +++ b/docs/docs/reference/changed-features/interpolation-escapes.md @@ -4,7 +4,7 @@ title: "Escapes in interpolations" movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/interpolation-escapes.html --- -In Scala 2 there is no straightforward way to represent a single quote character `"` in a single quoted interpolation. A `\` character can't be used for that because interpolators themselves decide how to handle escaping, so the parser doesn't know whether the `"` should be escaped or used as a terminator. +In Scala 2 there is no straightforward way to represent a single quote character `"` in a single quoted interpolation. A `\` character can't be used for that because interpolators themselves decide how to handle escaping, so the parser doesn't know whether the `"` character should be escaped or used as a terminator. In Scala 3, we can use the `$` meta character of interpolations to escape a `"` character. Example: diff --git a/docs/docs/reference/changed-features/main-functions.md b/docs/docs/reference/changed-features/main-functions.md index f6f6067204a3..7485dc942d99 100644 --- a/docs/docs/reference/changed-features/main-functions.md +++ b/docs/docs/reference/changed-features/main-functions.md @@ -5,7 +5,7 @@ movedTo: https://docs.scala-lang.org/scala3/reference/changed-features/main-func --- Scala 3 offers a new way to define programs that can be invoked from the command line: -A `@main` annotation on a method turns this method into an executable program. +A [`@main`](https://scala-lang.org/api/3.x/scala/main.html) annotation on a method turns this method into an executable program. Example: ```scala @@ -31,13 +31,11 @@ This would generate a main program `happyBirthday` that could be called like thi Happy 23rd birthday, Lisa and Peter ``` -A `@main` annotated method can be written either at the top-level or in a statically accessible object. The name of the program is in each case the name of the method, without any object prefixes. The `@main` method can have an arbitrary number of parameters. -For each parameter type there must be an instance of the `scala.util.CommandLineParser.FromString` type class -that is used to convert an argument string to the required parameter type. -The parameter list of a main method can end in a repeated parameter that then -takes all remaining arguments given on the command line. +A [`@main`](https://scala-lang.org/api/3.x/scala/main.html) annotated method can be written either at the top-level or in a statically accessible object. The name of the program is in each case the name of the method, without any object prefixes. The [`@main`](https://scala-lang.org/api/3.x/scala/main.html) method can have an arbitrary number of parameters. +For each parameter type there must be an instance of the [`scala.util.CommandLineParser.FromString[T]`](https://scala-lang.org/api/3.x/scala/util/CommandLineParser$$FromString.html) type class that is used to convert an argument string to the required parameter type `T`. +The parameter list of a main method can end in a repeated parameter that then takes all remaining arguments given on the command line. -The program implemented from a `@main` method checks that there are enough arguments on +The program implemented from a [`@main`](https://scala-lang.org/api/3.x/scala/main.html) method checks that there are enough arguments on the command line to fill in all parameters, and that argument strings are convertible to the required types. If a check fails, the program is terminated with an error message. @@ -51,11 +49,11 @@ Illegal command line after first argument: more arguments expected Illegal command line: java.lang.NumberFormatException: For input string: "sixty" ``` -The Scala compiler generates a program from a `@main` method `f` as follows: +The Scala compiler generates a program from a [`@main`](https://scala-lang.org/api/3.x/scala/main.html) method `f` as follows: - - It creates a class named `f` in the package where the `@main` method was found + - It creates a class named `f` in the package where the [`@main`](https://scala-lang.org/api/3.x/scala/main.html) method was found - The class has a static method `main` with the usual signature. It takes an `Array[String]` - as argument and returns `Unit`. + as argument and returns [`Unit`](https://scala-lang.org/api/3.x/scala/Unit.html). - The generated `main` method calls method `f` with arguments converted using methods in the [`scala.util.CommandLineParser`](https://scala-lang.org/api/3.x/scala/util/CommandLineParser$.html) object. @@ -77,7 +75,7 @@ final class happyBirthday: **Note**: The `` modifier above expresses that the `main` method is generated as a static method of class `happyBirthDay`. It is not available for user programs in Scala. Regular "static" members are generated in Scala using objects instead. -`@main` methods are the recommended scheme to generate programs that can be invoked from the command line in Scala 3. They replace the previous scheme to write program as objects with a special `App` parent class. In Scala 2, `happyBirthday` could be written also like this: +[`@main`](https://scala-lang.org/api/3.x/scala/main.html) methods are the recommended scheme to generate programs that can be invoked from the command line in Scala 3. They replace the previous scheme to write program as objects with a special `App` parent class. In Scala 2, `happyBirthday` could be written also like this: ```scala object happyBirthday extends App: @@ -85,5 +83,5 @@ object happyBirthday extends App: ... ``` -The previous functionality of `App`, which relied on the "magic" [`DelayedInit`](../dropped-features/delayed-init.md) trait, is no longer available. [`App`](https://scala-lang.org/api/3.x/scala/App.md) still exists in limited form for now, but it does not support command line arguments and will be deprecated in the future. If programs need to cross-build +The previous functionality of [`App`](https://www.scala-lang.org/api/3.x/scala/App.html), which relied on the "magic" [`DelayedInit`](../dropped-features/delayed-init.md) trait, is no longer available. [`App`](https://scala-lang.org/api/3.x/scala/App.html) still exists in limited form for now, but it does not support command line arguments and will be deprecated in the future. If programs need to cross-build between Scala 2 and Scala 3, it is recommended to use an explicit `main` method with an `Array[String]` argument instead. diff --git a/docs/docs/reference/changed-features/pattern-bindings.md b/docs/docs/reference/changed-features/pattern-bindings.md index 978bff2d7d7e..2c8d1c10ceae 100644 --- a/docs/docs/reference/changed-features/pattern-bindings.md +++ b/docs/docs/reference/changed-features/pattern-bindings.md @@ -21,12 +21,11 @@ This code gives a compile-time warning in Scala 3.1 (and also in Scala 3.0 under val pair = (1, true) val (x, y) = pair ``` -Sometimes one wants to decompose data anyway, even though the pattern is refutable. For instance, if at some point one knows that a list `elems` is non-empty one might -want to decompose it like this: +Sometimes one wants to decompose data anyway, even though the pattern is refutable. For instance, if at some point one knows that a list `elems` is non-empty one might want to decompose it like this: ```scala val first :: rest = elems // error ``` -This works in Scala 2. In fact it is a typical use case for Scala 2's rules. But in Scala 3.1 it will give a warning. One can avoid the warning by marking the right-hand side with an `@unchecked` annotation: +This works in Scala 2. In fact it is a typical use case for Scala 2's rules. But in Scala 3.1 it will give a warning. One can avoid the warning by marking the right-hand side with an [`@unchecked`](https://scala-lang.org/api/3.x/scala/unchecked.html) annotation: ```scala val first :: rest = elems: @unchecked // OK ``` diff --git a/docs/docs/reference/changed-features/structural-types.md b/docs/docs/reference/changed-features/structural-types.md index 904525a4655d..cc07487feb4d 100644 --- a/docs/docs/reference/changed-features/structural-types.md +++ b/docs/docs/reference/changed-features/structural-types.md @@ -59,7 +59,7 @@ help from the user. In practice, the connection between a structural type and its underlying generic representation would most likely be done by a database layer, and therefore would not be a concern of the end user. -`Record` extends the marker trait `scala.Selectable` and defines +`Record` extends the marker trait [`scala.Selectable`](https://scala-lang.org/api/3.x/scala/Selectable.html) and defines a method `selectDynamic`, which maps a field name to its value. Selecting a structural type member is done by calling this method. The `person.name` and `person.age` selections are translated by @@ -90,7 +90,7 @@ Structural types can also be accessed using [Java reflection](https://www.oracle def close(): Unit ``` -Here, we define a structural type `Closeable` that defines a `close` method. There are various classes that have `close` methods, we just list `FileInputStream` and `Channel` as two examples. It would be easiest if the two classes shared a common interface that factors out the `close` method. But such factorings are often not possible if different libraries are combined in one application. Yet, we can still have methods that work on +Here, we define a structural type `Closeable` that defines a `close` method. There are various classes that have `close` methods, we just list [`FileInputStream`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/io/FileInputStream.html#%3Cinit%3E(java.io.File)) and [`Channel`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/nio/channels/Channel.html) as two examples. It would be easiest if the two classes shared a common interface that factors out the `close` method. But such factorings are often not possible if different libraries are combined in one application. Yet, we can still have methods that work on all classes with a `close` method by using the `Closeable` type. For instance, ```scala @@ -147,10 +147,9 @@ i3.range The type of `i3` in this example is `Vehicle { val range: Int }`. Hence, `i3.range` is well-formed. Since the base class `Vehicle` does not define a `range` field or method, we need structural dispatch to access the `range` field of the anonymous class that initializes `id3`. Structural dispatch -is implemented by the base trait `reflect.Selectable` of `Vehicle`, which -defines the necessary `selectDynamic` member. +is implemented by the base trait [`reflect.Selectable`](https://scala-lang.org/api/3.x/scala/reflect/Selectable.html) of `Vehicle`, which defines the necessary `selectDynamic` member. -`Vehicle` could also extend some other subclass of `scala.Selectable` that implements `selectDynamic` and `applyDynamic` differently. But if it does not extend a `Selectable` at all, the code would no longer typecheck: +`Vehicle` could also extend some other subclass of [`scala.Selectable`](https://scala-lang.org/api/3.x/scala/Selectable.html) that implements `selectDynamic` and `applyDynamic` differently. But if it does not extend a `Selectable` at all, the code would no longer typecheck: ```scala trait Vehicle: @@ -168,11 +167,11 @@ adding any refinements. Hence, `i3` now has just type `Vehicle` and the selectio Note that in Scala 2 all local and anonymous classes could produce values with refined types. But members defined by such refinements could be selected only with the language import -`reflectiveCalls`. +[`reflectiveCalls`](https://scala-lang.org/api/3.x/scala/languageFeature$$reflectiveCalls$.html). ## Relation with `scala.Dynamic` -There are clearly some connections with `scala.Dynamic` here, since +There are clearly some connections with [`scala.Dynamic`](https://scala-lang.org/api/3.x/scala/Dynamic.html) here, since both select members programmatically. But there are also some differences. @@ -180,13 +179,13 @@ differences. is, as long as the correspondence of the structural type with the underlying value is as stated. -- `Dynamic` is just a marker trait, which gives more leeway where and +- [`Dynamic`](https://scala-lang.org/api/3.x/scala/Dynamic.html) is just a marker trait, which gives more leeway where and how to define reflective access operations. By contrast `Selectable` is a trait which declares the access operations. - Two access operations, `selectDynamic` and `applyDynamic` are shared between both approaches. In `Selectable`, `applyDynamic` also may also take - `java.lang.Class` arguments indicating the method's formal parameter types. - `Dynamic` comes with `updateDynamic`. + [`java.lang.Class`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Class.html) arguments indicating the method's formal parameter types. + [`Dynamic`](https://scala-lang.org/api/3.x/scala/Dynamic.html) comes with `updateDynamic`. [More details](structural-types-spec.md) diff --git a/docs/docs/reference/contextual/context-functions-spec.md b/docs/docs/reference/contextual/context-functions-spec.md index 9e358ecede41..3c61e0e0c6ca 100644 --- a/docs/docs/reference/contextual/context-functions-spec.md +++ b/docs/docs/reference/contextual/context-functions-spec.md @@ -1,7 +1,6 @@ --- layout: doc-page title: "Context Functions - More Details" - movedTo: https://docs.scala-lang.org/scala3/reference/contextual/context-functions-spec.html --- @@ -64,7 +63,7 @@ Context function literals `(x1: T1, ..., xn: Tn) ?=> e` are automatically created for any expression `e` whose expected type is `scala.ContextFunctionN[T1, ..., Tn, R]`, unless `e` is itself a context function literal. This is analogous to the automatic -insertion of `scala.Function0` around expressions in by-name argument position. +insertion of [`scala.Function0`](https://scala-lang.org/api/3.x/scala/Function0.html) around expressions in by-name argument position. Context function types generalize to `N > 22` in the same way that function types do, see [the corresponding documentation](../dropped-features/limit22.md). diff --git a/docs/docs/reference/contextual/givens.md b/docs/docs/reference/contextual/givens.md index caaa1990282b..9b90040c01c3 100644 --- a/docs/docs/reference/contextual/givens.md +++ b/docs/docs/reference/contextual/givens.md @@ -120,9 +120,9 @@ In each case, a pattern-bound given instance consists of `given` and a type `T`. Scala 2's somewhat puzzling behavior with respect to ambiguity has been exploited to implement the analogue of a "negated" search in implicit resolution, where a query Q1 fails if some other query Q2 succeeds and Q1 succeeds if Q2 fails. With the new cleaned up behavior these techniques no longer work. -But the new special type `scala.util.NotGiven` now implements negation directly. +But the new special type [`scala.util.NotGiven`](https://scala-lang.org/api/3.x/scala/util/NotGiven.html) now implements negation directly. -For any query type `Q`, `NotGiven[Q]` succeeds if and only if the implicit +For any query type `Q`, [`NotGiven[Q]`](https://scala-lang.org/api/3.x/scala/util/NotGiven.html) succeeds if and only if the implicit search for `Q` fails, for example: ```scala diff --git a/docs/docs/reference/dropped-features/delayed-init.md b/docs/docs/reference/dropped-features/delayed-init.md index 875ccec5132e..ab48de388569 100644 --- a/docs/docs/reference/dropped-features/delayed-init.md +++ b/docs/docs/reference/dropped-features/delayed-init.md @@ -4,9 +4,11 @@ title: "Dropped: DelayedInit" movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/delayed-init.html --- -The special handling of the `DelayedInit` trait is no longer supported. +The special handling of the [`DelayedInit`](https://scala-lang.org/api/3.x/scala/DelayedInit.html) +trait is no longer supported. -One consequence is that the `App` class, which used `DelayedInit` is +One consequence is that the [`App`](https://scala-lang.org/api/3.x/scala/App.html) class, +which used [`DelayedInit`](https://scala-lang.org/api/3.x/scala/DelayedInit.html) is now partially broken. You can still use `App` as a simple way to set up a main program. Example: ```scala diff --git a/docs/docs/reference/dropped-features/package-objects.md b/docs/docs/reference/dropped-features/package-objects.md index e98c6c787a89..5e58b5479fd8 100644 --- a/docs/docs/reference/dropped-features/package-objects.md +++ b/docs/docs/reference/dropped-features/package-objects.md @@ -11,7 +11,7 @@ package object p { def b = ... } ``` -will be dropped. They are still available in Scala 3.0, but will be deprecated and removed afterwards. +will be dropped. They are still available in Scala 3.0 and 3.1, but will be deprecated and removed afterwards. Package objects are no longer needed since all kinds of definitions can now be written at the top-level. Example: ```scala diff --git a/docs/docs/reference/dropped-features/symlits.md b/docs/docs/reference/dropped-features/symlits.md index 33c3e6ee0c39..cec98030a831 100644 --- a/docs/docs/reference/dropped-features/symlits.md +++ b/docs/docs/reference/dropped-features/symlits.md @@ -6,5 +6,19 @@ movedTo: https://docs.scala-lang.org/scala3/reference/dropped-features/symlits.h Symbol literals are no longer supported. -The `scala.Symbol` class still exists, so a -literal translation of the symbol literal `'xyz` is `Symbol("xyz")`. However, it is recommended to use a plain string literal `"xyz"` instead. (The `Symbol` class will be deprecated and removed in the future). +The [`scala.Symbol`](https://scala-lang.org/api/3.x/scala/Symbol.html) class still exists, so a literal translation of the symbol literal `'xyz` is `Symbol("xyz")`. However, it is recommended to use a plain string literal `"xyz"` instead. (The `Symbol` class will be deprecated and removed in the future). Example: + + +``` +scalac Test.scala +-- Error: Test.scala:1:25 ------------------------------------------------------------------------------------------------ + +1 |@main def test = println('abc) + | ^ + | symbol literal 'abc is no longer supported, + | use a string literal "abc" or an application Symbol("abc") instead, + | or enclose in braces '{abc} if you want a quoted expression. + | For now, you can also `import language.deprecated.symbolLiterals` to accept + | the idiom, but this possibility might no longer be available in the future. +1 error found +``` diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md index 58a9db62b763..b46cd8cc4876 100644 --- a/docs/docs/reference/experimental/canthrow.md +++ b/docs/docs/reference/experimental/canthrow.md @@ -20,7 +20,7 @@ However, exceptions in current Scala and many other languages are not reflected ## The Problem With Java's Checked Exceptions -The main problem with Java's checked exception model is its inflexibility, which is due to lack of polymorphism. Consider for instance the `map` function which is declared on `List[A]` like this: +The main problem with [Java's checked exception model](https://docs.oracle.com/javase/specs/jls/se8/html/jls-11.html#jls-11.2) is its inflexibility, which is due to lack of polymorphism. Consider for instance the `map` function which is declared on `List[A]` like this: ```scala def map[B](f: A => B): List[B] ``` @@ -28,7 +28,7 @@ In the Java model, function `f` is not allowed to throw a checked exception. So ```scala xs.map(x => if x < limit then x * x else throw LimitExceeded()) ``` -The only way around this would be to wrap the checked exception `LimitExceeded` in an unchecked `RuntimeException` that is caught at the callsite and unwrapped again. Something like this: +The only way around this would be to wrap the checked exception `LimitExceeded` in an unchecked [`java.lang.RuntimeException`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/RuntimeException.html) that is caught at the callsite and unwrapped again. Something like this: ```scala try xs.map(x => if x < limit then x * x else throw Wrapper(LimitExceeded())) @@ -38,7 +38,7 @@ Ugh! No wonder checked exceptions in Java are not very popular. ## Monadic Effects -So the dilemma is that exceptions are easy to use only as long as we forgo static type checking. This has caused many people working with Scala to abandon exceptions altogether and to use an error monad like `Either` instead. This can work in many situations but is not without its downsides either. It makes code a lot more complicated and harder to refactor. It means one is quickly confronted with the problem how to work with several monads. In general, dealing with one monad at a time in Scala is straightforward but dealing with several monads together is much less pleasant since monads don't compose. A great number of techniques have been proposed, implemented, and promoted to deal with this, from monad transformers, to free monads, to tagless final. But none of these techniques is universally liked; each introduces a complicated DSL that's hard to understand for non-experts, introduces runtime overheads, and makes debugging difficult. In the end, quite a few developers prefer to work instead with a single "super-monad" like ZIO that has error propagation built in alongside other aspects. This one-size fits all approach can work very nicely, even though (or is it because?) it represents an all-encompassing framework. +So the dilemma is that exceptions are easy to use only as long as we forget static type checking. This has caused many people working with Scala to abandon exceptions altogether and to use an error monad like [`Either`](https://scala-lang.org/api/3.x/scala/util/Either.html) instead. This can work in many situations but is not without its downsides either. It makes code a lot more complicated and harder to refactor. It means one is quickly confronted with the problem how to work with several monads. In general, dealing with one monad at a time in Scala is straightforward but dealing with several monads together is much less pleasant since monads don't compose. A great number of techniques have been proposed, implemented, and promoted to deal with this, from monad transformers, to free monads, to tagless final. But none of these techniques is universally liked; each introduces a complicated DSL that's hard to understand for non-experts, introduces runtime overheads, and makes debugging difficult. In the end, quite a few developers prefer to work instead with a single "super-monad" like [`ZIO`](https://zio.dev/version-1.x/datatypes/core/zio) that has error propagation built in alongside other aspects. This one-size fits all approach can work very nicely, even though (or is it because?) it represents an all-encompassing framework. However, a programming language is not a framework; it has to cater also for those applications that do not fit the framework's use cases. So there's still a strong motivation for getting exception checking right. @@ -53,10 +53,10 @@ This assumes a type `A throws E` to indicate computations of type `A` that can t But there is a way to avoid the ceremony. Instead of concentrating on possible _effects_ such as "this code might throw an exception", concentrate on _capabilities_ such as "this code needs the capability to throw an exception". From a standpoint of expressiveness this is quite similar. But capabilities can be expressed as parameters whereas traditionally effects are expressed as some addition to result values. It turns out that this can make a big difference! -## The CanThrow Capability +## The `CanThrow` Capability In the _effects as capabilities_ model, an effect is expressed as an (implicit) parameter of a certain type. For exceptions we would expect parameters of type -`CanThrow[E]` where `E` stands for the exception that can be thrown. Here is the definition of `CanThrow`: +[`CanThrow[E]`](https://scala-lang.org/api/3.x/scala/CanThrow.html) where `E` stands for the exception that can be thrown. Here is the definition of `CanThrow`: ```scala erased class CanThrow[-E <: Exception] ``` @@ -66,14 +66,14 @@ Now, if the compiler sees a `throw Exc()` construct where `Exc` is a checked exc How can the capability be produced? There are several possibilities: -Most often, the capability is produced by having a using clause `(using CanThrow[Exc])` in some enclosing scope. This roughly corresponds to a `throws` clause -in Java. The analogy is even stronger since alongside `CanThrow` there is also the following type alias defined in the `scala` package: +Most often, the capability is produced by having a using clause `(using CanThrow[Exc])` in some enclosing scope. This roughly corresponds to a [`throws`](https://docs.oracle.com/javase/specs/jls/se7/html/jls-8.html#jls-8.4.6) clause in Java. The analogy is even stronger since alongside [`CanThrow`](https://scala-lang.org/api/3.x/scala/CanThrow.html) there is also the following type alias defined in the [`scala`](https://scala-lang.org/api/3.x/scala.html) package: +```scala +infix type A = Int +``` ```scala infix type $throws[R, +E <: Exception] = CanThrow[E] ?=> R ``` -That is, `R $throws E` is a context function type that takes an implicit `CanThrow[E]` parameter and that returns a value of type `R`. What's more, the compiler -will translate an infix types with `throws` as the operator to `$throws` applications -according to the rules +That is, [`R $throws E`](https://scala-lang.org/api/3.x/scala/runtime.html#$throws-0) is a context function type that takes an implicit `CanThrow[E]` parameter and that returns a value of type `R`. What's more, the compiler will translate an infix types with `throws` as the operator to `$throws` applications according to the rules ``` A throws E --> A $throws E A throws E₁ | ... | Eᵢ --> A $throws E₁ ... $throws Eᵢ @@ -127,7 +127,7 @@ catch ... Note that the right-hand side of the synthesized given is `???` (undefined). This is OK since this given is erased; it will not be executed at runtime. -**Note 1:** The `saferExceptions` feature is designed to work only with checked exceptions. An exception type is _checked_ if it is a subtype of +**Note 1:** The [`saferExceptions`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$experimental$$saferExceptions$.html) feature is designed to work only with checked exceptions. An exception type is _checked_ if it is a subtype of `Exception` but not of `RuntimeException`. The signature of `CanThrow` still admits `RuntimeException`s since `RuntimeException` is a proper subtype of its bound, `Exception`. But no capabilities will be generated for `RuntimeException`s. Furthermore, `throws` clauses also may not refer to `RuntimeException`s. @@ -141,7 +141,7 @@ checked exception type. Constructor patterns such as `Ex(...)` or patterns with are not allowed. The compiler will issue an error if one of these is used to catch a checked exception and `saferExceptions` is enabled. -## An Example +## Example That's it. Let's see it in action in an example. First, add an import ```scala @@ -160,13 +160,15 @@ You'll get this error message: if x < limit then x * x else throw LimitExceeded() ^^^^^^^^^^^^^^^^^^^^^ The capability to throw exception LimitExceeded is missing. +``` The capability can be provided by one of the following: + - Adding a using clause `(using CanThrow[LimitExceeded])` to the definition of the enclosing method - Adding `throws LimitExceeded` clause after the result type of the enclosing method - - Wrapping this piece of code with a `try` block that catches LimitExceeded + - Wrapping this piece of code with a `try` block that catches `LimitExceeded` The following import might fix the problem: - +```scala import unsafeExceptions.canThrowAny ``` As the error message implies, you have to declare that `f` needs the capability to throw a `LimitExceeded` exception. The most concise way to do so is to add a `throws` clause: @@ -205,13 +207,13 @@ So the takeaway is that the effects as capabilities model naturally provides for ## Gradual Typing Via Imports -Another advantage is that the model allows a gradual migration from current unchecked exceptions to safer exceptions. Imagine for a moment that `experimental.saferExceptions` is turned on everywhere. There would be lots of code that breaks since functions have not yet been properly annotated with `throws`. But it's easy to create an escape hatch that lets us ignore the breakages for a while: simply add the import +Another advantage is that the model allows a gradual migration from current unchecked exceptions to safer exceptions. Imagine for a moment that [`experimental.saferExceptions`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$experimental$$saferExceptions$.html) is turned on everywhere. There would be lots of code that breaks since functions have not yet been properly annotated with `throws`. But it's easy to create an escape hatch that lets us ignore the breakages for a while: simply add the import ```scala import scala.unsafeExceptions.canThrowAny ``` -This will provide the `CanThrow` capability for any exception, and thereby allow +This will provide the [`CanThrow`](https://scala-lang.org/api/3.x/scala/CanThrow.html) capability for any exception, and thereby allow all throws and all other calls, no matter what the current state of `throws` declarations is. Here's the -definition of `canThrowAny`: +definition of [`canThrowAny`](https://scala-lang.org/api/3.x/scala/unsafeExceptions$.html#canThrowAny-0): ```scala package scala object unsafeExceptions: @@ -224,7 +226,7 @@ enable more fluid explorations of code without regard for complete exception saf To summarize, the extension for safer exception checking consists of the following elements: - - It adds to the standard library the class `scala.CanThrow`, the type `scala.$throws`, and the `scala.unsafeExceptions` object, as they were described above. + - It adds to the standard library the class `scala.CanThrow`, the type `scala.$throws`, and the [`scala.unsafeExceptions`](https://scala-lang.org/api/3.x/scala/unsafeExceptions$.html) object, as they were described above. - It adds some desugaring rules ro rewrite `throws` types to cascaded `$throws` types. - It augments the type checking of `throw` by _demanding_ a `CanThrow` capability or the thrown exception. - It augments the type checking of `try` by _providing_ `CanThrow` capabilities for every caught exception. @@ -240,7 +242,7 @@ we cannot enforce that since the function argument to `pureMap` can capture arbi capabilities in its free variables without them showing up in its type. One possible way to address this would be to introduce a pure function type (maybe written `A -> B`). Pure functions are not allowed to close over capabilities. Then `pureMap` could be written like this: -``` +```scala def pureMap(f: A -> B): List[B] ``` Another area where the lack of purity requirements shows up is when capabilities escape from bounded scopes. Consider the following function @@ -266,16 +268,14 @@ g() the result will be a `LimitExceeded` exception thrown at the second line where `g` is called. What's missing is that `try` should enforce that the capabilities it generates do not escape as free variables in the result of its body. It makes sense to describe such scoped effects as _ephemeral capabilities_ - they have lifetimes that cannot be extended to delayed code in a lambda. -# Outlook +## Outlook -We are working on a new class of type system that supports ephemeral capabilities by tracking the free variables of values. Once that research matures, it will hopefully be possible to augment the language so that we can enforce the missing properties. +We are working on a new class of type system that supports ephemeral capabilities by tracking the free variables of values. Once that research matures, it will hopefully be possible to augment the Scala language so that we can enforce the missing properties. -And it would have many other applications besides: Exceptions are a special case of _algebraic effects_, which has been a very active research area over the last 20 years and is finding its way into programming languages (e.g. Koka, Eff, Multicore OCaml, Unison). In fact, algebraic effects have been characterized as being equivalent to exceptions with an additional _resume_ operation. The techniques developed here for exceptions can probably be generalized to other classes of algebraic effects. +And it would have many other applications besides: Exceptions are a special case of _algebraic effects_, which has been a very active research area over the last 20 years and is finding its way into programming languages (e.g. [Koka](https://koka-lang.github.io/koka/doc/book.html#why-handlers), [Eff](https://www.eff-lang.org/learn/), [Multicore OCaml](https://discuss.ocaml.org/t/multicore-ocaml-september-2021-effect-handlers-will-be-in-ocaml-5-0/8554), [Unison](https://www.unisonweb.org/docs/language-reference/#abilities-and-ability-handlers)). In fact, algebraic effects have been characterized as being equivalent to exceptions with an additional _resume_ operation. The techniques developed here for exceptions can probably be generalized to other classes of algebraic effects. But even without these additional mechanisms, exception checking is already useful as it is. It gives a clear path forward to make code that uses exceptions safer, better documented, and easier to refactor. The only loophole arises for scoped capabilities - here we have to verify manually that these capabilities do not escape. Specifically, a `try` always has to be placed in the same computation stage as the throws that it enables. Put another way: If the status quo is 0% static checking since 100% is too painful, then an alternative that gives you 95% static checking with great ergonomics looks like a win. And we might still get to 100% in the future. -For more info, see also our [paper at the ACM Scala Symposium 2021](resources/safer-exceptions.pdf). - - +For more info, see also our [paper at the ACM Scala Symposium 2021](https://infoscience.epfl.ch/record/290885). diff --git a/docs/docs/reference/experimental/erased-defs-spec.md b/docs/docs/reference/experimental/erased-defs-spec.md index dc7922ddb10f..7ca815878b55 100644 --- a/docs/docs/reference/experimental/erased-defs-spec.md +++ b/docs/docs/reference/experimental/erased-defs-spec.md @@ -1,7 +1,6 @@ --- layout: doc-page -title: "Erased Definitions: More Details" - +title: "Erased Definitions - More Details" movedTo: https://docs.scala-lang.org/scala3/reference/experimental/erased-defs-spec.html --- diff --git a/docs/docs/reference/experimental/erased-defs.md b/docs/docs/reference/experimental/erased-defs.md index 4eb02b7b1de1..d8562d20b420 100644 --- a/docs/docs/reference/experimental/erased-defs.md +++ b/docs/docs/reference/experimental/erased-defs.md @@ -5,12 +5,12 @@ movedTo: https://docs.scala-lang.org/scala3/reference/experimental/erased-defs.h --- `erased` is a modifier that expresses that some definition or expression is erased by the compiler instead of being represented in the compiled output. It is not yet part of the Scala language standard. To enable `erased`, turn on the language feature -`experimental.erasedDefinitions`. This can be done with a language import +[`experimental.erasedDefinitions`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$experimental$$erasedDefinitions$.html). This can be done with a language import ```scala import scala.language.experimental.erasedDefinitions ``` or by setting the command line option `-language:experimental.erasedDefinitions`. -Erased definitions must be in an experimental scope (see [../other-new-features/experimental-defs.md]). +Erased definitions must be in an experimental scope (see [Experimental definitions](../other-new-features/experimental-defs.md)). ## Why erased terms? diff --git a/docs/docs/reference/experimental/named-typeargs-spec.md b/docs/docs/reference/experimental/named-typeargs-spec.md index e12743fe4656..7bf5c2f43ccf 100644 --- a/docs/docs/reference/experimental/named-typeargs-spec.md +++ b/docs/docs/reference/experimental/named-typeargs-spec.md @@ -4,6 +4,8 @@ title: "Named Type Arguments - More Details" movedTo: https://docs.scala-lang.org/scala3/reference/experimental/named-typeargs-spec.html --- +In this section we give more details about the [named type arguments](named-typeargs.md) (*experimental*). + ## Syntax The addition to the grammar is: diff --git a/docs/docs/reference/experimental/numeric-literals.md b/docs/docs/reference/experimental/numeric-literals.md index 40383787a2d0..56684d2722d5 100644 --- a/docs/docs/reference/experimental/numeric-literals.md +++ b/docs/docs/reference/experimental/numeric-literals.md @@ -24,7 +24,7 @@ val z: BigDecimal = 110_222_799_799.99 The syntax of numeric literals is the same as before, except there are no pre-set limits how large they can be. -### Meaning of Numeric Literals +## Meaning of Numeric Literals The meaning of a numeric literal is determined as follows: @@ -37,7 +37,7 @@ In each of these cases the conversion to a number is exactly as in Scala 2 or in 1. If the expected type is `Int`, `Long`, `Float`, or `Double`, the literal is treated as a standard literal of that type. 2. If the expected type is a fully defined type `T` that has a given instance of type - `scala.util.FromDigits[T]`, the literal is converted to a value of type `T` by passing it as an argument to + [`scala.util.FromDigits[T]`](https://scala-lang.org/api/3.x/scala/util/FromDigits.html), the literal is converted to a value of type `T` by passing it as an argument to the `fromDigits` method of that instance (more details below). 3. Otherwise, the literal is treated as a `Double` literal (if it has a decimal point or an exponent), or as an `Int` literal (if not). (This last possibility is again as in Scala 2 or Java.) @@ -55,9 +55,7 @@ val y: BigInt = 0x123_abc_789_def_345_678_901 val z: BigDecimal = 111222333444.55 ``` -are legal by rule (2), since both `BigInt` and `BigDecimal` have `FromDigits` instances -(which implement the `FromDigits` subclasses `FromDigits.WithRadix` and `FromDigits.Decimal`, respectively). -On the other hand, +are legal by rule (2), since both `BigInt` and `BigDecimal` have [`FromDigits`](https://scala-lang.org/api/3.x/scala/util/FromDigits.html) instances (which implement the `FromDigits` subclasses [`FromDigits.WithRadix`](https://scala-lang.org/api/3.x/scala/util/FromDigits$$WithRadix.html) and [`FromDigits.Decimal`](https://scala-lang.org/api/3.x/scala/util/FromDigits$$Decimal.html), respectively). On the other hand, ```scala val x = -10_000_000_000 @@ -65,11 +63,10 @@ val x = -10_000_000_000 gives a type error, since without an expected type `-10_000_000_000` is treated by rule (3) as an `Int` literal, but it is too large for that type. -### The FromDigits Trait +## The `FromDigits` Trait To allow numeric literals, a type simply has to define a `given` instance of the -`scala.util.FromDigits` type class, or one of its subclasses. `FromDigits` is defined -as follows: +[`scala.util.FromDigits`](https://scala-lang.org/api/3.x/scala/util/FromDigits.html) type class, or one of its subclasses. `FromDigits` is defined as follows: ```scala trait FromDigits[T]: @@ -82,9 +79,7 @@ The `digits` string consists of digits between `0` and `9`, possibly preceded by sign ("+" or "-"). Number separator characters `_` are filtered out before the string is passed to `fromDigits`. -The companion object `FromDigits` also defines subclasses of `FromDigits` for -whole numbers with a given radix, for numbers with a decimal point, and for -numbers that can have both a decimal point and an exponent: +The companion object [`FromDigits`](https://scala-lang.org/api/3.x/scala/util/FromDigits$.html) also defines subclasses of `FromDigits` for whole numbers with a given radix, for numbers with a decimal point, and for numbers that can have both a decimal point and an exponent: ```scala object FromDigits: @@ -112,10 +107,10 @@ A user-defined number type can implement one of those, which signals to the comp that hexadecimal numbers, decimal points, or exponents are also accepted in literals for this type. -### Error Handling +## Error Handling `FromDigits` implementations can signal errors by throwing exceptions of some subtype -of `FromDigitsException`. `FromDigitsException` is defined with three subclasses in the +of [`FromDigitsException`](https://scala-lang.org/api/3.x/scala/util/FromDigits$$FromDigitsException.html). `FromDigitsException` is defined with three subclasses in the `FromDigits` object as follows: ```scala @@ -126,7 +121,7 @@ class NumberTooSmall (msg: String = "number too small") extends FromDigi class MalformedNumber(msg: String = "malformed number literal") extends FromDigitsException(msg) ``` -### Example +## Example As a fully worked out example, here is an implementation of a new numeric class, `BigFloat`, that accepts numeric literals. `BigFloat` is defined in terms of a `BigInt` mantissa and an `Int` exponent: @@ -183,7 +178,7 @@ assumed that only valid arguments are passed. For calls coming from the compiler that assumption is valid, since the compiler will first check whether a numeric literal has the correct format before it gets passed on to a conversion method. -### Compile-Time Errors +## Compile-Time Errors With the setup of the previous section, a literal like @@ -197,7 +192,7 @@ would be expanded by the compiler to BigFloat.FromDigits.fromDigits("1e100000000000") ``` -Evaluating this expression throws a `NumberTooLarge` exception at run time. We would like it to +Evaluating this expression throws a [`NumberTooLarge`](https://scala-lang.org/api/3.x/scala/util/FromDigits$$NumberTooLarge.html) exception at run time. We would like it to produce a compile-time error instead. We can achieve this by tweaking the `BigFloat` class with a small dose of metaprogramming. The idea is to turn the `fromDigits` method into a macro, i.e. make it an inline method with a splice as right-hand side. diff --git a/docs/docs/reference/language-versions.md b/docs/docs/reference/language-versions.md index 67659d1fe109..ef31ccc28707 100644 --- a/docs/docs/reference/language-versions.md +++ b/docs/docs/reference/language-versions.md @@ -4,25 +4,25 @@ title: "Language Versions" movedTo: https://docs.scala-lang.org/scala3/reference/language-versions.html --- -The default Scala language version currently supported by the Dotty compiler is `3.0`. There are also other language versions that can be specified instead: +The default Scala language version currently supported by the Dotty compiler is [`3.0`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$3/0$.html). There are also other language versions that can be specified instead: -- `3.0-migration`: Same as `3.0` but with a Scala 2 compatibility mode that helps moving Scala 2.13 sources over to Scala 3. In particular, it +- [`3.0-migration`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$3/0-migration$.html): Same as `3.0` but with a Scala 2 compatibility mode that helps moving Scala 2.13 sources over to Scala 3. In particular, it - flags some Scala 2 constructs that are disallowed in Scala 3 as migration warnings instead of hard errors, - changes some rules to be more lenient and backwards compatible with Scala 2.13 - gives some additional warnings where the semantics has changed between Scala 2.13 and 3.0 - in conjunction with `-rewrite`, offer code rewrites from Scala 2.13 to 3.0. -- `future`: A preview of changes introduced in the next versions after 3.0. In the doc pages here we refer to the language version with these changes as `3.1`, but it might be that some of these changes will be rolled out in later `3.x` versions. +- [`future`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$future$.html): A preview of changes introduced in the next versions after 3.0. In the doc pages here we refer to the language version with these changes as `3.1`, but it might be that some of these changes will be rolled out in later `3.x` versions. -Some Scala-2 specific idioms will be dropped in this version. The feature set supported by this version will be refined over time as we approach its release. +Some Scala 2 specific idioms will be dropped in this version. The feature set supported by this version will be refined over time as we approach its release. -- `future-migration`: Same as `future` but with additional helpers to migrate from `3.0`. Similarly to the helpers available under `3.0-migration`, these include migration warnings and optional rewrites. +- [`future-migration`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$future-migration$.html): Same as `future` but with additional helpers to migrate from `3.0`. Similarly to the helpers available under `3.0-migration`, these include migration warnings and optional rewrites. -There are two ways to specify a language version. +There are two ways to specify a language version : -- With a `-source` command line setting, e.g. `-source 3.0-migration`. -- With a `scala.language` import at the top of a source file, e.g: +- with a `-source` command line setting, e.g. `-source 3.0-migration`. +- with a `scala.language` import at the top of a source file, e.g: ```scala package p @@ -32,3 +32,5 @@ class C { ... } ``` Language imports supersede command-line settings in the source files where they are specified. Only one language import specifying a source version is allowed in a source file, and it must come before any definitions in that file. + +**Note**: The [Scala 3 Migration Guide](https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html) gives further information to help the Scala programmer moving from Scala 2.13 to Scala 3. diff --git a/docs/docs/reference/new-types/intersection-types.md b/docs/docs/reference/new-types/intersection-types.md index 1854ce847896..d498e664d150 100644 --- a/docs/docs/reference/new-types/intersection-types.md +++ b/docs/docs/reference/new-types/intersection-types.md @@ -1,6 +1,6 @@ --- layout: doc-page -title: Intersection Types +title: "Intersection Types" movedTo: https://docs.scala-lang.org/scala3/reference/new-types/intersection-types.html --- diff --git a/docs/docs/reference/new-types/type-lambdas-spec.md b/docs/docs/reference/new-types/type-lambdas-spec.md index 09fb9c76d6cf..5c791ba40272 100644 --- a/docs/docs/reference/new-types/type-lambdas-spec.md +++ b/docs/docs/reference/new-types/type-lambdas-spec.md @@ -114,4 +114,3 @@ The body of a type lambda can again be a type lambda. Example: type TL = [X] =>> [Y] =>> (X, Y) ``` Currently, no special provision is made to infer type arguments to such curried type lambdas. This is left for future work. - diff --git a/docs/docs/reference/other-new-features/experimental-defs.md b/docs/docs/reference/other-new-features/experimental-defs.md index a5c0bff378cd..ef9eca1ea7f5 100644 --- a/docs/docs/reference/other-new-features/experimental-defs.md +++ b/docs/docs/reference/other-new-features/experimental-defs.md @@ -1,273 +1,281 @@ --- layout: doc-page -title: "Experimental definitions" +title: "Experimental Definitions" movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/experimental-defs.html --- - -## Experimental definitions - -The `@experimental` annotation allows the definition of an API that is not guaranteed backward binary or source compatibility. +The [`@experimental`](https://scala-lang.org/api/3.x/scala/annotation/experimental.html) annotation allows the definition of an API that is not guaranteed backward binary or source compatibility. This annotation can be placed on term or type definitions. -### References to experimental definitions - -Experimental definitions can only be referenced in an experimental scope. Experimental scopes are defined as follows. - -(1) The RHS of an experimental `def`, `val`, `var`, `given` or `type` is an experimental scope. - -
-Examples - -```scala -import scala.annotation.experimental - -@experimental -def x = () - -def d1 = x // error: value x is marked @experimental and therefore ... -@experimental def d2 = x - -val v1 = x // error: value x is marked @experimental and therefore ... -@experimental val v2 = x - -var vr1 = x // error: value x is marked @experimental and therefore ... -@experimental var vr2 = x +## References to experimental definitions + +Experimental definitions can only be referenced in an experimental scope. Experimental scopes are defined as follows: + +1. The RHS of an experimental `def`, `val`, `var`, `given` or `type` is an experimental scope. Examples: + +
+ Example 1 + + ```scala + import scala.annotation.experimental + + @experimental + def x = () + + def d1 = x // error: value x is marked @experimental and therefore ... + @experimental def d2 = x + + val v1 = x // error: value x is marked @experimental and therefore ... + @experimental val v2 = x + + var vr1 = x // error: value x is marked @experimental and therefore ... + @experimental var vr2 = x + + lazy val lv1 = x // error: value x is marked @experimental and therefore ... + @experimental lazy val lv2 = x + ``` +
+ +
+ Example 2 + + ```scala + import scala.annotation.experimental + + @experimental + val x = () + + @experimental + def f() = () + + @experimental + object X: + def fx() = 1 + + def test1: Unit = + f() // error: def f is marked @experimental and therefore ... + x // error: value x is marked @experimental and therefore ... + X.fx() // error: object X is marked @experimental and therefore ... + import X.fx + fx() // error: object X is marked @experimental and therefore ... + + @experimental + def test2: Unit = + // references to f, x and X are ok because `test2` is experimental + f() + x + X.fx() + import X.fx + fx() + ``` +
+ +
+ Example 3 + + ```scala + import scala.annotation.experimental + + @experimental type E + + type A = E // error type E is marked @experimental and therefore ... + @experimental type B = E + ``` +
+ +
+ Example 4 + + ```scala + import scala.annotation.experimental + + @experimental class A + @experimental type X + @experimental type Y = Int + @experimental opaque type Z = Int + + def test: Unit = + new A // error: class A is marked @experimental and therefore ... + val i0: A = ??? // error: class A is marked @experimental and therefore ... + val i1: X = ??? // error: type X is marked @experimental and therefore ... + val i2: Y = ??? // error: type Y is marked @experimental and therefore ... + val i2: Z = ??? // error: type Y is marked @experimental and therefore ... + () + ``` +
+ +
+ Example 5 + + ```scala + @experimental + trait ExpSAM { + def foo(x: Int): Int + } + def bar(f: ExpSAM): Unit = {} // error: error form rule 2 + + def test: Unit = + bar(x => x) // error: reference to experimental SAM + () + ``` +
+ +2. The signatures of an experimental `def`, `val`, `var`, `given` and `type`, or constructors of `class` and `trait` are experimental scopes. Examples: + +
+ Example 1 + + ```scala + import scala.annotation.experimental + + @experimental def x = 2 + @experimental class A + @experimental type X + @experimental type Y = Int + @experimental opaque type Z = Int + + def test1( + p1: A, // error: class A is marked @experimental and therefore ... + p2: List[A], // error: class A is marked @experimental and therefore ... + p3: X, // error: type X is marked @experimental and therefore ... + p4: Y, // error: type Y is marked @experimental and therefore ... + p5: Z, // error: type Z is marked @experimental and therefore ... + p6: Any = x // error: def x is marked @experimental and therefore ... + ): A = ??? // error: class A is marked @experimental and therefore ... + + @experimental def test2( + p1: A, + p2: List[A], + p3: X, + p4: Y, + p5: Z, + p6: Any = x + ): A = ??? + + class Test1( + p1: A, // error + p2: List[A], // error + p3: X, // error + p4: Y, // error + p5: Z, // error + p6: Any = x // error + ) {} + + @experimental class Test2( + p1: A, + p2: List[A], + p3: X, + p4: Y, + p5: Z, + p6: Any = x + ) {} + + trait Test1( + p1: A, // error + p2: List[A], // error + p3: X, // error + p4: Y, // error + p5: Z, // error + p6: Any = x // error + ) {} + + @experimental trait Test2( + p1: A, + p2: List[A], + p3: X, + p4: Y, + p5: Z, + p6: Any = x + ) {} + ``` +
+ +3. The `extends` clause of an experimental `class`, `trait` or `object` is an experimental scope. Examples: + +
+ Example 1 + + ```scala + import scala.annotation.experimental + + @experimental def x = 2 + + @experimental class A1(x: Any) + class A2(x: Any) + + + @experimental class B1 extends A1(1) + class B2 extends A1(1) // error: class A1 is marked @experimental and therefore marked @experimental and therefore ... + + @experimental class C1 extends A2(x) + class C2 extends A2(x) // error def x is marked @experimental and therefore + ``` +
+ +4. The body of an experimental `class`, `trait` or `object` is an experimental scope. Examples: + +
+ Example 1 + ```scala + import scala.annotation.experimental + + @experimental def x = 2 + + @experimental class A { + def f = x // ok because A is experimental + } + + @experimental class B { + def f = x // ok because A is experimental + } + + @experimental object C { + def f = x // ok because A is experimental + } + + @experimental class D { + def f = { + object B { + x // ok because A is experimental + } + } + } + ``` +
+ +5. Annotations of an experimental definition are in experimental scopes. Examples: + +
+ Example 1 + + ```scala + import scala.annotation.experimental + + @experimental class myExperimentalAnnot extends scala.annotation.Annotation + + @myExperimentalAnnot // error + def test: Unit = () + + @experimental + @myExperimentalAnnot + def test: Unit = () + ``` -lazy val lv1 = x // error: value x is marked @experimental and therefore ... -@experimental lazy val lv2 = x -``` - -```scala -import scala.annotation.experimental - -@experimental -val x = () - -@experimental -def f() = () - -@experimental -object X: - def fx() = 1 - -def test1: Unit = - f() // error: def f is marked @experimental and therefore ... - x // error: value x is marked @experimental and therefore ... - X.fx() // error: object X is marked @experimental and therefore ... - import X.fx - fx() // error: object X is marked @experimental and therefore ... - -@experimental -def test2: Unit = - // references to f, x and X are ok because `test2` is experimental - f() - x - X.fx() - import X.fx - fx() -``` - -```scala -import scala.annotation.experimental - -@experimental type E - -type A = E // error type E is marked @experimental and therefore ... -@experimental type B = E -``` - -```scala -import scala.annotation.experimental - -@experimental class A -@experimental type X -@experimental type Y = Int -@experimental opaque type Z = Int - -def test: Unit = - new A // error: class A is marked @experimental and therefore ... - val i0: A = ??? // error: class A is marked @experimental and therefore ... - val i1: X = ??? // error: type X is marked @experimental and therefore ... - val i2: Y = ??? // error: type Y is marked @experimental and therefore ... - val i2: Z = ??? // error: type Y is marked @experimental and therefore ... - () -``` - -```scala -@experimental -trait ExpSAM { - def foo(x: Int): Int -} -def bar(f: ExpSAM): Unit = {} // error: error form rule 2 - -def test: Unit = - bar(x => x) // error: reference to experimental SAM - () -``` - -
- -(2.) The signatures of an experimental `def`, `val`, `var`, `given` and `type`, or constructors of `class` and `trait` are experimental scopes. - -
-Examples - -```scala -import scala.annotation.experimental - -@experimental def x = 2 -@experimental class A -@experimental type X -@experimental type Y = Int -@experimental opaque type Z = Int - -def test1( - p1: A, // error: class A is marked @experimental and therefore ... - p2: List[A], // error: class A is marked @experimental and therefore ... - p3: X, // error: type X is marked @experimental and therefore ... - p4: Y, // error: type Y is marked @experimental and therefore ... - p5: Z, // error: type Z is marked @experimental and therefore ... - p6: Any = x // error: def x is marked @experimental and therefore ... -): A = ??? // error: class A is marked @experimental and therefore ... - -@experimental def test2( - p1: A, - p2: List[A], - p3: X, - p4: Y, - p5: Z, - p6: Any = x -): A = ??? - -class Test1( - p1: A, // error - p2: List[A], // error - p3: X, // error - p4: Y, // error - p5: Z, // error - p6: Any = x // error -) {} - -@experimental class Test2( - p1: A, - p2: List[A], - p3: X, - p4: Y, - p5: Z, - p6: Any = x -) {} - -trait Test1( - p1: A, // error - p2: List[A], // error - p3: X, // error - p4: Y, // error - p5: Z, // error - p6: Any = x // error -) {} - -@experimental trait Test2( - p1: A, - p2: List[A], - p3: X, - p4: Y, - p5: Z, - p6: Any = x -) {} -``` - -
- -(3.) The `extends` clause of an experimental `class`, `trait` or `object` is an experimental scope. - -
-Examples - -```scala -import scala.annotation.experimental - -@experimental def x = 2 - -@experimental class A1(x: Any) -class A2(x: Any) - - -@experimental class B1 extends A1(1) -class B2 extends A1(1) // error: class A1 is marked @experimental and therefore marked @experimental and therefore ... - -@experimental class C1 extends A2(x) -class C2 extends A2(x) // error def x is marked @experimental and therefore -``` - -
- -(4.) The body of an experimental `class`, `trait` or `object` is an experimental scope. - -
-Examples - -```scala -import scala.annotation.experimental - -@experimental def x = 2 - -@experimental class A { - def f = x // ok because A is experimental -} - -@experimental class B { - def f = x // ok because A is experimental -} - -@experimental object C { - def f = x // ok because A is experimental -} - -@experimental class D { - def f = { - object B { - x // ok because A is experimental - } - } -} -``` - -
- -(5.) Annotations of an experimental definition are in experimental scopes. - -
-Examples - -```scala -import scala.annotation.experimental - -@experimental class myExperimentalAnnot extends scala.annotation.Annotation - -@myExperimentalAnnot // error -def test: Unit = () - -@experimental -@myExperimentalAnnot -def test: Unit = () -``` - -
+
-(6.) Any code compiled using a _Nightly_ or _Snapshot_ version of the compiler is considered to be in an experimental scope. +6. Any code compiled using a [_Nightly_](https://search.maven.org/artifact/org.scala-lang/scala3-compiler_3) or _Snapshot_ version of the compiler is considered to be in an experimental scope. Can use the `-Yno-experimental` compiler flag to disable it and run as a proper release. In any other situation, a reference to an experimental definition will cause a compilation error. -### Experimental inheritance +## Experimental inheritance -All subclasses of an experimental `class` or `trait` must be marked as `@experimental` even if they are in an experimental scope. +All subclasses of an experimental `class` or `trait` must be marked as [`@experimental`](https://scala-lang.org/api/3.x/scala/annotation/experimental.html) even if they are in an experimental scope. Anonymous classes and SAMs of experimental classes are considered experimental. We require explicit annotations to make sure we do not have completion or cycles issues with nested classes. This restriction could be relaxed in the future. -### Experimental overriding +## Experimental overriding For an overriding member `M` and overridden member `O`, if `O` is non-experimental then `M` must be non-experimental. @@ -279,12 +287,12 @@ class B extends A: - @experimental def f: Int = 2 ``` -### Test frameworks +## Test frameworks -Tests can be defined as experimental. Tests frameworks can execute tests using reflection even if they are in an experimental class, object or method. +Tests can be defined as experimental. Tests frameworks can execute tests using reflection even if they are in an experimental class, object or method. Examples:
-Examples +Example 1 Test that touch experimental APIs can be written as follows diff --git a/docs/docs/reference/other-new-features/explicit-nulls.md b/docs/docs/reference/other-new-features/explicit-nulls.md index c1afe6a4e067..1ee404a44cec 100644 --- a/docs/docs/reference/other-new-features/explicit-nulls.md +++ b/docs/docs/reference/other-new-features/explicit-nulls.md @@ -5,7 +5,7 @@ movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/explici --- Explicit nulls is an opt-in feature that modifies the Scala type system, which makes reference types -(anything that extends `AnyRef`) _non-nullable_. +(anything that extends [`AnyRef`](https://scala-lang.org/api/3.x/scala/AnyRef.html)) _non-nullable_. This means the following code will no longer typecheck: @@ -59,7 +59,7 @@ So far, we have found the following useful: Don't use `.nn` on mutable variables directly, because it may introduce an unknown type into the type of the variable. -- An `unsafeNulls` language feature. +- An [`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html) language feature. When imported, `T | Null` can be used as `T`, similar to regular Scala (without explicit nulls). @@ -277,7 +277,7 @@ We illustrate the rules with following examples: ### Override check -When we check overriding between Scala classes and Java classes, the rules are relaxed for `Null` type with this feature, in order to help users to working with Java libraries. +When we check overriding between Scala classes and Java classes, the rules are relaxed for [`Null`](https://scala-lang.org/api/3.x/scala/Null.html) type with this feature, in order to help users to working with Java libraries. Suppose we have Java method `String f(String x)`, we can override this method in Scala in any of the following forms: @@ -448,10 +448,10 @@ We don't support: ### UnsafeNulls -It is difficult to work with many nullable values, we introduce a language feature `unsafeNulls`. +It is difficult to work with many nullable values, we introduce a language feature [`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html). Inside this "unsafe" scope, all `T | Null` values can be used as `T`. -Users can import `scala.language.unsafeNulls` to create such scopes, or use `-language:unsafeNulls` to enable this feature globally (for migration purpose only). +Users can import [`scala.language.unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html) to create such scopes, or use `-language:unsafeNulls` to enable this feature globally (for migration purpose only). Assume `T` is a reference type (a subtype of `AnyRef`), the following unsafe operation rules are applied in this unsafe-nulls scope: @@ -470,7 +470,7 @@ can be used as `T2` if `T1` is a subtype of `T2` using regular subtyping rules Addtionally, `null` can be used as `AnyRef` (`Object`), which means you can select `.eq` or `.toString` on it. -The program in `unsafeNulls` will have a **similar** semantic as regular Scala, but not **equivalent**. +The program in [`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html) will have a **similar** semantic as regular Scala, but not **equivalent**. For example, the following code cannot be compiled even using unsafe nulls. Because of the Java interoperation, the type of the get method becomes `T | Null`. @@ -483,7 +483,7 @@ Since the compiler doesn’t know whether `T` is a reference type, it is unable to `T`. A `.nn` need to be inserted after `xs.get(0)` by user manually to fix the error, which strips the `Null` from its type. -The intention of this `unsafeNulls` is to give users a better migration path for explicit nulls. +The intention of this [`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html) is to give users a better migration path for explicit nulls. Projects for Scala 2 or regular Scala 3 can try this by adding `-Yexplicit-nulls -language:unsafeNulls` to the compile options. A small number of manual modifications are expected. To migrate to the full explicit nulls feature in the future, `-language:unsafeNulls` can be dropped and add @@ -514,9 +514,9 @@ class C[T >: Null <: String] // define a type bound with unsafe conflict bound val n = nullOf[String] // apply a type bound unsafely ``` -Without the `unsafeNulls`, all these unsafe operations will not be type-checked. +Without the [`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html), all these unsafe operations will not be type-checked. -`unsafeNulls` also works for extension methods and implicit search. +[`unsafeNulls`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$unsafeNulls$.html) also works for extension methods and implicit search. ```scala import scala.language.unsafeNulls diff --git a/docs/docs/reference/other-new-features/export.md b/docs/docs/reference/other-new-features/export.md index d21f6ed6d4cb..ce1d536a1432 100644 --- a/docs/docs/reference/other-new-features/export.md +++ b/docs/docs/reference/other-new-features/export.md @@ -44,7 +44,7 @@ val copier = new Copier copier.print(copier.scan()) ``` -An export clause has the same format as an import clause. Its general form is: +An `export` clause has the same format as an import clause. Its general form is: ```scala export path . { sel_1, ..., sel_n } diff --git a/docs/docs/reference/other-new-features/kind-polymorphism.md b/docs/docs/reference/other-new-features/kind-polymorphism.md index 7dbcf3e96927..057e9de9d55d 100644 --- a/docs/docs/reference/other-new-features/kind-polymorphism.md +++ b/docs/docs/reference/other-new-features/kind-polymorphism.md @@ -14,7 +14,7 @@ _must_ be applied to a type argument, unless they are passed to type parameters Sometimes we would like to have type parameters that can have more than one kind, for instance to define an implicit value that works for parameters of any kind. This is now possible through a form of (_subtype_) kind polymorphism. -Kind polymorphism relies on the special type `scala.AnyKind` that can be used as an upper bound of a type. +Kind polymorphism relies on the special type [`scala.AnyKind`](https://scala-lang.org/api/3.x/scala/AnyKind.html) that can be used as an upper bound of a type. ```scala def f[T <: AnyKind] = ... @@ -38,7 +38,7 @@ through advanced uses of implicits. (todo: insert good concise example) -Some technical details: `AnyKind` is a synthesized class just like `Any`, but without any members. It extends no other class. +Some technical details: [`AnyKind`](https://scala-lang.org/api/3.x/scala/AnyKind.html) is a synthesized class just like `Any`, but without any members. It extends no other class. It is declared `abstract` and `final`, so it can be neither instantiated nor extended. `AnyKind` plays a special role in Scala's subtype system: It is a supertype of all other types no matter what their kind is. It is also assumed to be kind-compatible with all other types. Furthermore, `AnyKind` is treated as a higher-kinded type (so it cannot be used as a type of values), but at the same time it has no type parameters (so it cannot be instantiated). diff --git a/docs/docs/reference/other-new-features/matchable.md b/docs/docs/reference/other-new-features/matchable.md index fdce97dab8f0..b1bb16697d62 100644 --- a/docs/docs/reference/other-new-features/matchable.md +++ b/docs/docs/reference/other-new-features/matchable.md @@ -4,11 +4,11 @@ title: "The Matchable Trait" movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/matchable.html --- -A new trait `Matchable` controls the ability to pattern match. +A new trait [`Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) controls the ability to pattern match. ### The Problem -The Scala 3 standard library has a type `IArray` for immutable +The Scala 3 standard library has a type [`IArray`](https://scala-lang.org/api/3.x/scala.html#IArray-0) for immutable arrays that is defined like this: ```scala @@ -25,7 +25,7 @@ imm match case a: Array[Int] => a(0) = 1 ``` -The test will succeed at runtime since `IArray`s _are_ represented as +The test will succeed at runtime since [`IArray`](https://scala-lang.org/api/3.x/scala.html#IArray-0)s _are_ represented as `Array`s at runtime. But if we allowed it, it would break the fundamental abstraction of immutable arrays. __Aside:__ One could also achieve the same by casting: @@ -36,7 +36,7 @@ imm.asInstanceOf[Array[Int]](0) = 1 But that is not as much of a problem since in Scala `asInstanceOf` is understood to be low-level and unsafe. By contrast, a pattern match that compiles without warning or error should not break abstractions. -Note also that the problem is not tied to opaque types as match selectors. The following slight variant with a value of parametric +Note also that the problem is not tied to [opaque types](opaques.md) as match selectors. The following slight variant with a value of parametric type `T` as match selector leads to the same problem: ```scala @@ -45,11 +45,11 @@ def f[T](x: T) = x match f(imm) ``` -Finally, note that the problem is not linked to just opaque types. No unbounded type parameter or abstract type should be decomposable with a pattern match. +Finally, note that the problem is not linked to just [opaque types](opaques.md). No unbounded type parameter or abstract type should be decomposable with a pattern match. ### The Solution -There is a new type `scala.Matchable` that controls pattern matching. When typing a pattern match of a constructor pattern `C(...)` or +There is a new type [`scala.Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) that controls pattern matching. When typing a pattern match of a constructor pattern `C(...)` or a type pattern `_: C` it is required that the selector type conforms to `Matchable`. If that's not the case a warning is issued. For instance when compiling the example at the start of this section we get: @@ -65,8 +65,7 @@ to `Matchable`. If that's not the case a warning is issued. For instance when co To allow migration from Scala 2 and cross-compiling between Scala 2 and 3 the warning is turned on only for `-source future-migration` or higher. -`Matchable` is a universal trait with `Any` as its parent class. It is -extended by both `AnyVal` and `AnyRef`. Since `Matchable` is a supertype of every concrete value or reference class it means that instances of such classes can be matched as before. However, match selectors of the following types will produce a warning: +[`Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) is a universal trait with `Any` as its parent class. It is extended by both [`AnyVal`](https://scala-lang.org/api/3.x/scala/AnyVal.html) and [`AnyRef`](https://scala-lang.org/api/3.x/scala/AnyRef.html). Since `Matchable` is a supertype of every concrete value or reference class it means that instances of such classes can be matched as before. However, match selectors of the following types will produce a warning: - Type `Any`: if pattern matching is required one should use `Matchable` instead. - Unbounded type parameters and abstract types: If pattern matching is required they should have an upper bound `Matchable`. @@ -93,7 +92,7 @@ class AnyVal extends Any, Matchable class Object extends Any, Matchable ``` -`Matchable` is currently a marker trait without any methods. Over time +[`Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) is currently a marker trait without any methods. Over time we might migrate methods `getClass` and `isInstanceOf` to it, since these are closely related to pattern-matching. ### `Matchable` and Universal Equality @@ -111,9 +110,9 @@ class C(val x: String): case _ => false ``` -The cast of `that` to `Matchable` serves as an indication that universal equality +The cast of `that` to [`Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) serves as an indication that universal equality is unsafe in the presence of abstract types and opaque types since it cannot properly distinguish the meaning of a type from its representation. The cast -is guaranteed to succeed at run-time since `Any` and `Matchable` both erase to +is guaranteed to succeed at run-time since `Any` and [`Matchable`](https://scala-lang.org/api/3.x/scala/Matchable.html) both erase to `Object`. For instance, consider the definitions diff --git a/docs/docs/reference/other-new-features/opaques-details.md b/docs/docs/reference/other-new-features/opaques-details.md index ecfb78db48b7..0a992ff5f6be 100644 --- a/docs/docs/reference/other-new-features/opaques-details.md +++ b/docs/docs/reference/other-new-features/opaques-details.md @@ -4,7 +4,7 @@ title: "Opaque Type Aliases: More Details" movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/opaques-details.html --- -### Syntax +## Syntax ``` Modifier ::= ... @@ -16,7 +16,7 @@ Modifier ::= ... Opaque type aliases must be members of classes, traits, or objects, or they are defined at the top-level. They cannot be defined in local blocks. -### Type Checking +## Type Checking The general form of a (monomorphic) opaque type alias is @@ -24,7 +24,7 @@ The general form of a (monomorphic) opaque type alias is opaque type T >: L <: U = R ``` -where the lower bound `L` and the upper bound `U` may be missing, in which case they are assumed to be `scala.Nothing` and `scala.Any`, respectively. If bounds are given, it is checked that the right-hand side `R` conforms to them, i.e. `L <: R` and `R <: U`. F-bounds are not supported for opaque type aliases: `T` is not allowed to appear in `L` or `U`. +where the lower bound `L` and the upper bound `U` may be missing, in which case they are assumed to be [`scala.Nothing`](https://scala-lang.org/api/3.x/scala/Nothing.html) and [`scala.Any`](https://scala-lang.org/api/3.x/scala/Any.html), respectively. If bounds are given, it is checked that the right-hand side `R` conforms to them, i.e. `L <: R` and `R <: U`. F-bounds are not supported for opaque type aliases: `T` is not allowed to appear in `L` or `U`. Inside the scope of the alias definition, the alias is transparent: `T` is treated as a normal alias of `R`. Outside its scope, the alias is treated as the abstract type @@ -51,7 +51,7 @@ object o: def id(x: o.T): o.T = x ``` -### Type Parameters of Opaque Types +## Type Parameters of Opaque Types Opaque type aliases can have a single type parameter list. The following aliases are well-formed @@ -65,7 +65,7 @@ opaque type BadF[T] = [U] =>> (T, U) opaque type BadG = [T] =>> [U] => (T, U) ``` -### Translation of Equality +## Translation of Equality Comparing two values of opaque type with `==` or `!=` normally uses universal equality, unless another overloaded `==` or `!=` operator is defined for the type. To avoid @@ -80,7 +80,7 @@ defined on the underlying type. For instance, x == y // uses Int equality for the comparison. ``` -### Top-level Opaque Types +## Top-level Opaque Types An opaque type alias on the top-level is transparent in all other top-level definitions in the sourcefile where it appears, but is opaque in nested objects and classes and in all other source files. Example: @@ -107,7 +107,7 @@ object obj: The opaque type alias `A` is transparent in its scope, which includes the definition of `x`, but not the definitions of `obj` and `y`. -### Relationship to SIP 35 +## Relationship to SIP 35 Opaque types in Scala 3 are an evolution from what is described in [Scala SIP 35](https://docs.scala-lang.org/sips/opaque-types.html). diff --git a/docs/docs/reference/other-new-features/open-classes.md b/docs/docs/reference/other-new-features/open-classes.md index f1ddcf8c190f..6762b0eac14b 100644 --- a/docs/docs/reference/other-new-features/open-classes.md +++ b/docs/docs/reference/other-new-features/open-classes.md @@ -31,7 +31,7 @@ Classes that are not open can still be extended, but only if at least one of two - The extending class is in the same source file as the extended class. In this case, the extension is usually an internal implementation matter. - - The language feature `adhocExtensions` is enabled for the extending class. This is typically enabled by an import clause in the source file of the extension: + - The language feature [`adhocExtensions`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$adhocExtensions$.html) is enabled for the extending class. This is typically enabled by an import clause in the source file of the extension: ```scala import scala.language.adhocExtensions ``` @@ -47,7 +47,7 @@ Classes that are not open can still be extended, but only if at least one of two |or by setting the compiler option -language:adhocExtensions. ``` -### Motivation +## Motivation When writing a class, there are three possible expectations of extensibility: @@ -64,17 +64,17 @@ It is good practice to avoid _ad-hoc_ extensions in a code base, since they tend are still some situations where these extensions are useful: for instance, to mock classes in tests, or to apply temporary patches that add features or fix bugs in library classes. That's why _ad-hoc_ extensions are permitted, but only if there is an explicit opt-in via a language feature import. -### Details +## Details - `open` is a soft modifier. It is treated as a normal identifier unless it is in modifier position. - An `open` class cannot be `final` or `sealed`. - Traits or `abstract` classes are always `open`, so `open` is redundant for them. -### Relationship with `sealed` +## Relationship with `sealed` -A class that is neither `abstract` nor `open` is similar to a `sealed` class: it can still be extended, but only in the same source file. The difference is what happens if an extension of the class is attempted in another source file. For a `sealed` class, this is an error, whereas for a simple non-open class, this is still permitted provided the `adhocExtensions` feature is enabled, and it gives a warning otherwise. +A class that is neither `abstract` nor `open` is similar to a `sealed` class: it can still be extended, but only in the same source file. The difference is what happens if an extension of the class is attempted in another source file. For a `sealed` class, this is an error, whereas for a simple non-open class, this is still permitted provided the [`adhocExtensions`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$adhocExtensions$.html) feature is enabled, and it gives a warning otherwise. -### Migration +## Migration `open` is a new modifier in Scala 3. To allow cross compilation between Scala 2.13 and Scala 3.0 without warnings, the feature warning for ad-hoc extensions is produced only under `-source future`. It will be produced by default from Scala 3.1 on. diff --git a/docs/docs/reference/other-new-features/targetName.md b/docs/docs/reference/other-new-features/targetName.md index a83c4247c1ef..d2a654697d15 100644 --- a/docs/docs/reference/other-new-features/targetName.md +++ b/docs/docs/reference/other-new-features/targetName.md @@ -4,7 +4,7 @@ title: "The @targetName annotation" movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/targetName.html --- -A `@targetName` annotation on a definition defines an alternate name for the implementation of that definition. Example: +A [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation on a definition defines an alternate name for the implementation of that definition. Example: ```scala import scala.annotation.targetName @@ -21,7 +21,7 @@ Here, the `++=` operation is implemented (in Byte code or native code) under the VecOps.append(vec1, vec2) ``` -The `@targetName` annotation has no bearing on Scala usages. Any application of that method in Scala has to use `++=`, not `append`. +The [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation has no bearing on Scala usages. Any application of that method in Scala has to use `++=`, not `append`. ### Details @@ -31,22 +31,21 @@ The `@targetName` annotation has no bearing on Scala usages. Any application of 2. A `@targetName` annotation can be given for all kinds of definitions. - 3. The name given in a `@targetName` annotation must be a legal name + 3. The name given in a [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation must be a legal name for the defined entities on the host platform. - 4. It is recommended that definitions with symbolic names have a `@targetName` annotation. This will establish an alternate name that is easier to search for and + 4. It is recommended that definitions with symbolic names have a [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation. This will establish an alternate name that is easier to search for and will avoid cryptic encodings in runtime diagnostics. 5. Definitions with names in backticks that are not legal host platform names - should also have a `@targetName` annotation. + should also have a [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation. ### Relationship with Overriding -`@targetName` annotations are significant for matching two method definitions to decide whether they conflict or override each other. Two method definitions match if they have the same name, signature, and erased name. Here, +[`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotations are significant for matching two method definitions to decide whether they conflict or override each other. Two method definitions match if they have the same name, signature, and erased name. Here, - The _signature_ of a definition consists of the names of the erased types of all (value-) parameters and the method's result type. -- The _erased name_ of a method definition is its target name if a `@targetName` - annotation is given and its defined name otherwise. +- The _erased name_ of a method definition is its target name if a [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation is given and its defined name otherwise. This means that `@targetName` annotations can be used to disambiguate two method definitions that would otherwise clash. For instance. @@ -55,8 +54,7 @@ def f(x: => String): Int = x.length def f(x: => Int): Int = x + 1 // error: double definition ``` -The two definitions above clash since their erased parameter types are both `Function0`, which is the type of the translation of a by-name-parameter. Hence -they have the same names and signatures. But we can avoid the clash by adding a `@targetName` annotation to either method or to both of them. Example: +The two definitions above clash since their erased parameter types are both [`Function0`](https://scala-lang.org/api/3.x/scala/Function0.html), which is the type of the translation of a by-name-parameter. Hence they have the same names and signatures. But we can avoid the clash by adding a [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotation to either method or to both of them. Example: ```scala @targetName("f_string") @@ -66,7 +64,7 @@ def f(x: => Int): Int = x + 1 // OK This will produce methods `f_string` and `f` in the generated code. -However, `@targetName` annotations are not allowed to break overriding relationships +However, [`@targetName`](https://scala-lang.org/api/3.x/scala/annotation/targetName.html) annotations are not allowed to break overriding relationships between two definitions that have otherwise the same names and types. So the following would be in error: ```scala diff --git a/docs/docs/reference/other-new-features/threadUnsafe-annotation.md b/docs/docs/reference/other-new-features/threadUnsafe-annotation.md index 99a16413f310..cd0d45e2246a 100644 --- a/docs/docs/reference/other-new-features/threadUnsafe-annotation.md +++ b/docs/docs/reference/other-new-features/threadUnsafe-annotation.md @@ -4,9 +4,9 @@ title: "The @threadUnsafe annotation" movedTo: https://docs.scala-lang.org/scala3/reference/other-new-features/threadUnsafe-annotation.html --- -A new annotation `@threadUnsafe` can be used on a field which defines +A new annotation [`@threadUnsafe`](https://scala-lang.org/api/3.x/scala/annotation/threadUnsafe.html) can be used on a field which defines a `lazy val`. When this annotation is used, the initialization of the -`lazy val` will use a faster mechanism which is not thread-safe. +[`lazy val`](../changed-features/lazy-vals-init.md) will use a faster mechanism which is not thread-safe. ### Example diff --git a/docs/docs/reference/other-new-features/transparent-traits.md b/docs/docs/reference/other-new-features/transparent-traits.md index 8f37f24174e1..3236bf71252d 100644 --- a/docs/docs/reference/other-new-features/transparent-traits.md +++ b/docs/docs/reference/other-new-features/transparent-traits.md @@ -9,7 +9,7 @@ Traits are used in two roles: 1. As mixins for other classes and traits 2. As types of vals, defs, or parameters -Some traits are used primarily in the first role, and we usually do not want to see them in inferred types. An example is the `Product` trait that the compiler adds as a mixin trait to every case class or case object. In Scala 2, this parent trait sometimes makes inferred types more complicated than they should be. Example: +Some traits are used primarily in the first role, and we usually do not want to see them in inferred types. An example is the [`Product`](https://scala-lang.org/api/3.x/scala/Product.html) trait that the compiler adds as a mixin trait to every case class or case object. In Scala 2, this parent trait sometimes makes inferred types more complicated than they should be. Example: ```scala trait Kind @@ -40,15 +40,15 @@ appear in the inferred type. ## Transparent Traits -The traits `scala.Product`, `java.lang.Serializable` and `java.lang.Comparable` +The traits [`scala.Product`](https://scala-lang.org/api/3.x/scala/Product.html), [`java.io.Serializable`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/io/Serializable.html) and [`java.lang.Comparable`](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Comparable.html) are treated automatically as transparent. Other traits are turned into transparent traits using the modifier `transparent`. Scala 2 traits can also be made transparent -by adding a [`@transparentTrait` annotation](https://scala-lang.org/api/3.x/scala/annotation/transparentTrait.html). This annotation is defined in `scala.annotation`. It will be deprecated and phased out once Scala 2/3 interopability is no longer needed. +by adding a [`@transparentTrait`](https://scala-lang.org/api/3.x/scala/annotation/transparentTrait.html) annotation. This annotation is defined in [`scala.annotation`](https://scala-lang.org/api/3.x/scala/annotation.html). It will be deprecated and phased out once Scala 2/3 interopability is no longer needed. Typically, transparent traits are traits that influence the implementation of inheriting classes and traits that are not usually used as types by themselves. Two examples from the standard collection library are: -- `IterableOps`, which provides method implementations for an `Iterable`. -- `StrictOptimizedSeqOps`, which optimises some of these implementations for sequences with efficient indexing. +- [`IterableOps`](https://scala-lang.org/api/3.x/scala/collection/IterableOps.html), which provides method implementations for an [`Iterable`](https://scala-lang.org/api/3.x/scala/collection/Iterable.html). +- [`StrictOptimizedSeqOps`](https://scala-lang.org/api/3.x/scala/collection/StrictOptimizedSeqOps.html), which optimises some of these implementations for sequences with efficient indexing. Generally, any trait that is extended recursively is a good candidate to be declared transparent. @@ -67,4 +67,4 @@ The precise rules are as follows: the resulting type is still a subtype of the bound `B`. - However, do not perform this widening if all transparent traits `Ti` can get replaced in that way. -The last clause ensures that a single transparent trait instance such as `Product` is not widened to `Any`. Transparent trait instances are only dropped when they appear in conjunction with some other type. +The last clause ensures that a single transparent trait instance such as [`Product`](https://scala-lang.org/api/3.x/scala/Product.html) is not widened to [`Any`](https://scala-lang.org/api/3.x/scala/Any.html). Transparent trait instances are only dropped when they appear in conjunction with some other type. diff --git a/docs/docs/reference/other-new-features/type-test.md b/docs/docs/reference/other-new-features/type-test.md index da9fa6a1c2b3..ee4e612e9a37 100644 --- a/docs/docs/reference/other-new-features/type-test.md +++ b/docs/docs/reference/other-new-features/type-test.md @@ -27,7 +27,7 @@ object Y: In both cases, a class test will be performed at runtime. But when the type test is on an abstract type (type parameter or type member), the test cannot be performed because the type is erased at runtime. -A `TypeTest` can be provided to make this test possible. +A [`TypeTest`](https://scala-lang.org/api/3.x/scala/reflect/TypeTest.html) can be provided to make this test possible. ```scala package scala.reflect @@ -80,7 +80,7 @@ new TypeTest[A, B]: If the type tests cannot be done there will be an unchecked warning that will be raised on the `case s: B =>` test. -The most common `TypeTest` instances are the ones that take any parameters (i.e. `TypeTest[Any, T]`). +The most common [`TypeTest`](https://scala-lang.org/api/3.x/scala/reflect/TypeTest.html) instances are the ones that take any parameters (i.e. `TypeTest[Any, T]`). To make it possible to use such instances directly in context bounds we provide the alias ```scala @@ -103,10 +103,10 @@ f[Int] // false ## TypeTest and ClassTag -`TypeTest` is a replacement for functionality provided previously by `ClassTag.unapply`. -Using `ClassTag` instances was unsound since classtags can check only the class component of a type. -`TypeTest` fixes that unsoundness. -`ClassTag` type tests are still supported but a warning will be emitted after 3.0. +[`TypeTest`](https://scala-lang.org/api/3.x/scala/reflect/TypeTest.html) is a replacement for functionality provided previously by `ClassTag.unapply`. +Using [`ClassTag`](https://scala-lang.org/api/3.x/scala/reflect/ClassTag.html) instances was unsound since classtags can check only the class component of a type. +[`TypeTest`](https://scala-lang.org/api/3.x/scala/reflect/TypeTest.html) fixes that unsoundness. +[`ClassTag`](https://scala-lang.org/api/3.x/scala/reflect/ClassTag.html) type tests are still supported but a warning will be emitted after 3.0. ## Example diff --git a/docs/docs/reference/soft-modifier.md b/docs/docs/reference/soft-modifier.md index 9706e18e3e5b..6421c38f00dd 100644 --- a/docs/docs/reference/soft-modifier.md +++ b/docs/docs/reference/soft-modifier.md @@ -4,9 +4,9 @@ title: "Soft Keywords" movedTo: https://docs.scala-lang.org/scala3/reference/soft-modifier.html --- -A soft modifier is one of the identifiers `opaque`, `inline`, `open`, `transparent`, and `infix`. +A soft modifier is one of the identifiers `infix`, `inline`, `opaque`, `open` and `transparent`. -A soft keyword is a soft modifier, or one of `derives`, `end`, `extension`, `throws`, `using`, `|`, `+`, `-`, `*` +A soft keyword is a soft modifier, or one of `as`, `derives`, `end`, `extension`, `throws`, `using`, `|`, `+`, `-`, `*` A soft modifier is treated as potential modifier of a definition if it is followed by a hard modifier or a keyword combination starting a definition (`def`, `val`, `var`, `type`, `given`, `class`, `trait`, `object`, `enum`, `case class`, `case object`). Between the two words there may be a sequence of newline tokens and soft modifiers. diff --git a/docs/docs/reference/syntax.md b/docs/docs/reference/syntax.md index 0bf2ed86a164..c2f990b0a953 100644 --- a/docs/docs/reference/syntax.md +++ b/docs/docs/reference/syntax.md @@ -122,7 +122,8 @@ type val var while with yield ### Soft keywords ``` -as derives end extension infix inline opaque open transparent using | * + - +as derives end extension infix inline opaque open throws +transparent using | * + - ``` See the [separate section on soft keywords](./soft-modifier.md) for additional From c7d268a7ec6ce41efa062af6adc6c1f712968065 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 4 Jan 2022 19:06:16 +0100 Subject: [PATCH 0973/1244] Add eta reduction miniphase Fixes #10889. Alternative to #13750, from which the test is taken. --- compiler/src/dotty/tools/dotc/Compiler.scala | 1 + .../tools/dotc/transform/EtaReduce.scala | 46 ++++++++++ tests/run/contextual-closure-unwrapping.check | 1 + tests/run/contextual-closure-unwrapping.scala | 83 +++++++++++++++++++ 4 files changed, 131 insertions(+) create mode 100644 compiler/src/dotty/tools/dotc/transform/EtaReduce.scala create mode 100644 tests/run/contextual-closure-unwrapping.check create mode 100644 tests/run/contextual-closure-unwrapping.scala diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala index 736e1b08d1e7..2bdf33b259fc 100644 --- a/compiler/src/dotty/tools/dotc/Compiler.scala +++ b/compiler/src/dotty/tools/dotc/Compiler.scala @@ -106,6 +106,7 @@ class Compiler { List(new ElimErasedValueType, // Expand erased value types to their underlying implmementation types new PureStats, // Remove pure stats from blocks new VCElideAllocations, // Peep-hole optimization to eliminate unnecessary value class allocations + new EtaReduce, new ArrayApply, // Optimize `scala.Array.apply([....])` and `scala.Array.apply(..., [....])` into `[...]` new sjs.AddLocalJSFakeNews, // Adds fake new invocations to local JS classes in calls to `createLocalJSClass` new ElimPolyFunction, // Rewrite PolyFunction subclasses to FunctionN subclasses diff --git a/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala b/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala new file mode 100644 index 000000000000..1689eb62caa4 --- /dev/null +++ b/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala @@ -0,0 +1,46 @@ +package dotty.tools +package dotc +package transform + +import MegaPhase.MiniPhase +import core.* +import Symbols.*, Contexts.*, Types.*, Decorators.* +import StdNames.nme +import ast.Trees.* + +/** Rewrite `(x1, ... xN) => f(x1, ... xN)` for N >= 0 to `f`, + * provided `f` is a pure path of function type. + * + * This optimization is crucial for context functions. The compiler + * produces a contextual closure around values passed as arguments + * where a context function is expected, unless that value has the + * syntactic form of a context function literal. + * + * Without this phase, when a contextual function is passed as an argument to a + * recursive function, that would have the unfortunate effect of a linear growth + * in transient thunks of identical type wrapped around each other, leading + * to performance degradation, and in some cases, stack overflows. + */ +class EtaReduce extends MiniPhase: + import ast.tpd._ + + override def phaseName: String = "etaReduce" + + override def transformBlock(tree: Block)(using Context): Tree = tree match + case Block((meth : DefDef) :: Nil, closure: Closure) + if meth.symbol == closure.meth.symbol => + meth.rhs match + case Apply(Select(fn, nme.apply), args) + if meth.paramss.head.corresponds(args)((param, arg) => + arg.isInstanceOf[Ident] && arg.symbol == param.symbol) + && isPurePath(fn) => + val treeSym = tree.tpe.widen.typeSymbol + val fnSym = fn.tpe.widen.typeSymbol + if treeSym == fnSym && defn.isFunctionClass(fnSym) then + report.log(i"eta reducing $tree --> $fn") + fn + else tree + case _ => tree + case _ => tree + +end EtaReduce \ No newline at end of file diff --git a/tests/run/contextual-closure-unwrapping.check b/tests/run/contextual-closure-unwrapping.check new file mode 100644 index 000000000000..27ba77ddaf61 --- /dev/null +++ b/tests/run/contextual-closure-unwrapping.check @@ -0,0 +1 @@ +true diff --git a/tests/run/contextual-closure-unwrapping.scala b/tests/run/contextual-closure-unwrapping.scala new file mode 100644 index 000000000000..18a1e5f9e5e1 --- /dev/null +++ b/tests/run/contextual-closure-unwrapping.scala @@ -0,0 +1,83 @@ +import scala.annotation.tailrec + +import java.lang.management.ManagementFactory +import java.lang.management.RuntimeMXBean + +import scala.jdk.CollectionConverters._ + +object Test { + trait Txn {} + type AtomicOp[Z] = Txn ?=> Z + type VanillaAtomicOp[Z] = Txn => Z + + object AbortAndRetry extends scala.util.control.ControlThrowable("abort and retry") {} + + def beginTxn:Txn = new Txn {} + + @tailrec def retryN[Z](n:Int)(txn:AtomicOp[Z], i:Int = 0):Z = { + try { + given Txn = beginTxn + val ret:Z = txn + if(i < n) { throw AbortAndRetry } + ret + } catch { + case AbortAndRetry => retryN(n)(txn, i + 1) + } + } + + @tailrec def safeRetryN[Z](n:Int)(txn:VanillaAtomicOp[Z], i:Int = 0):Z = { + try { + given Txn = beginTxn + val ret:Z = txn.asInstanceOf[AtomicOp[Z]] + if(i < n) { throw AbortAndRetry } + ret + } catch { + case AbortAndRetry => safeRetryN(n)(txn, i + 1) + } + } + + object StackSize { + def unapply(arg:String):Option[Int] = { + Option(arg match { + case s"-Xss$rest" => rest + case s"-XX:ThreadStackSize=$rest" => rest + case _ => null + }).map{ rest => + val shift = (rest.toLowerCase.last match { + case 'k' => 10 + case 'm' => 20 + case 'g' => 30 + case _ => 0 + }) + (if(shift > 0) { + rest.dropRight(1) + } else { + rest + }).toInt << shift + } + } + } + def main(args:Array[String]) = { + val arguments = ManagementFactory.getRuntimeMXBean.getInputArguments + // 64bit VM defaults to 1024K / 1M stack size, 32bit defaults to 320k + // Use 1024 as upper bound. + val maxStackSize:Int = arguments.asScala.reverseIterator.collectFirst{case StackSize(stackSize) => stackSize}.getOrElse(1 << 20) + + val testTxn:VanillaAtomicOp[Boolean] = { + (txn:Txn) => + given Txn = txn + true + } + + Console.println(try { + // maxStackSize is a good upper bound on linear stack growth + // without assuming too much about frame size + // (1 byte / frame is conservative even for a z80) + retryN(maxStackSize)(testTxn.asInstanceOf[AtomicOp[Boolean]]) == safeRetryN(maxStackSize)(testTxn) + } catch { + case e:StackOverflowError => + Console.println(s"Exploded after ${e.getStackTrace.length} frames") + false + }) + } +} \ No newline at end of file From 3f86f7d541b75dac0523f69a12b20869af2969a1 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 4 Jan 2022 19:57:47 +0100 Subject: [PATCH 0974/1244] Simplify type match test --- .../src/dotty/tools/dotc/transform/EtaReduce.scala | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala b/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala index 1689eb62caa4..8afdb5121e19 100644 --- a/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala +++ b/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala @@ -33,13 +33,11 @@ class EtaReduce extends MiniPhase: case Apply(Select(fn, nme.apply), args) if meth.paramss.head.corresponds(args)((param, arg) => arg.isInstanceOf[Ident] && arg.symbol == param.symbol) - && isPurePath(fn) => - val treeSym = tree.tpe.widen.typeSymbol - val fnSym = fn.tpe.widen.typeSymbol - if treeSym == fnSym && defn.isFunctionClass(fnSym) then - report.log(i"eta reducing $tree --> $fn") - fn - else tree + && isPurePath(fn) + && fn.tpe <:< tree.tpe + && defn.isFunctionClass(fn.tpe.widen.typeSymbol) => + report.log(i"eta reducing $tree --> $fn") + fn case _ => tree case _ => tree From 3e1dd10f574f87a28c4a2cd2ee22e2d528b5dc4a Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 4 Jan 2022 22:02:58 +0100 Subject: [PATCH 0975/1244] Simpler test --- tests/run/contextual-closure-unwrapping.check | 1 - tests/run/contextual-closure-unwrapping.scala | 83 ------------------- tests/run/i10889.scala | 25 ++++++ 3 files changed, 25 insertions(+), 84 deletions(-) delete mode 100644 tests/run/contextual-closure-unwrapping.check delete mode 100644 tests/run/contextual-closure-unwrapping.scala create mode 100644 tests/run/i10889.scala diff --git a/tests/run/contextual-closure-unwrapping.check b/tests/run/contextual-closure-unwrapping.check deleted file mode 100644 index 27ba77ddaf61..000000000000 --- a/tests/run/contextual-closure-unwrapping.check +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/tests/run/contextual-closure-unwrapping.scala b/tests/run/contextual-closure-unwrapping.scala deleted file mode 100644 index 18a1e5f9e5e1..000000000000 --- a/tests/run/contextual-closure-unwrapping.scala +++ /dev/null @@ -1,83 +0,0 @@ -import scala.annotation.tailrec - -import java.lang.management.ManagementFactory -import java.lang.management.RuntimeMXBean - -import scala.jdk.CollectionConverters._ - -object Test { - trait Txn {} - type AtomicOp[Z] = Txn ?=> Z - type VanillaAtomicOp[Z] = Txn => Z - - object AbortAndRetry extends scala.util.control.ControlThrowable("abort and retry") {} - - def beginTxn:Txn = new Txn {} - - @tailrec def retryN[Z](n:Int)(txn:AtomicOp[Z], i:Int = 0):Z = { - try { - given Txn = beginTxn - val ret:Z = txn - if(i < n) { throw AbortAndRetry } - ret - } catch { - case AbortAndRetry => retryN(n)(txn, i + 1) - } - } - - @tailrec def safeRetryN[Z](n:Int)(txn:VanillaAtomicOp[Z], i:Int = 0):Z = { - try { - given Txn = beginTxn - val ret:Z = txn.asInstanceOf[AtomicOp[Z]] - if(i < n) { throw AbortAndRetry } - ret - } catch { - case AbortAndRetry => safeRetryN(n)(txn, i + 1) - } - } - - object StackSize { - def unapply(arg:String):Option[Int] = { - Option(arg match { - case s"-Xss$rest" => rest - case s"-XX:ThreadStackSize=$rest" => rest - case _ => null - }).map{ rest => - val shift = (rest.toLowerCase.last match { - case 'k' => 10 - case 'm' => 20 - case 'g' => 30 - case _ => 0 - }) - (if(shift > 0) { - rest.dropRight(1) - } else { - rest - }).toInt << shift - } - } - } - def main(args:Array[String]) = { - val arguments = ManagementFactory.getRuntimeMXBean.getInputArguments - // 64bit VM defaults to 1024K / 1M stack size, 32bit defaults to 320k - // Use 1024 as upper bound. - val maxStackSize:Int = arguments.asScala.reverseIterator.collectFirst{case StackSize(stackSize) => stackSize}.getOrElse(1 << 20) - - val testTxn:VanillaAtomicOp[Boolean] = { - (txn:Txn) => - given Txn = txn - true - } - - Console.println(try { - // maxStackSize is a good upper bound on linear stack growth - // without assuming too much about frame size - // (1 byte / frame is conservative even for a z80) - retryN(maxStackSize)(testTxn.asInstanceOf[AtomicOp[Boolean]]) == safeRetryN(maxStackSize)(testTxn) - } catch { - case e:StackOverflowError => - Console.println(s"Exploded after ${e.getStackTrace.length} frames") - false - }) - } -} \ No newline at end of file diff --git a/tests/run/i10889.scala b/tests/run/i10889.scala new file mode 100644 index 000000000000..130b6d2d9636 --- /dev/null +++ b/tests/run/i10889.scala @@ -0,0 +1,25 @@ +import scala.annotation.tailrec +import scala.util.chaining.given + +object Test { + class Ctx + type Op[A] = Ctx ?=> A + + var min = Int.MaxValue + var max = 0 + def stk = new Throwable().getStackTrace.length + + @tailrec def f[A](n: Int)(op: Op[A]): A = + val depth = stk + min = min.min(depth) + max = max.max(depth) + given Ctx = Ctx() + if (n > 0) f(n-1)(op) + else op + + def g(ctx: Ctx) = stk + + def main(args: Array[String]): Unit = + val extra = 3 + f(10)(Ctx ?=> g(summon[Ctx])).tap(res => assert(res <= max + extra, s"min $min, max $max, ran g at $res")) +} \ No newline at end of file From d9da117faffe171aebc513857f940a8627681d06 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 5 Jan 2022 11:37:20 +0100 Subject: [PATCH 0976/1244] Add comment to phase --- compiler/src/dotty/tools/dotc/Compiler.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala index 2bdf33b259fc..14664af30c9e 100644 --- a/compiler/src/dotty/tools/dotc/Compiler.scala +++ b/compiler/src/dotty/tools/dotc/Compiler.scala @@ -106,7 +106,7 @@ class Compiler { List(new ElimErasedValueType, // Expand erased value types to their underlying implmementation types new PureStats, // Remove pure stats from blocks new VCElideAllocations, // Peep-hole optimization to eliminate unnecessary value class allocations - new EtaReduce, + new EtaReduce, // Reduce eta expansions of pure paths to the underlying function reference new ArrayApply, // Optimize `scala.Array.apply([....])` and `scala.Array.apply(..., [....])` into `[...]` new sjs.AddLocalJSFakeNews, // Adds fake new invocations to local JS classes in calls to `createLocalJSClass` new ElimPolyFunction, // Rewrite PolyFunction subclasses to FunctionN subclasses From be4f651c9ff1f62b13a64519deedd376a6db715a Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 3 Jan 2022 12:01:42 +0100 Subject: [PATCH 0977/1244] Remove reflect TypeApply TypeVars Fixes #14185 --- .../quoted/runtime/impl/QuotesImpl.scala | 6 +- tests/pos-macros/i14185/Macro_1.scala | 60 +++++++++++++++++++ tests/pos-macros/i14185/Test_2.scala | 2 + 3 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 tests/pos-macros/i14185/Macro_1.scala create mode 100644 tests/pos-macros/i14185/Test_2.scala diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala index 3de7f0bfc670..d261edf5c3b2 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala @@ -1882,13 +1882,13 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler object AppliedType extends AppliedTypeModule: def unapply(x: AppliedType): (TypeRepr, List[TypeRepr]) = - (x.tycon, x.args) + (AppliedTypeMethods.tycon(x), AppliedTypeMethods.args(x)) end AppliedType given AppliedTypeMethods: AppliedTypeMethods with extension (self: AppliedType) - def tycon: TypeRepr = self.tycon - def args: List[TypeRepr] = self.args + def tycon: TypeRepr = self.tycon.stripTypeVar + def args: List[TypeRepr] = self.args.mapConserve(_.stripTypeVar) end extension end AppliedTypeMethods diff --git a/tests/pos-macros/i14185/Macro_1.scala b/tests/pos-macros/i14185/Macro_1.scala new file mode 100644 index 000000000000..c30f65dac67c --- /dev/null +++ b/tests/pos-macros/i14185/Macro_1.scala @@ -0,0 +1,60 @@ +import scala.quoted.* + +object Test { + inline def foo[A, M[_]]: Unit = ${ fooImpl[A, M] } + + private def fooImpl[A, M[_]]( + using + q: Quotes, + tc: Type[M], + pt: Type[A] + ): Expr[Unit] = { + import q.reflect.* + + val ptpe = TypeRepr.of[A] + val neededGivenType = TypeRepr.of[M](using tc).appliedTo(ptpe) + + val neededGiven: Option[Term] = Implicits.search(neededGivenType) match { + case suc: ImplicitSearchSuccess => + Some(suc.tree) + + case _ => + None + } + + neededGiven.map(_.show) + + '{ () } + } +} + +// --- + +/** Type level evidence that type `A` is not type `B`. */ +final class IsNot[A, B]() { + override val toString = "not" +} + +object IsNot { + implicit def defaultEvidence[A, B]: IsNot[A, B] = new IsNot[A, B]() + + @annotation.implicitAmbiguous("Could not prove type ${A} is not (IsNot) ${A}") + implicit def ambiguousEvidence1[A]: IsNot[A, A] = null + implicit def ambiguousEvidence2[A]: IsNot[A, A] = null +} + +// --- + +sealed trait SomeTypeclass[T] + +object SomeTypeclass extends SomeTypeclassLowPrio { + + given collection[T, Repr <: Iterable[T]]( + using SomeTypeclass[T], + Repr IsNot Option[T] + ): SomeTypeclass[Repr] = new SomeTypeclass[Repr] {} +} + +sealed trait SomeTypeclassLowPrio { + given int: SomeTypeclass[Int] = new SomeTypeclass[Int] {} +} diff --git a/tests/pos-macros/i14185/Test_2.scala b/tests/pos-macros/i14185/Test_2.scala new file mode 100644 index 000000000000..0dbe4b5ea3b7 --- /dev/null +++ b/tests/pos-macros/i14185/Test_2.scala @@ -0,0 +1,2 @@ +def test = + Test.foo[Seq[Int], SomeTypeclass] From c3f7a2d8f456c942971f696ca988d716422ad603 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 3 Jan 2022 13:09:01 +0100 Subject: [PATCH 0978/1244] Add hint on -Xcheck-macro scope extrusion failure Fixes #14137 --- .../quoted/runtime/impl/ScopeException.scala | 5 ++++ tests/neg-macros/i14137/Macro_1.scala | 23 +++++++++++++++++++ tests/neg-macros/i14137/Test_2.scala | 6 +++++ tests/pos-macros/i14137/Macro_1.scala | 23 +++++++++++++++++++ tests/pos-macros/i14137/Test_2.scala | 6 +++++ 5 files changed, 63 insertions(+) create mode 100644 tests/neg-macros/i14137/Macro_1.scala create mode 100644 tests/neg-macros/i14137/Test_2.scala create mode 100644 tests/pos-macros/i14137/Macro_1.scala create mode 100644 tests/pos-macros/i14137/Test_2.scala diff --git a/compiler/src/scala/quoted/runtime/impl/ScopeException.scala b/compiler/src/scala/quoted/runtime/impl/ScopeException.scala index ae16d7434a18..d65328bb5405 100644 --- a/compiler/src/scala/quoted/runtime/impl/ScopeException.scala +++ b/compiler/src/scala/quoted/runtime/impl/ScopeException.scala @@ -33,4 +33,9 @@ object ScopeException: | |Use stack: |${currentScope.stack.mkString("\t", "\n\t", "\n")} + | + |Hint: A common reason for this to happen is when a `def` that creates a `'{...}` + | captures an outer instance of `Quotes`. If this `def` is called in a splice + | it will not track the `Quotes` provided by that particular splice. + | To fix it add a `given Quotes` to this `def`. """.stripMargin) diff --git a/tests/neg-macros/i14137/Macro_1.scala b/tests/neg-macros/i14137/Macro_1.scala new file mode 100644 index 000000000000..3b3d23fa34ee --- /dev/null +++ b/tests/neg-macros/i14137/Macro_1.scala @@ -0,0 +1,23 @@ +package x + +import scala.quoted._ + +object Macro: + + inline def genOp(inline f:Int): Int = ${ + genOpImpl('f) + } + + def genOpImpl(f: Expr[Int])(using Quotes): Expr[Int] = { + + def firstOp(): Expr[Int] = + '{ + var x=1 + ${secondOp('x,f)} + } + + def secondOp(x:Expr[Int], y:Expr[Int]): Expr[Int] = + '{ $x + $y } + + firstOp() + } diff --git a/tests/neg-macros/i14137/Test_2.scala b/tests/neg-macros/i14137/Test_2.scala new file mode 100644 index 000000000000..917e68dc7583 --- /dev/null +++ b/tests/neg-macros/i14137/Test_2.scala @@ -0,0 +1,6 @@ +package x + +object Main: + + def main(args: Array[String]):Unit = + Macro.genOp(10) // error diff --git a/tests/pos-macros/i14137/Macro_1.scala b/tests/pos-macros/i14137/Macro_1.scala new file mode 100644 index 000000000000..e4a6fdc4a7be --- /dev/null +++ b/tests/pos-macros/i14137/Macro_1.scala @@ -0,0 +1,23 @@ +package x + +import scala.quoted._ + +object Macro: + + inline def genOp(inline f:Int): Int = ${ + genOpImpl('f) + } + + def genOpImpl(f: Expr[Int])(using Quotes): Expr[Int] = { + + def firstOp()(using Quotes): Expr[Int] = + '{ + var x=1 + ${secondOp('x,f)} + } + + def secondOp(x:Expr[Int], y:Expr[Int])(using Quotes): Expr[Int] = + '{ $x + $y } + + firstOp() + } diff --git a/tests/pos-macros/i14137/Test_2.scala b/tests/pos-macros/i14137/Test_2.scala new file mode 100644 index 000000000000..4d9c893f5477 --- /dev/null +++ b/tests/pos-macros/i14137/Test_2.scala @@ -0,0 +1,6 @@ +package x + +object Main: + + def main(args: Array[String]):Unit = + Macro.genOp(10) From 0a724afc2968fd767acaffcf04b099c46d14ff31 Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Sun, 9 Jan 2022 14:08:59 +0200 Subject: [PATCH 0979/1244] added -Xmacro-settings option and API with the same behaviour as in Scala2 added test-case from #12039 with workarround against changes in compiler Co-authored-by: David Barri Co-authored-by: Nicolas Stucki --- .../tools/dotc/config/ScalaSettings.scala | 2 ++ .../quoted/runtime/impl/QuotesImpl.scala | 1 + .../dotty/tools/dotc/CompilationTests.scala | 2 ++ library/src/scala/quoted/Quotes.scala | 9 +++++ project/MiMaFilters.scala | 27 ++++++-------- .../Xmacro-settings/compileTimeEnv.check | 6 ++++ .../compileTimeEnv/Logging.scala | 35 +++++++++++++++++++ .../compileTimeEnv/MacroEnv.scala | 25 +++++++++++++ .../Xmacro-settings/compileTimeEnv/Test.scala | 30 ++++++++++++++++ .../Xmacro-settings/simple/M1.scala | 15 ++++++++ .../Xmacro-settings/simple/Test.scala | 10 ++++++ 11 files changed, 145 insertions(+), 17 deletions(-) create mode 100644 tests/run-custom-args/Xmacro-settings/compileTimeEnv.check create mode 100644 tests/run-custom-args/Xmacro-settings/compileTimeEnv/Logging.scala create mode 100644 tests/run-custom-args/Xmacro-settings/compileTimeEnv/MacroEnv.scala create mode 100644 tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala create mode 100644 tests/run-custom-args/Xmacro-settings/simple/M1.scala create mode 100644 tests/run-custom-args/Xmacro-settings/simple/Test.scala diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index 9ae095ae9bca..45cc3406a736 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -234,6 +234,8 @@ private sealed trait XSettings: def isTruthy(using Context) = XmixinForceForwarders.value == "true" def isAtLeastJunit(using Context) = isTruthy || XmixinForceForwarders.value == "junit" } + + val XmacroSettings: Setting[List[String]] = MultiStringSetting("-Xmacro-settings", "setting1,setting2,..settingN", "List of settings which exposed to the macros") end XSettings /** -Y "Forking" as in forked tongue or "Private" settings */ diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala index d261edf5c3b2..ae3067a894d7 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala @@ -78,6 +78,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler object CompilationInfo extends CompilationInfoModule: def isWhileTyping: Boolean = !ctx.isAfterTyper + def XmacroSettings: List[String] = ctx.settings.XmacroSettings.value end CompilationInfo extension (expr: Expr[Any]) diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index 87e273b786ec..cfb6cf3f65c7 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -207,6 +207,8 @@ class CompilationTests { compileFile("tests/run-custom-args/defaults-serizaliable-no-forwarders.scala", defaultOptions and "-Xmixin-force-forwarders:false"), compileFilesInDir("tests/run-custom-args/erased", defaultOptions.and("-language:experimental.erasedDefinitions")), compileFilesInDir("tests/run-custom-args/fatal-warnings", defaultOptions.and("-Xfatal-warnings")), + compileDir("tests/run-custom-args/Xmacro-settings/simple", defaultOptions.and("-Xmacro-settings:one,two,three")), + compileDir("tests/run-custom-args/Xmacro-settings/compileTimeEnv", defaultOptions.and("-Xmacro-settings:a,b=1,c.b.a=x.y.z=1,myLogger.level=INFO")), compileFilesInDir("tests/run-deep-subtype", allowDeepSubtypes), compileFilesInDir("tests/run", defaultOptions.and("-Ysafe-init")) ).checkRuns() diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala index a375709844db..f5decee041f4 100644 --- a/library/src/scala/quoted/Quotes.scala +++ b/library/src/scala/quoted/Quotes.scala @@ -238,6 +238,15 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => * This will be true when the macro is used in a transparent inline. */ def isWhileTyping: Boolean + + /** Expose macro-specific settings as a list of strings. + * Settings can be set from command line with help of -Xmacro-settings options. + * + * These will be used to expand any transparent macros or any non-transparent macro that is forced to expand while expanding the transparent macro. + * Non-transparent macros are not guaranteed to be expanded with the same set of settings. + */ + @experimental + def XmacroSettings: List[String] } diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index fe9c7987a6b3..097a82ff2ef0 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -17,22 +17,15 @@ object MiMaFilters { ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.float$"), ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.long"), ProblemFilters.exclude[MissingClassProblem]("scala.compiletime.ops.long$"), - // LazyVals - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.objCAS"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.objCAS"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.evaluating"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.getStaticOffset"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.nullValued"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.objCas"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waiting"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waitingAwaitRelease"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waitingRelease"), - ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Evaluating$"), - ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$NULL$"), - ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Waiting"), - ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.LazyVals.Evaluating"), - ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.LazyVals.NULL"), + ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#CompilationInfoModule.XmacroSettings"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#CompilationInfoModule.XmacroSettings"), + + // Should have been added in 3.1.0 + // These are only allowed on imports and therefore should not be present in binaries emitted before + // this addition of these members and therefore should not cause any conflicts. + ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1-migration"), + ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$minusmigration$"), ) } diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv.check b/tests/run-custom-args/Xmacro-settings/compileTimeEnv.check new file mode 100644 index 000000000000..61075d3bb6aa --- /dev/null +++ b/tests/run-custom-args/Xmacro-settings/compileTimeEnv.check @@ -0,0 +1,6 @@ +I'm a info msg +I'm a warn msg +a = [] +b = [1] +c.b.a = [x.y.z=1] +wat is not defined diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Logging.scala b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Logging.scala new file mode 100644 index 000000000000..702097671924 --- /dev/null +++ b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Logging.scala @@ -0,0 +1,35 @@ +import scala.compiletime.* +import scala.quoted.* + + +object Logging { + + // Just use your imagination for now :) + private inline val Trace = 0 + private inline val Debug = 1 + private inline val Info = 2 + private inline val Warn = 3 + + private transparent inline def chosenThreshold: Int = ${ + choosenTresholdImpl + } + + + private def choosenTresholdImpl(using Quotes):Expr[Int] = + import quotes.reflect.* + MacroEnv.getInMacro("myLogger.level") match + case Some("TRACE") => Expr(Trace) + case Some("DEBUG") => Expr(Debug) + case Some("INFO") => Expr(Info) + case Some("WARN") => Expr(Warn) + case Some(x) => report.errorAndAbort("Unsupported logging level: " + x) + case None => Expr(Trace) + + private inline def log(inline lvl: Int, inline msg: String): Unit = + inline if lvl >= chosenThreshold then println(msg) + + inline def trace(inline msg: String): Unit = log(Trace, msg) + inline def debug(inline msg: String): Unit = log(Debug, msg) + inline def info (inline msg: String): Unit = log(Info , msg) + inline def warn (inline msg: String): Unit = log(Warn , msg) +} diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv/MacroEnv.scala b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/MacroEnv.scala new file mode 100644 index 000000000000..bde3719396aa --- /dev/null +++ b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/MacroEnv.scala @@ -0,0 +1,25 @@ +import scala.quoted.* + +object MacroEnv { + + transparent inline def get(inline key:String):Option[String] = ${ + getImpl('key) + } + + def getImpl(key:Expr[String])(using Quotes):Expr[Option[String]] = { + import quotes.reflect.* + val retval = getInMacro(key.valueOrAbort) + Expr(retval) + } + + def getInMacro(key:String)(using Quotes):Option[String] = { + import quotes.reflect.* + val keyEq = key + "=" + CompilationInfo.XmacroSettings.collectFirst{ + case v if v == key => "" + case v if v.startsWith(keyEq) => + v.substring(keyEq.length) + } + } + +} diff --git a/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala new file mode 100644 index 000000000000..7cd9b03b7bb6 --- /dev/null +++ b/tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala @@ -0,0 +1,30 @@ +import scala.compiletime.* + +object Test { + import Logging.* + + def main(args: Array[String]): Unit = { + runLog() + runBasic() + } + + def runLog(): Unit = { + trace("I'm a trace msg") + debug("I'm a debug msg") + info("I'm a info msg") + warn("I'm a warn msg") + } + + def runBasic(): Unit = { + printEnv("a") + printEnv("b") + printEnv("c.b.a") + printEnv("wat") + } + + inline def printEnv(inline k: String): Unit = + inline MacroEnv.get(k) match + case Some(v) => println(s"$k = [$v]") + case None => println(k + " is not defined") + +} diff --git a/tests/run-custom-args/Xmacro-settings/simple/M1.scala b/tests/run-custom-args/Xmacro-settings/simple/M1.scala new file mode 100644 index 000000000000..1210d1abe05e --- /dev/null +++ b/tests/run-custom-args/Xmacro-settings/simple/M1.scala @@ -0,0 +1,15 @@ +package x + +import scala.quoted.* + +object M: + + inline def settingsContains(inline x:String): Boolean = ${ + settingsContainsImpl('x) + } + + def settingsContainsImpl(x:Expr[String])(using Quotes): Expr[Boolean] = + import quotes.reflect.* + val v = x.valueOrAbort + val r = CompilationInfo.XmacroSettings.contains(v) + Expr(r) diff --git a/tests/run-custom-args/Xmacro-settings/simple/Test.scala b/tests/run-custom-args/Xmacro-settings/simple/Test.scala new file mode 100644 index 000000000000..97587362c835 --- /dev/null +++ b/tests/run-custom-args/Xmacro-settings/simple/Test.scala @@ -0,0 +1,10 @@ +import x.* + +object Test { + + def main(args: Array[String]):Unit = + assert(M.settingsContains("one")) + assert(!M.settingsContains("notwo")) + assert(M.settingsContains("two")) + +} From 512f4edf535def646e7e14e2cd2642bb2773bd93 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 5 Jan 2022 18:07:37 +0100 Subject: [PATCH 0980/1244] Re-type implicit candidate is expected type is context function Fixes #14214 --- .../dotty/tools/dotc/typer/ErrorReporting.scala | 2 +- .../src/dotty/tools/dotc/typer/Implicits.scala | 9 +++++++-- tests/pos/i14214.scala | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 tests/pos/i14214.scala diff --git a/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala b/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala index a85197671287..f64b970b5c80 100644 --- a/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala +++ b/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala @@ -240,7 +240,6 @@ object ErrorReporting { def err(using Context): Errors = new Errors } - class ImplicitSearchError( arg: tpd.Tree, pt: Type, @@ -249,6 +248,7 @@ class ImplicitSearchError( ignoredInstanceNormalImport: => Option[SearchSuccess], importSuggestionAddendum: => String )(using ctx: Context) { + def missingArgMsg = arg.tpe match { case ambi: AmbiguousImplicits => (ambi.alt1, ambi.alt2) match { diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index c9c73c758115..4824031f12bc 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -1050,8 +1050,13 @@ trait Implicits: val generated: Tree = tpd.ref(ref).withSpan(span.startPos) val locked = ctx.typerState.ownedVars val adapted = - if (argument.isEmpty) - adapt(generated, pt.widenExpr, locked) + if argument.isEmpty then + if defn.isContextFunctionType(pt) then + // need to go through typed, to build the context closure + typed(untpd.TypedSplice(generated), pt, locked) + else + // otherwise we can skip typing and go directly to adapt + adapt(generated, pt.widenExpr, locked) else { def untpdGenerated = untpd.TypedSplice(generated) def producesConversion(info: Type): Boolean = info match diff --git a/tests/pos/i14214.scala b/tests/pos/i14214.scala new file mode 100644 index 000000000000..9bf1f8b5ff75 --- /dev/null +++ b/tests/pos/i14214.scala @@ -0,0 +1,16 @@ +class Dummy +given Dummy = ??? +trait Foo +given foo: Foo = ??? +trait Bar +given bar(using Dummy): Bar = ??? + +object Test: + summon[Dummy ?=> Foo] // was error + summon[Dummy ?=> Foo](using foo) // works + summon[Dummy ?=> Foo](using (_: Dummy) ?=> foo) // works + summon[Dummy ?=> Bar] + summon[Dummy ?=> Bar](using bar) // works + summon[Dummy ?=> Bar](using (_: Dummy) ?=> bar) // works + + From cb3a180ef108534d4669063ce922de5496a3bcd9 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 11 Jan 2022 15:44:21 +0100 Subject: [PATCH 0981/1244] Disallow erased inline definitions The issue with the combination is that the `erased` semantics get lost as the code is inlined and the reference is removed. This implies that when we check for references to erased definitions we will not find it (exaclty as with inline alone). --- compiler/src/dotty/tools/dotc/typer/Checking.scala | 3 +++ tests/pos-custom-args/erased/i7878.scala | 4 ++-- tests/pos-custom-args/erasedInline.scala | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 tests/pos-custom-args/erasedInline.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index f4ec37881d6c..85eba072f7a8 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -541,6 +541,9 @@ object Checking { checkCombination(Abstract, Override) checkCombination(Private, Override) checkCombination(Lazy, Inline) + // The issue with `erased inline` is that the erased semantics get lost + // as the code is inlined and the reference is removed before the erased usage check. + checkCombination(Erased, Inline) checkNoConflict(Lazy, ParamAccessor, s"parameter may not be `lazy`") } diff --git a/tests/pos-custom-args/erased/i7878.scala b/tests/pos-custom-args/erased/i7878.scala index 18005e81eab3..63b082d52ca0 100644 --- a/tests/pos-custom-args/erased/i7878.scala +++ b/tests/pos-custom-args/erased/i7878.scala @@ -2,7 +2,7 @@ object Boom { import scala.compiletime.* trait Fail[A <: Int, B <: Int] - erased transparent inline given fail[X <: Int, Y <: Int]: Fail[X, Y] = { + transparent inline given fail[X <: Int, Y <: Int]: Fail[X, Y] = { scala.compiletime.summonFrom { case t: Fail[X, y] if constValue[y] < constValue[Y] => ??? } @@ -12,4 +12,4 @@ object Boom { given ev1: Fail[a.type, 2] = null summon[Fail[a.type, 3]] -} \ No newline at end of file +} diff --git a/tests/pos-custom-args/erasedInline.scala b/tests/pos-custom-args/erasedInline.scala new file mode 100644 index 000000000000..6230dfb3dcb2 --- /dev/null +++ b/tests/pos-custom-args/erasedInline.scala @@ -0,0 +1,4 @@ +import language.experimental.erasedDefinitions + +erased inline def f: Unit = () // error: illegal combination of modifiers: `erased` and `inline` for: method f +inline def g: Unit = () From 1ffb97677c086f0bbfa0abf3ec309b9129391e33 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 12 Jan 2022 08:56:26 +0000 Subject: [PATCH 0982/1244] Move tastyBootstrap to a new test file The test "tastyBootstrap" is different to the rest of the compilation tests because it actually recompiles the compiler sources, which can interfer when using CompilationTests. --- .../dotty/tools/dotc/CompilationTests.scala | 78 ----------- .../tools/dotc/TastyBootstrapTests.scala | 121 ++++++++++++++++++ 2 files changed, 121 insertions(+), 78 deletions(-) create mode 100644 compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index cfb6cf3f65c7..88eab8d131e6 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -232,84 +232,6 @@ class CompilationTests { ).checkCompile() } - /** The purpose of this test is three-fold, being able to compile dotty - * bootstrapped, and making sure that TASTY can link against a compiled - * version of Dotty, and compiling the compiler using the SemanticDB generation - */ - @Test def tastyBootstrap: Unit = { - implicit val testGroup: TestGroup = TestGroup("tastyBootstrap/tests") - val libGroup = TestGroup("tastyBootstrap/lib") - val tastyCoreGroup = TestGroup("tastyBootstrap/tastyCore") - val dotty1Group = TestGroup("tastyBootstrap/dotty1") - val dotty2Group = TestGroup("tastyBootstrap/dotty2") - - // Make sure that the directory is clean - dotty.tools.io.Directory(defaultOutputDir + "tastyBootstrap").deleteRecursively() - - val opt = TestFlags( - List( - // compile with bootstrapped library on cp: - defaultOutputDir + libGroup + "/lib/", - // and bootstrapped tasty-core: - defaultOutputDir + tastyCoreGroup + "/tastyCore/", - // as well as bootstrapped compiler: - defaultOutputDir + dotty1Group + "/dotty1/", - // and the other compiler dependencies: - Properties.compilerInterface, Properties.scalaLibrary, Properties.scalaAsm, - Properties.dottyInterfaces, Properties.jlineTerminal, Properties.jlineReader, - ).mkString(File.pathSeparator), - Array("-Ycheck-reentrant", "-language:postfixOps", "-Xsemanticdb") - ) - - val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-bootstrapped")) - val librarySources = libraryDirs.flatMap(sources(_)) - - val lib = - compileList("lib", librarySources, - defaultOptions.and("-Ycheck-reentrant", - "-language:experimental.erasedDefinitions", // support declaration of scala.compiletime.erasedValue - // "-source", "future", // TODO: re-enable once we allow : @unchecked in pattern definitions. Right now, lots of narrowing pattern definitions fail. - ))(libGroup) - - val tastyCoreSources = sources(Paths.get("tasty/src")) - val tastyCore = compileList("tastyCore", tastyCoreSources, opt)(tastyCoreGroup) - - val compilerSources = sources(Paths.get("compiler/src")) ++ sources(Paths.get("compiler/src-bootstrapped")) - val compilerManagedSources = sources(Properties.dottyCompilerManagedSources) - - val dotty1 = compileList("dotty1", compilerSources ++ compilerManagedSources, opt)(dotty1Group) - val dotty2 = compileList("dotty2", compilerSources ++ compilerManagedSources, opt)(dotty2Group) - - val tests = { - lib.keepOutput :: tastyCore.keepOutput :: dotty1.keepOutput :: aggregateTests( - dotty2, - compileShallowFilesInDir("compiler/src/dotty/tools", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/dotc", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/dotc/ast", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/dotc/config", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/dotc/parsing", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/dotc/printing", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/dotc/reporting", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/dotc/rewrites", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/dotc/transform", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/dotc/typer", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/dotc/util", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/backend", opt), - compileShallowFilesInDir("compiler/src/dotty/tools/backend/jvm", opt), - compileList("managed-sources", compilerManagedSources, opt) - ).keepOutput :: Nil - }.map(_.checkCompile()) - - def assertExists(path: String) = assertTrue(Files.exists(Paths.get(path))) - assertExists(s"out/$libGroup/lib/") - assertExists(s"out/$tastyCoreGroup/tastyCore/") - assertExists(s"out/$dotty1Group/dotty1/") - assertExists(s"out/$dotty2Group/dotty2/") - compileList("idempotency", List("tests/idempotency/BootstrapChecker.scala", "tests/idempotency/IdempotencyCheck.scala"), defaultOptions).checkRuns() - - tests.foreach(_.delete()) - } - // Explicit nulls tests @Test def explicitNullsNeg: Unit = { implicit val testGroup: TestGroup = TestGroup("explicitNullsNeg") diff --git a/compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala b/compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala new file mode 100644 index 000000000000..7b1629c426d6 --- /dev/null +++ b/compiler/test/dotty/tools/dotc/TastyBootstrapTests.scala @@ -0,0 +1,121 @@ +package dotty +package tools +package dotc + +import org.junit.{ Test, BeforeClass, AfterClass } +import org.junit.Assert._ +import org.junit.Assume._ +import org.junit.experimental.categories.Category + +import java.io.File +import java.nio.file._ +import java.util.stream.{ Stream => JStream } +import scala.collection.JavaConverters._ +import scala.util.matching.Regex +import scala.concurrent.duration._ +import TestSources.sources +import vulpix._ + +class TastyBootstrapTests { + import ParallelTesting._ + import TestConfiguration._ + import CompilationTests._ + import CompilationTest.aggregateTests + + /** The purpose of this test is three-fold, being able to compile dotty + * bootstrapped, and making sure that TASTY can link against a compiled + * version of Dotty, and compiling the compiler using the SemanticDB generation + */ + @Test def tastyBootstrap: Unit = { + implicit val testGroup: TestGroup = TestGroup("tastyBootstrap/tests") + val libGroup = TestGroup("tastyBootstrap/lib") + val tastyCoreGroup = TestGroup("tastyBootstrap/tastyCore") + val dotty1Group = TestGroup("tastyBootstrap/dotty1") + val dotty2Group = TestGroup("tastyBootstrap/dotty2") + + // Make sure that the directory is clean + dotty.tools.io.Directory(defaultOutputDir + "tastyBootstrap").deleteRecursively() + + val opt = TestFlags( + List( + // compile with bootstrapped library on cp: + defaultOutputDir + libGroup + "/lib/", + // and bootstrapped tasty-core: + defaultOutputDir + tastyCoreGroup + "/tastyCore/", + // as well as bootstrapped compiler: + defaultOutputDir + dotty1Group + "/dotty1/", + // and the other compiler dependencies: + Properties.compilerInterface, Properties.scalaLibrary, Properties.scalaAsm, + Properties.dottyInterfaces, Properties.jlineTerminal, Properties.jlineReader, + ).mkString(File.pathSeparator), + Array("-Ycheck-reentrant", "-language:postfixOps", "-Xsemanticdb") + ) + + val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-bootstrapped")) + val librarySources = libraryDirs.flatMap(sources(_)) + + val lib = + compileList("lib", librarySources, + defaultOptions.and("-Ycheck-reentrant", + "-language:experimental.erasedDefinitions", // support declaration of scala.compiletime.erasedValue + // "-source", "future", // TODO: re-enable once we allow : @unchecked in pattern definitions. Right now, lots of narrowing pattern definitions fail. + ))(libGroup) + + val tastyCoreSources = sources(Paths.get("tasty/src")) + val tastyCore = compileList("tastyCore", tastyCoreSources, opt)(tastyCoreGroup) + + val compilerSources = sources(Paths.get("compiler/src")) ++ sources(Paths.get("compiler/src-bootstrapped")) + val compilerManagedSources = Properties.dottyCompilerManagedSources match + case p if Files.isDirectory(p) => sources(p) + case _ => Nil + + val dotty1 = compileList("dotty1", compilerSources ++ compilerManagedSources, opt)(dotty1Group) + val dotty2 = compileList("dotty2", compilerSources ++ compilerManagedSources, opt)(dotty2Group) + + val tests = { + lib.keepOutput :: tastyCore.keepOutput :: dotty1.keepOutput :: aggregateTests( + dotty2, + compileShallowFilesInDir("compiler/src/dotty/tools", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/dotc", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/dotc/ast", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/dotc/config", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/dotc/parsing", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/dotc/printing", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/dotc/reporting", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/dotc/rewrites", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/dotc/transform", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/dotc/typer", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/dotc/util", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/backend", opt), + compileShallowFilesInDir("compiler/src/dotty/tools/backend/jvm", opt), + compileList("managed-sources", compilerManagedSources, opt) + ).keepOutput :: Nil + }.map(_.checkCompile()) + + def assertExists(path: String) = assertTrue(Files.exists(Paths.get(path))) + assertExists(s"out/$libGroup/lib/") + assertExists(s"out/$tastyCoreGroup/tastyCore/") + assertExists(s"out/$dotty1Group/dotty1/") + assertExists(s"out/$dotty2Group/dotty2/") + compileList("idempotency", List("tests/idempotency/BootstrapChecker.scala", "tests/idempotency/IdempotencyCheck.scala"), defaultOptions).checkRuns() + + tests.foreach(_.delete()) + } +} + +object TastyBootstrapTests extends ParallelTesting { + // Test suite configuration -------------------------------------------------- + + def maxDuration = 45.seconds + def numberOfSlaves = Runtime.getRuntime.availableProcessors() + def safeMode = Properties.testsSafeMode + def isInteractive = SummaryReport.isInteractive + def testFilter = Properties.testsFilter + def updateCheckFiles: Boolean = Properties.testsUpdateCheckfile + + implicit val summaryReport: SummaryReporting = new SummaryReport + @AfterClass def tearDown(): Unit = { + super.cleanup() + summaryReport.echoSummary() + } +} From 7d9f4f256d428501f17989234addc574eb19f886 Mon Sep 17 00:00:00 2001 From: Phil Date: Tue, 11 Jan 2022 14:49:43 -0700 Subject: [PATCH 0983/1244] fix 2 problems plus add workaround for #13760 --- .../src/dotty/tools/MainGenericRunner.scala | 13 +++++++++--- .../test-resources/scripting/sqlDateError.sc | 6 ++++++ .../tools/scripting/BashScriptsTests.scala | 21 +++++++++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100755 compiler/test-resources/scripting/sqlDateError.sc diff --git a/compiler/src/dotty/tools/MainGenericRunner.scala b/compiler/src/dotty/tools/MainGenericRunner.scala index fbc947ce175a..65ee672f0342 100644 --- a/compiler/src/dotty/tools/MainGenericRunner.scala +++ b/compiler/src/dotty/tools/MainGenericRunner.scala @@ -81,6 +81,9 @@ case class Settings( def withSave: Settings = this.copy(save = true) + def noSave: Settings = + this.copy(save = false) + def withModeShouldBePossibleRun: Settings = this.copy(modeShouldBePossibleRun = true) @@ -135,6 +138,8 @@ object MainGenericRunner { ) case "-save" :: tail => process(tail, settings.withSave) + case "-nosave" :: tail => + process(tail, settings.noSave) case "-with-compiler" :: tail => process(tail, settings.withCompiler) case (o @ javaOption(striped)) :: tail => @@ -207,18 +212,20 @@ object MainGenericRunner { case ExecuteMode.Script => val targetScript = Paths.get(settings.targetScript).toFile val targetJar = settings.targetScript.replaceAll("[.][^\\/]*$", "")+".jar" - val precompiledJar = Paths.get(targetJar).toFile + val precompiledJar = File(targetJar) val mainClass = if !precompiledJar.isFile then "" else Jar(targetJar).mainClass.getOrElse("") - val jarIsValid = mainClass.nonEmpty && precompiledJar.lastModified >= targetScript.lastModified + val jarIsValid = mainClass.nonEmpty && precompiledJar.lastModified >= targetScript.lastModified && settings.save if jarIsValid then // precompiledJar exists, is newer than targetScript, and manifest defines a mainClass sys.props("script.path") = targetScript.toPath.toAbsolutePath.normalize.toString val scalaClasspath = ClasspathFromClassloader(Thread.currentThread().getContextClassLoader).split(classpathSeparator) val newClasspath = (settings.classPath.flatMap(_.split(classpathSeparator).filter(_.nonEmpty)) ++ removeCompiler(scalaClasspath) :+ ".").map(File(_).toURI.toURL) - if mainClass.nonEmpty then + val res = if mainClass.nonEmpty then ObjectRunner.runAndCatch(newClasspath :+ File(targetJar).toURI.toURL, mainClass, settings.scriptArgs) else Some(IllegalArgumentException(s"No main class defined in manifest in jar: $precompiledJar")) + errorFn("", res) + else val properArgs = List("-classpath", settings.classPath.mkString(classpathSeparator)).filter(Function.const(settings.classPath.nonEmpty)) diff --git a/compiler/test-resources/scripting/sqlDateError.sc b/compiler/test-resources/scripting/sqlDateError.sc new file mode 100755 index 000000000000..b9a47d245d1a --- /dev/null +++ b/compiler/test-resources/scripting/sqlDateError.sc @@ -0,0 +1,6 @@ +#!bin/scala -nosave + +def main(args: Array[String]): Unit = { + println(new java.sql.Date(100L)) + System.err.println("SCALA_OPTS="+Option(System.getenv("SCALA_OPTS")).getOrElse("")) +} diff --git a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala index 07fa37a4eb5b..547693c7401f 100644 --- a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala +++ b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala @@ -189,3 +189,24 @@ class BashScriptsTests: if valid then printf(s"\n===> success: classpath begins with %s, as reported by [%s]\n", workingDirectory, scriptFile.getName) assert(valid, s"script ${scriptFile.absPath} did not report valid java.class.path first entry") + /* + * verify that individual scripts can override -save with -nosave (needed to address #13760). + */ + @Test def sqlDateTest = + val scriptBase = "sqlDateError" + val scriptFile = testFiles.find(_.getName == s"$scriptBase.sc").get + val testJar = testFile(s"$scriptBase.jar") // jar should not be created when scriptFile runs + printf("===> verify '-save' is cancelled by '-nosave' in script hashbang.`\n") + val (validTest, exitCode, stdout, stderr) = bashCommand(s"SCALA_OPTS=-save ${scriptFile.absPath}") + printf("stdout: %s\n", stdout.mkString("\n","\n","")) + if verifyValid(validTest) then + // the script should print '1969-12-31' or '1970-01-01', depending on time zone + // stdout can be polluted with an ANSI color prefix, in some test environments + val valid = stdout.mkString("").matches(""".*\d{4}-\d{2}-\d{2}.*""") + if (!valid) then + stdout.foreach { printf("stdout[%s]\n", _) } + stderr.foreach { printf("stderr[%s]\n", _) } + if valid then printf(s"\n===> success: scripts can override -save via -nosave\n") + assert(valid, s"script ${scriptFile.absPath} reported unexpected value for java.sql.Date ${stdout.mkString("\n")}") + assert(!testJar.exists,s"unexpected, jar file [$testJar] was created") + From a4a852404610a78d6988b67936429a56d50bd75b Mon Sep 17 00:00:00 2001 From: "Yang, Bo" Date: Mon, 13 Dec 2021 18:12:29 -0800 Subject: [PATCH 0984/1244] Use =>> instead of => for printing a LambdaTypeTree --- .../src/scala/quoted/runtime/impl/printers/SourceCode.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala index 77a54e23ad61..d92c16cfe54d 100644 --- a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala +++ b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala @@ -1056,7 +1056,7 @@ object SourceCode { case LambdaTypeTree(tparams, body) => printTargsDefs(tparams.zip(tparams), isDef = false) - this += highlightTypeDef(" => ") + this += highlightTypeDef(" =>> ") printTypeOrBoundsTree(body) case TypeBind(name, _) => From 4de03d7a71ceea5bf52bce8c4da1531039089e7a Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Wed, 29 Sep 2021 14:24:01 +0200 Subject: [PATCH 0985/1244] Fix #13633: Add regression test --- tests/pos/13633.scala | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 tests/pos/13633.scala diff --git a/tests/pos/13633.scala b/tests/pos/13633.scala new file mode 100644 index 000000000000..ca0f7e68e81e --- /dev/null +++ b/tests/pos/13633.scala @@ -0,0 +1,50 @@ +import scala.compiletime.{constValueTuple, constValue} + +object Sums extends App: + + println(constValueTuple[Plus[(true, true, true), (true, true)]]) // works + println(constValueTuple[Plus1[(true, true, true), (true, true)]]) // fails + println(constValueTuple[ + Reverse[PlusLoop[Reverse[(true, true, true)], Reverse[(true, true)], false]]] + ) // also works despite it's just an unfold of `Plus1` application + + type Plus[A <: Tuple, B <: Tuple] <: Tuple = (A, B) match + case (EmptyTuple, EmptyTuple) => EmptyTuple + case (a, b) => Reverse[PlusLoop[Reverse[A], Reverse[B], false]] + + type Plus1[A <: Tuple, B <: Tuple] = Reverse[PlusLoop[Reverse[A], Reverse[B], false]] + + type ReverseLoop[A, XS <: Tuple] <: Tuple = A match { + case EmptyTuple => XS + case x *: xs => ReverseLoop[xs, x *: XS] + } + + type Reverse[A] = ReverseLoop[A, EmptyTuple] + + type PlusTri[A, B, C] = (A, B, C) match + case (false, false, false) => (false, false) + case (true, false, false) | (false, true, false) | (false, false, true) => (false, true) + case (true, true, false) | (true, false, true) | (false, true, true) => (true, false) + case (true, true, true) => (true, true) + + type Inc[A <: Tuple] <: Tuple = A match + case EmptyTuple => true *: EmptyTuple + case t *: as => + t match + case false => true *: as + case true => false *: Inc[as] + + type IncT[A <: Tuple, O <: Boolean] <: Tuple = O match + case false => A + case true => Inc[A] + + type PlusLoop[A <: Tuple, B <: Tuple, O] <: Tuple = (A, B) match + case (EmptyTuple, EmptyTuple) => + O match + case true => (true *: EmptyTuple) + case false => EmptyTuple + case (EmptyTuple, B) => IncT[B, O] + case (A, EmptyTuple) => IncT[A, O] + case (a *: as, b *: bs) => + PlusTri[a, b, O] match + case (x, y) => y *: PlusLoop[as, bs, x] From 7c6d8fa5180ff67cb5214c617fa99ee6dd0cfe86 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 12 Jan 2022 16:48:48 +0000 Subject: [PATCH 0986/1244] Revert part of the impl of toolArgsFor This replays 5fc83130c9c96d807dd0108ba947f73298f0e0d9, more carefully. --- compiler/test/dotty/tools/utils.scala | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala index 868d883b5862..a9792bf2f43c 100644 --- a/compiler/test/dotty/tools/utils.scala +++ b/compiler/test/dotty/tools/utils.scala @@ -5,7 +5,8 @@ import java.io.File import java.nio.charset.StandardCharsets.UTF_8 import java.nio.file.{Files, Path => JPath} -import scala.io.{Codec, Source} +import scala.io.Source +import scala.jdk.StreamConverters._ import scala.reflect.ClassTag import scala.util.Using.resource import scala.util.chaining.given @@ -27,9 +28,9 @@ extension (str: String) def dropExtension = str.reverse.dropWhile(_ != '.').drop(1).reverse private -def withFile[T](file: File)(action: Source => T)(using Codec): T = resource(Source.fromFile(file))(action) -def readLines(f: File)(using codec: Codec = Codec.UTF8): List[String] = withFile(f)(_.getLines.toList) -def readFile(f: File)(using codec: Codec = Codec.UTF8): String = withFile(f)(_.mkString) +def withFile[T](file: File)(action: Source => T): T = resource(Source.fromFile(file, UTF_8.name))(action) +def readLines(f: File): List[String] = withFile(f)(_.getLines.toList) +def readFile(f: File): String = withFile(f)(_.mkString) private object Unthrown extends ControlThrowable @@ -44,8 +45,8 @@ def assertThrows[T <: Throwable: ClassTag](p: T => Boolean)(body: => Any): Unit case NonFatal(other) => throw AssertionError(s"Wrong exception: expected ${implicitly[ClassTag[T]]} but was ${other.getClass.getName}").tap(_.addSuppressed(other)) end assertThrows -def toolArgsFor(files: List[JPath])(using codec: Codec = Codec.UTF8): List[String] = - files.flatMap(path => toolArgsParse(readLines(path.toFile))) +def toolArgsFor(files: List[JPath]): List[String] = + files.flatMap(path => toolArgsParse(Files.lines(path, UTF_8).limit(10).toScala(List))) // Inspect the first 10 of the given lines for compiler options of the form // `// scalac: args`, `/* scalac: args`, ` * scalac: args`. @@ -63,4 +64,4 @@ def toolArgsParse(lines: List[String]): List[String] = { // but avoid picking up comments like "% scalac ./a.scala" and "$ scalac a.scala" }.map(stripped).headOption args.map(dotc.config.CommandLineParser.tokenize).getOrElse(Nil) -} +} \ No newline at end of file From a5f0eee3b9147201aac2fa46ff7aa1e62a04e4da Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 12 Jan 2022 16:47:03 +0000 Subject: [PATCH 0987/1244] Trim RichClassLoader and ScalaClassLoader --- .../dotty/tools/runner/ScalaClassLoader.scala | 213 ++---------------- 1 file changed, 24 insertions(+), 189 deletions(-) diff --git a/compiler/src/dotty/tools/runner/ScalaClassLoader.scala b/compiler/src/dotty/tools/runner/ScalaClassLoader.scala index 71c332a48846..5273a1b42752 100644 --- a/compiler/src/dotty/tools/runner/ScalaClassLoader.scala +++ b/compiler/src/dotty/tools/runner/ScalaClassLoader.scala @@ -1,31 +1,21 @@ package dotty.tools package runner -import java.lang.invoke.{MethodHandles, MethodType} - import scala.language.implicitConversions -import java.lang.{ClassLoader => JClassLoader} + +import java.lang.ClassLoader +import java.lang.invoke.{MethodHandles, MethodType} import java.lang.reflect.Modifier -import java.net.{URLClassLoader => JURLClassLoader} -import java.net.URL +import java.net.{ URL, URLClassLoader } +import java.lang.reflect.{ InvocationTargetException, UndeclaredThrowableException } +import scala.annotation.internal.sharable import scala.annotation.tailrec import scala.util.control.Exception.catching -import scala.reflect.{ClassTag, classTag} -import java.lang.reflect.InvocationTargetException -import java.lang.reflect.UndeclaredThrowableException -import dotty.tools.repl.AbstractFileClassLoader -import dotty.tools.io.AbstractFile -import dotty.tools.io.Streamable -import scala.annotation.internal.sharable -trait HasClassPath { - def classPathURLs: Seq[URL] -} - -final class RichClassLoader(private val self: JClassLoader) extends AnyVal { +final class RichClassLoader(private val self: ClassLoader) extends AnyVal { /** Executing an action with this classloader as context classloader */ - def asContext[T](action: => T): T = { + private def asContext[T](action: => T): T = { val saved = Thread.currentThread.getContextClassLoader try { ScalaClassLoader.setContext(self) ; action } finally ScalaClassLoader.setContext(saved) @@ -33,6 +23,7 @@ final class RichClassLoader(private val self: JClassLoader) extends AnyVal { /** Load and link a class with this classloader */ def tryToLoadClass[T <: AnyRef](path: String): Option[Class[T]] = tryClass(path, initialize = false) + /** Load, link and initialize a class with this classloader */ def tryToInitializeClass[T <: AnyRef](path: String): Option[Class[T]] = tryClass(path, initialize = true) @@ -40,64 +31,17 @@ final class RichClassLoader(private val self: JClassLoader) extends AnyVal { catching(classOf[ClassNotFoundException], classOf[SecurityException]) opt Class.forName(path, initialize, self).asInstanceOf[Class[T]] - /** Create an instance of a class with this classloader */ - def create(path: String): AnyRef = - tryToInitializeClass[AnyRef](path).map(_.getConstructor().newInstance()).orNull - - /** Create an instance with ctor args, or invoke errorFn before throwing. */ - def create[T <: AnyRef : ClassTag](path: String, errorFn: String => Unit)(args: AnyRef*): T = { - def fail(msg: String) = error(msg, new IllegalArgumentException(msg)) - def error(msg: String, e: Throwable) = { errorFn(msg) ; throw e } - try { - val clazz = Class.forName(path, /*initialize =*/ true, /*loader =*/ self) - if (classTag[T].runtimeClass isAssignableFrom clazz) { - val ctor = { - val maybes = clazz.getConstructors filter (c => c.getParameterCount == args.size && - (c.getParameterTypes zip args).forall { case (k, a) => k isAssignableFrom a.getClass }) - if (maybes.size == 1) maybes.head - else fail(s"Constructor must accept arg list (${args map (_.getClass.getName) mkString ", "}): ${path}") - } - (ctor.newInstance(args: _*)).asInstanceOf[T] - } else { - errorFn(s"""Loader for ${classTag[T]}: [${show(classTag[T].runtimeClass.getClassLoader)}] - |Loader for ${clazz.getName}: [${show(clazz.getClassLoader)}]""".stripMargin) - fail(s"Not a ${classTag[T]}: ${path}") - } - } catch { - case e: ClassNotFoundException => - error(s"Class not found: ${path}", e) - case e @ (_: LinkageError | _: ReflectiveOperationException) => - error(s"Unable to create instance: ${path}: ${e.toString}", e) - } - } - - /** The actual bytes for a class file, or an empty array if it can't be found. */ - def classBytes(className: String): Array[Byte] = classAsStream(className) match { - case null => Array() - case stream => Streamable.bytes(stream) - } - - /** An InputStream representing the given class name, or null if not found. */ - def classAsStream(className: String) = self.getResourceAsStream { - if (className endsWith ".class") className - else s"${className.replace('.', '/')}.class" // classNameToPath - } - /** Run the main method of a class to be loaded by this classloader */ def run(objectName: String, arguments: Seq[String]): Unit = { - val clsToRun = tryToInitializeClass(objectName) getOrElse ( - throw new ClassNotFoundException(objectName) - ) + val clsToRun = tryToInitializeClass(objectName).getOrElse(throw new ClassNotFoundException(objectName)) val method = clsToRun.getMethod("main", classOf[Array[String]]) - if (!Modifier.isStatic(method.getModifiers)) - throw new NoSuchMethodException(objectName + ".main is not static") - - try asContext(method.invoke(null, Array(arguments.toArray: AnyRef): _*)) // !!! : AnyRef shouldn't be necessary + if !Modifier.isStatic(method.getModifiers) then + throw new NoSuchMethodException(s"$objectName.main is not static") + try asContext(method.invoke(null, Array(arguments.toArray: AnyRef): _*)) catch unwrapHandler({ case ex => throw ex }) } - @tailrec - def unwrapThrowable(x: Throwable): Throwable = x match { + @tailrec private def unwrapThrowable(x: Throwable): Throwable = x match { case _: InvocationTargetException | // thrown by reflectively invoked method or constructor _: ExceptionInInitializerError | // thrown when running a static initializer (e.g. a scala module constructor) _: UndeclaredThrowableException | // invocation on a proxy instance if its invocation handler's `invoke` throws an exception @@ -107,136 +51,27 @@ final class RichClassLoader(private val self: JClassLoader) extends AnyVal { unwrapThrowable(x.getCause) case _ => x } + // Transforms an exception handler into one which will only receive the unwrapped // exceptions (for the values of wrap covered in unwrapThrowable.) - def unwrapHandler[T](pf: PartialFunction[Throwable, T]): PartialFunction[Throwable, T] = + private def unwrapHandler[T](pf: PartialFunction[Throwable, T]): PartialFunction[Throwable, T] = pf.compose({ case ex => unwrapThrowable(ex) }) - - def show(cl: ClassLoader): String = { - import scala.reflect.Selectable.reflectiveSelectable - - @tailrec - def isAbstractFileClassLoader(clazz: Class[_]): Boolean = { - if (clazz == null) return false - if (clazz == classOf[AbstractFileClassLoader]) return true - isAbstractFileClassLoader(clazz.getSuperclass) - } - def inferClasspath(cl: ClassLoader): String = cl match { - case cl: java.net.URLClassLoader if cl.getURLs != null => - (cl.getURLs mkString ",") - case cl if cl != null && isAbstractFileClassLoader(cl.getClass) => - cl.asInstanceOf[{val root: AbstractFile}].root.canonicalPath - case null => - val loadBootCp = (flavor: String) => scala.util.Properties.propOrNone(flavor + ".boot.class.path") - loadBootCp("sun") orElse loadBootCp("java") getOrElse "" - case _ => - "" - } - cl match { - case null => s"primordial classloader with boot classpath [${inferClasspath(cl)}]" - case _ => s"$cl of type ${cl.getClass} with classpath [${inferClasspath(cl)}] and parent being ${show(cl.getParent)}" - } - } } object RichClassLoader { implicit def wrapClassLoader(loader: ClassLoader): RichClassLoader = new RichClassLoader(loader) } -/** A wrapper around java.lang.ClassLoader to lower the annoyance - * of java reflection. - */ -trait ScalaClassLoader extends JClassLoader { - private def wrap = new RichClassLoader(this) - /** Executing an action with this classloader as context classloader */ - def asContext[T](action: => T): T = wrap.asContext(action) - - /** Load and link a class with this classloader */ - def tryToLoadClass[T <: AnyRef](path: String): Option[Class[T]] = wrap.tryToLoadClass[T](path) - /** Load, link and initialize a class with this classloader */ - def tryToInitializeClass[T <: AnyRef](path: String): Option[Class[T]] = wrap.tryToInitializeClass(path) - - /** Create an instance of a class with this classloader */ - def create(path: String): AnyRef = wrap.create(path) - - /** Create an instance with ctor args, or invoke errorFn before throwing. */ - def create[T <: AnyRef : ClassTag](path: String, errorFn: String => Unit)(args: AnyRef*): T = - wrap.create[T](path, errorFn)(args: _*) - - /** The actual bytes for a class file, or an empty array if it can't be found. */ - def classBytes(className: String): Array[Byte] = wrap.classBytes(className) - - /** An InputStream representing the given class name, or null if not found. */ - def classAsStream(className: String) = wrap.classAsStream(className) - - /** Run the main method of a class to be loaded by this classloader */ - def run(objectName: String, arguments: Seq[String]): Unit = wrap.run(objectName, arguments) -} - - -/** Methods for obtaining various classloaders. - * appLoader: the application classloader. (Also called the java system classloader.) - * extLoader: the extension classloader. - * bootLoader: the boot classloader. - * contextLoader: the context classloader. - */ object ScalaClassLoader { - /** Returns loaders which are already ScalaClassLoaders unaltered, - * and translates java.net.URLClassLoaders into scala URLClassLoaders. - * Otherwise creates a new wrapper. - */ - implicit def apply(cl: JClassLoader): ScalaClassLoader = cl match { - case cl: ScalaClassLoader => cl - case cl: JURLClassLoader => new URLClassLoader(cl.getURLs.toSeq, cl.getParent) - case _ => new JClassLoader(cl) with ScalaClassLoader - } - def contextLoader = apply(Thread.currentThread.getContextClassLoader) - def appLoader = apply(JClassLoader.getSystemClassLoader) - def setContext(cl: JClassLoader) = Thread.currentThread.setContextClassLoader(cl) - - class URLClassLoader(urls: Seq[URL], parent: JClassLoader) - extends JURLClassLoader(urls.toArray, parent) - with ScalaClassLoader - with HasClassPath { - private[this] var classloaderURLs: Seq[URL] = urls - def classPathURLs: Seq[URL] = classloaderURLs + def setContext(cl: ClassLoader) = Thread.currentThread.setContextClassLoader(cl) - /** Override to widen to public */ - override def addURL(url: URL) = { - classloaderURLs :+= url - super.addURL(url) - } - override def close(): Unit = { - super.close() - classloaderURLs = null - } - } - - def fromURLs(urls: Seq[URL], parent: ClassLoader = null): URLClassLoader = { - new URLClassLoader(urls, if (parent == null) bootClassLoader else parent) - } + def fromURLsParallelCapable(urls: Seq[URL], parent: ClassLoader = null): URLClassLoader = + new URLClassLoader(urls.toArray, if parent == null then bootClassLoader else parent) - def fromURLsParallelCapable(urls: Seq[URL], parent: ClassLoader = null): JURLClassLoader = { - new JURLClassLoader(urls.toArray, if (parent == null) bootClassLoader else parent) - } - - /** True if supplied class exists in supplied path */ - def classExists(urls: Seq[URL], name: String): Boolean = - (fromURLs(urls) tryToLoadClass name).isDefined - - /** Finding what jar a clazz or instance came from */ - def originOfClass(x: Class[_]): Option[URL] = - Option(x.getProtectionDomain.getCodeSource) flatMap (x => Option(x.getLocation)) - - @sharable private[this] val bootClassLoader: ClassLoader = { - if (!scala.util.Properties.isJavaAtLeast("9")) null - else { - try { + @sharable private[this] val bootClassLoader: ClassLoader = + if scala.util.Properties.isJavaAtLeast("9") then + try MethodHandles.lookup().findStatic(classOf[ClassLoader], "getPlatformClassLoader", MethodType.methodType(classOf[ClassLoader])).invoke().asInstanceOf[ClassLoader] - } catch { - case _: Throwable => - null - } - } - } + catch case _: Throwable => null + else null } From eabc7598f9b7ed110be56cea6713b9f9a3bbe41e Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 2 Dec 2021 14:12:11 +0000 Subject: [PATCH 0988/1244] repl: Add compiler options to :reset --- compiler/test-resources/repl/reset-command | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/compiler/test-resources/repl/reset-command b/compiler/test-resources/repl/reset-command index 1f10820534b2..e47b3c45f696 100644 --- a/compiler/test-resources/repl/reset-command +++ b/compiler/test-resources/repl/reset-command @@ -12,4 +12,17 @@ scala> def f(thread: Thread) = thread.stop() |method stop in class Thread is deprecated since : see corresponding Javadoc for more information. def f(thread: Thread): Unit -scala> +scala> def resetNoArgsStillWorks = 1 +def resetNoArgsStillWorks: Int + +scala>:reset + +scala> resetNoArgsStillWorks +-- [E006] Not Found Error: ----------------------------------------------------- +1 | resetNoArgsStillWorks + | ^^^^^^^^^^^^^^^^^^^^^ + | Not found: resetNoArgsStillWorks +longer explanation available when compiling with `-explain` +1 error found + +scala>:settings "-Dfoo=bar baz" From 66614218200354abff56c0ce700e0102c4f28c0e Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Sun, 16 Jan 2022 13:35:34 +0200 Subject: [PATCH 0989/1244] update dotty-cps-async to latest upstream --- community-build/community-projects/dotty-cps-async | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/dotty-cps-async b/community-build/community-projects/dotty-cps-async index 4724f902dfda..b893454c4bbb 160000 --- a/community-build/community-projects/dotty-cps-async +++ b/community-build/community-projects/dotty-cps-async @@ -1 +1 @@ -Subproject commit 4724f902dfdad82ba9a02eea08fe01fe6d7a7c15 +Subproject commit b893454c4bbbcc25cb99c2db0ba5989f3e1d6478 From 8d8f2c5913e4a3814a6492323b070a51557f4641 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 11 Jan 2022 14:49:46 +0100 Subject: [PATCH 0990/1244] Homogenize generation of erased definitions The erased value generated by a `try` is now a reference to `erasedValue` like other generated erased expressions. We also remove the `Lazy` as it is semantically meaningless in an erased definition. --- compiler/src/dotty/tools/dotc/typer/Typer.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 957a51532886..f70bf20a9ec6 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1765,8 +1765,8 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer untpd.ValDef( EvidenceParamName.fresh(), untpd.TypeTree(defn.CanThrowClass.typeRef.appliedTo(tp)), - untpd.ref(defn.Predef_undefined)) - .withFlags(Given | Final | Lazy | Erased) + untpd.ref(defn.Compiletime_erasedValue)) + .withFlags(Given | Final | Erased) .withSpan(expr.span) val caughtExceptions = if Feature.enabled(Feature.saferExceptions) then From 5410bb48e8f2e80d82999c8a8cbd4e549092f7eb Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 14 Jan 2022 10:10:30 +0100 Subject: [PATCH 0991/1244] Disallow bottom types in erased implementations --- .../src/dotty/tools/dotc/transform/PostTyper.scala | 10 ++++++++++ docs/docs/reference/experimental/canthrow.md | 4 ++-- library/src/scala/CanThrow.scala | 2 +- library/src/scala/compiletime/package.scala | 2 +- .../run-custom-args/erased/erased-2.check | 0 .../run-custom-args/erased/erased-2.scala | 0 tests/invalid/neg/typelevel-erased-leak.scala | 2 +- tests/invalid/run/Tuple.scala | 2 +- tests/neg-custom-args/typeclass-derivation2.scala | 2 +- tests/neg/erased-class.scala | 9 +++++---- tests/neg/safeThrowsStrawman.scala | 2 +- tests/neg/safeThrowsStrawman2.scala | 2 +- tests/pos-custom-args/inline-match-gadt.scala | 2 +- tests/pos-custom-args/phantom-Eq.scala | 12 ++++++------ tests/pos-custom-args/phantom-Evidence.scala | 2 +- tests/pos/i11864.scala | 2 +- tests/pos/i13392.scala | 2 +- tests/run-custom-args/generic-tuples.scala | 2 +- tests/run-custom-args/phantom-OnHList.scala | 4 ++-- tests/run-custom-args/typeclass-derivation2.scala | 2 +- tests/run-custom-args/typeclass-derivation2c.scala | 4 ++-- tests/run-custom-args/typelevel-defaultValue.scala | 2 +- tests/run/i13691.scala | 4 ++-- tests/run/safeThrowsStrawman.scala | 4 ++-- tests/run/safeThrowsStrawman2.scala | 2 +- 25 files changed, 46 insertions(+), 35 deletions(-) rename tests/{ => disabled}/run-custom-args/erased/erased-2.check (100%) rename tests/{ => disabled}/run-custom-args/erased/erased-2.scala (100%) diff --git a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala index 5d08921f1ea6..54bb72275921 100644 --- a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala +++ b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala @@ -352,9 +352,11 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase ) } case tree: ValDef => + checkErasedDef(tree) val tree1 = cpy.ValDef(tree)(rhs = normalizeErasedRhs(tree.rhs, tree.symbol)) processValOrDefDef(super.transform(tree1)) case tree: DefDef => + checkErasedDef(tree) annotateContextResults(tree) val tree1 = cpy.DefDef(tree)(rhs = normalizeErasedRhs(tree.rhs, tree.symbol)) processValOrDefDef(superAcc.wrapDefDef(tree1)(super.transform(tree1).asInstanceOf[DefDef])) @@ -464,6 +466,14 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase private def normalizeErasedRhs(rhs: Tree, sym: Symbol)(using Context) = if (sym.isEffectivelyErased) dropInlines.transform(rhs) else rhs + private def checkErasedDef(tree: ValOrDefDef)(using Context): Unit = + if tree.symbol.is(Erased, butNot = Macro) then + val tpe = tree.rhs.tpe + if tpe.derivesFrom(defn.NothingClass) then + report.error("`erased` definition cannot be implemented with en expression of type Nothing", tree.srcPos) + else if tpe.derivesFrom(defn.NullClass) then + report.error("`erased` definition cannot be implemented with en expression of type Null", tree.srcPos) + private def annotateExperimental(sym: Symbol)(using Context): Unit = if sym.is(Module) && sym.companionClass.hasAnnotation(defn.ExperimentalAnnot) then sym.addAnnotation(defn.ExperimentalAnnot) diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/docs/reference/experimental/canthrow.md index b46cd8cc4876..222bc63b6739 100644 --- a/docs/docs/reference/experimental/canthrow.md +++ b/docs/docs/reference/experimental/canthrow.md @@ -120,7 +120,7 @@ catch the compiler generates an accumulated capability of type `CanThrow[Ex1 | ... | Ex2]` that is available as a given in the scope of `body`. It does this by augmenting the `try` roughly as follows: ```scala try - erased given CanThrow[Ex1 | ... | ExN] = ??? + erased given CanThrow[Ex1 | ... | ExN] = compiletime.erasedValue body catch ... ``` @@ -196,7 +196,7 @@ Everything typechecks and works as expected. But wait - we have called `map` wit // compiler-generated code @main def test(xs: Double*) = try - erased given ctl: CanThrow[LimitExceeded] = ??? + erased given ctl: CanThrow[LimitExceeded] = compiletime.erasedValue println(xs.map(x => f(x)(using ctl)).sum) catch case ex: LimitExceeded => println("too large") ``` diff --git a/library/src/scala/CanThrow.scala b/library/src/scala/CanThrow.scala index 3e66e42514e4..fcfd11fc9197 100644 --- a/library/src/scala/CanThrow.scala +++ b/library/src/scala/CanThrow.scala @@ -12,5 +12,5 @@ erased class CanThrow[-E <: Exception] @experimental object unsafeExceptions: - given canThrowAny: CanThrow[Exception] = ??? + given canThrowAny: CanThrow[Exception] = compiletime.erasedValue diff --git a/library/src/scala/compiletime/package.scala b/library/src/scala/compiletime/package.scala index 754ce4d0b9d1..ff00b83bcb79 100644 --- a/library/src/scala/compiletime/package.scala +++ b/library/src/scala/compiletime/package.scala @@ -24,7 +24,7 @@ import annotation.compileTimeOnly * @syntax markdown */ // TODO add `erased` once it is not an experimental feature anymore -def erasedValue[T]: T = ??? +def erasedValue[T]: T = erasedValue[T] /** Used as the initializer of a mutable class or object field, like this: * diff --git a/tests/run-custom-args/erased/erased-2.check b/tests/disabled/run-custom-args/erased/erased-2.check similarity index 100% rename from tests/run-custom-args/erased/erased-2.check rename to tests/disabled/run-custom-args/erased/erased-2.check diff --git a/tests/run-custom-args/erased/erased-2.scala b/tests/disabled/run-custom-args/erased/erased-2.scala similarity index 100% rename from tests/run-custom-args/erased/erased-2.scala rename to tests/disabled/run-custom-args/erased/erased-2.scala diff --git a/tests/invalid/neg/typelevel-erased-leak.scala b/tests/invalid/neg/typelevel-erased-leak.scala index ce44137109f6..4875678dbdcc 100644 --- a/tests/invalid/neg/typelevel-erased-leak.scala +++ b/tests/invalid/neg/typelevel-erased-leak.scala @@ -1,6 +1,6 @@ object typelevel { - erased def erasedValue[T]: T = ??? + erased def erasedValue[T]: T = compiletime.erasedValue } object Test { diff --git a/tests/invalid/run/Tuple.scala b/tests/invalid/run/Tuple.scala index 9da7e941b098..5d9f013d1f5a 100644 --- a/tests/invalid/run/Tuple.scala +++ b/tests/invalid/run/Tuple.scala @@ -2,7 +2,7 @@ import annotation.showAsInfix // This version of Tuple requires full retyping of untyped trees on inlining object typelevel { - erased def erasedValue[T]: T = ??? + erased def erasedValue[T]: T = compiletime.erasedValue class Typed[T](val value: T) { type Type = T } } diff --git a/tests/neg-custom-args/typeclass-derivation2.scala b/tests/neg-custom-args/typeclass-derivation2.scala index 75e549413027..be54d7697994 100644 --- a/tests/neg-custom-args/typeclass-derivation2.scala +++ b/tests/neg-custom-args/typeclass-derivation2.scala @@ -117,7 +117,7 @@ object TypeLevel { type Subtype[t] = Type[_, t] type Supertype[t] = Type[t, _] type Exactly[t] = Type[t, t] - erased def typeOf[T]: Type[T, T] = ??? + erased def typeOf[T]: Type[T, T] = compiletime.erasedValue } // An algebraic datatype diff --git a/tests/neg/erased-class.scala b/tests/neg/erased-class.scala index 29b28d7d5275..96a1c8769bb1 100644 --- a/tests/neg/erased-class.scala +++ b/tests/neg/erased-class.scala @@ -1,9 +1,10 @@ import language.experimental.erasedDefinitions +import scala.annotation.compileTimeOnly erased class AA erased class BB extends AA // ok @main def Test = - val f1: Array[AA] = ??? // error - def f2(x: Int): Array[AA] = ??? // error - def bar: AA = ??? // ok - val baz: AA = ??? // ok + val f1: Array[AA] = compiletime.erasedValue // error // error + def f2(x: Int): Array[AA] = compiletime.erasedValue // error // error + def bar: AA = compiletime.erasedValue // ok + val baz: AA = compiletime.erasedValue // ok diff --git a/tests/neg/safeThrowsStrawman.scala b/tests/neg/safeThrowsStrawman.scala index f9b7fda118f9..bc07eb0bb3f9 100644 --- a/tests/neg/safeThrowsStrawman.scala +++ b/tests/neg/safeThrowsStrawman.scala @@ -21,7 +21,7 @@ def bar: Int raises Exception = @main def Test = try - erased given CanThrow[Fail] = ??? + erased given CanThrow[Fail] = compiletime.erasedValue println(foo(true)) println(foo(false)) println(bar) // error diff --git a/tests/neg/safeThrowsStrawman2.scala b/tests/neg/safeThrowsStrawman2.scala index 55e5ef4aea2f..7d87baad6fa4 100644 --- a/tests/neg/safeThrowsStrawman2.scala +++ b/tests/neg/safeThrowsStrawman2.scala @@ -20,7 +20,7 @@ def bar(x: Boolean)(using CanThrow[Fail]): Int = @main def Test = try - given ctf: CanThrow[Fail] = ??? + given ctf: CanThrow[Fail] = new CanThrow[Fail] val x = new CanThrow[Fail]() // OK, x is erased val y: Any = new CanThrow[Fail]() // error: illegal reference to erased class CanThrow val y2: Any = new CTF() // error: illegal reference to erased class CanThrow diff --git a/tests/pos-custom-args/inline-match-gadt.scala b/tests/pos-custom-args/inline-match-gadt.scala index 0f22f7b96c22..f63d0fb5b68c 100644 --- a/tests/pos-custom-args/inline-match-gadt.scala +++ b/tests/pos-custom-args/inline-match-gadt.scala @@ -1,6 +1,6 @@ object `inline-match-gadt` { class Exactly[T] - erased def exactType[T]: Exactly[T] = ??? + erased def exactType[T]: Exactly[T] = compiletime.erasedValue inline def foo[T](t: T): T = inline exactType[T] match { diff --git a/tests/pos-custom-args/phantom-Eq.scala b/tests/pos-custom-args/phantom-Eq.scala index 3bd16323524f..6ec5f77676ce 100644 --- a/tests/pos-custom-args/phantom-Eq.scala +++ b/tests/pos-custom-args/phantom-Eq.scala @@ -20,12 +20,12 @@ object EqUtil { extension [T](x: T) def ===[U](y: U)(using erased PhantomEq[T, U]) = x.equals(y) - erased given eqString: PhantomEqEq[String] = ??? - erased given eqInt: PhantomEqEq[Int] = ??? - erased given eqDouble: PhantomEqEq[Double] = ??? + erased given eqString: PhantomEqEq[String] = compiletime.erasedValue + erased given eqInt: PhantomEqEq[Int] = compiletime.erasedValue + erased given eqDouble: PhantomEqEq[Double] = compiletime.erasedValue - erased given eqByteNum: PhantomEq[Byte, Number] = ??? - erased given eqNumByte: PhantomEq[Number, Byte] = ??? + erased given eqByteNum: PhantomEq[Byte, Number] = compiletime.erasedValue + erased given eqNumByte: PhantomEq[Number, Byte] = compiletime.erasedValue - erased given eqSeq[T, U](using erased PhantomEq[T, U]): PhantomEq[Seq[T], Seq[U]] = ??? + erased given eqSeq[T, U](using erased PhantomEq[T, U]): PhantomEq[Seq[T], Seq[U]] = compiletime.erasedValue } diff --git a/tests/pos-custom-args/phantom-Evidence.scala b/tests/pos-custom-args/phantom-Evidence.scala index 414f96f3ef33..3a82cfe0c6e8 100644 --- a/tests/pos-custom-args/phantom-Evidence.scala +++ b/tests/pos-custom-args/phantom-Evidence.scala @@ -24,5 +24,5 @@ object WithNormalState { object Utils { type =::=[From, To] - erased given tpEquals[A]: A =::= A = ??? + erased given tpEquals[A]: A =::= A = compiletime.erasedValue } diff --git a/tests/pos/i11864.scala b/tests/pos/i11864.scala index da7140e57b8d..4f7735f1c8c5 100644 --- a/tests/pos/i11864.scala +++ b/tests/pos/i11864.scala @@ -40,7 +40,7 @@ final class CallbackTo[+A] { object CallbackTo { type MapGuard[A] = { type Out = A } - erased given MapGuard[A]: MapGuard[A] = ??? + erased given MapGuard[A]: MapGuard[A] = compiletime.erasedValue def traverse[A, B](ta: List[A]): CallbackTo[List[B]] = val x: CallbackTo[List[A] => List[B]] = ??? diff --git a/tests/pos/i13392.scala b/tests/pos/i13392.scala index de489b9aa75a..614f711eebb5 100644 --- a/tests/pos/i13392.scala +++ b/tests/pos/i13392.scala @@ -8,4 +8,4 @@ erased class CanThrow[-E <: Exception] @experimental object unsafeExceptions: - given canThrowAny: CanThrow[Exception] = ??? + given canThrowAny: CanThrow[Exception] = new CanThrow diff --git a/tests/run-custom-args/generic-tuples.scala b/tests/run-custom-args/generic-tuples.scala index f134b9d864bb..71aa13427493 100644 --- a/tests/run-custom-args/generic-tuples.scala +++ b/tests/run-custom-args/generic-tuples.scala @@ -7,7 +7,7 @@ class HNil extends Tuple case object HNil extends HNil trait Pair[H, T <: Tuple] { - erased inline def size = ??? + erased inline def size = compiletime.erasedValue } } diff --git a/tests/run-custom-args/phantom-OnHList.scala b/tests/run-custom-args/phantom-OnHList.scala index 7c1ba18bbec4..81eddfe0d4a3 100644 --- a/tests/run-custom-args/phantom-OnHList.scala +++ b/tests/run-custom-args/phantom-OnHList.scala @@ -88,6 +88,6 @@ object Appender { object PhantomAppender { type Aux[L1 <: HList, L2 <: HList, O <: HList] - implicit erased def caseHNil[L <: HList]: Aux[HNil, L, L] = ??? - implicit erased def caseHCons[H, T <: HList, L <: HList, O <: HList] (using erased p: Aux[T, L, O]): Aux[H :: T, L, H :: O] = ??? + implicit erased def caseHNil[L <: HList]: Aux[HNil, L, L] = compiletime.erasedValue + implicit erased def caseHCons[H, T <: HList, L <: HList, O <: HList] (using erased p: Aux[T, L, O]): Aux[H :: T, L, H :: O] = compiletime.erasedValue } diff --git a/tests/run-custom-args/typeclass-derivation2.scala b/tests/run-custom-args/typeclass-derivation2.scala index 228547bcccc1..90744d2f7ab6 100644 --- a/tests/run-custom-args/typeclass-derivation2.scala +++ b/tests/run-custom-args/typeclass-derivation2.scala @@ -119,7 +119,7 @@ object TypeLevel { type Subtype[t] = Type[_, t] type Supertype[t] = Type[t, _] type Exactly[t] = Type[t, t] - erased def typeOf[T]: Type[T, T] = ??? + erased def typeOf[T]: Type[T, T] = compiletime.erasedValue } // An algebraic datatype diff --git a/tests/run-custom-args/typeclass-derivation2c.scala b/tests/run-custom-args/typeclass-derivation2c.scala index ddf4d62e0498..f7eee2a3fafe 100644 --- a/tests/run-custom-args/typeclass-derivation2c.scala +++ b/tests/run-custom-args/typeclass-derivation2c.scala @@ -24,12 +24,12 @@ object Deriving { /** The number of cases in the sum. * Implemented by an inline method in concrete subclasses. */ - erased def numberOfCases: Int = ??? + erased def numberOfCases: Int = compiletime.erasedValue /** The Generic representations of the sum's alternatives. * Implemented by an inline method in concrete subclasses. */ - erased def alternative(n: Int): Generic[_ <: T] = ??? + erased def alternative(n: Int): Generic[_ <: T] = compiletime.erasedValue } /** The Generic for a product type */ diff --git a/tests/run-custom-args/typelevel-defaultValue.scala b/tests/run-custom-args/typelevel-defaultValue.scala index 7c3b0af46d25..a171bf8a153c 100644 --- a/tests/run-custom-args/typelevel-defaultValue.scala +++ b/tests/run-custom-args/typelevel-defaultValue.scala @@ -1,6 +1,6 @@ object compiletime { - erased def erasedValue[T]: T = ??? + erased def erasedValue[T]: T = compiletime.erasedValue } object Test extends App { diff --git a/tests/run/i13691.scala b/tests/run/i13691.scala index 6db01ee0de35..224656d87923 100644 --- a/tests/run/i13691.scala +++ b/tests/run/i13691.scala @@ -5,7 +5,7 @@ erased class Foo class Bar object unsafeExceptions: - given canThrowAny: CanThrow[Exception] = null + given canThrowAny: CanThrow[Exception] = new CanThrow object test1: trait Decoder[+T]: @@ -44,7 +44,7 @@ object test5: @main def Test(): Unit = import unsafeExceptions.canThrowAny - given Foo = ??? + given Foo = Foo() given Bar = Bar() test1.deco.apply().apply test2.deco.apply().apply diff --git a/tests/run/safeThrowsStrawman.scala b/tests/run/safeThrowsStrawman.scala index d9bd4dc227e6..973c9d8f5137 100644 --- a/tests/run/safeThrowsStrawman.scala +++ b/tests/run/safeThrowsStrawman.scala @@ -19,13 +19,13 @@ def baz: Int raises Exception = foo(false) @main def Test = try - given CanThrow[Fail] = ??? + given CanThrow[Fail] = new CanThrow println(foo(true)) println(foo(false)) catch case ex: Fail => println("failed") try - given CanThrow[Exception] = ??? + given CanThrow[Exception] = new CanThrow println(baz) catch case ex: Fail => println("failed") diff --git a/tests/run/safeThrowsStrawman2.scala b/tests/run/safeThrowsStrawman2.scala index d7af087a1690..1c84d84babc7 100644 --- a/tests/run/safeThrowsStrawman2.scala +++ b/tests/run/safeThrowsStrawman2.scala @@ -18,7 +18,7 @@ object scalax: def try2[R, E <: Exception](body: => R raises E)(c: E => Unit)(f: => Unit): R = val res = new Result[R] try - given CanThrow[E] = ??? + given CanThrow[E] = new CanThrow res.value = body catch c.asInstanceOf[Throwable => Unit] finally f From 5723621c7dcbdc3f51e411deae0a11fcd2b39f90 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 10 Jan 2022 17:25:04 +0100 Subject: [PATCH 0992/1244] Adapt generic tuples to be able to access members Fixes #14215 --- .../src/dotty/tools/dotc/typer/Typer.scala | 6 +++ tests/neg/genericTupleMembers.scala | 38 +++++++++++++++ tests/run/genericTupleMembers.scala | 46 +++++++++++++++++++ tests/run/i14215.scala | 12 +++++ 4 files changed, 102 insertions(+) create mode 100644 tests/neg/genericTupleMembers.scala create mode 100644 tests/run/genericTupleMembers.scala create mode 100644 tests/run/i14215.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index f70bf20a9ec6..1c452ccb0542 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -3854,6 +3854,12 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer gadts.println(i"Member selection healed by GADT approximation") tree.cast(gadtApprox) else tree + else if tree.tpe.derivesFrom(defn.PairClass) && !defn.isTupleNType(tree.tpe.widenDealias) then + // If this is a generic tuple we need to cast it to make the TupleN/ members accessible. + // This only works for generic tuples of know size up to 22. + defn.tupleTypes(tree.tpe.widenTermRefExpr, Definitions.MaxTupleArity) match + case Some(elems) => tree.cast(defn.tupleType(elems)) + case None => tree else tree // other adaptations for selections are handled in typedSelect case _ if ctx.mode.is(Mode.ImplicitsEnabled) && tree.tpe.isValueType => checkConversionsSpecific(pt, tree.srcPos) diff --git a/tests/neg/genericTupleMembers.scala b/tests/neg/genericTupleMembers.scala new file mode 100644 index 000000000000..13c70fa73b6f --- /dev/null +++ b/tests/neg/genericTupleMembers.scala @@ -0,0 +1,38 @@ +def Test: Unit = + val tup1 = 1 *: EmptyTuple + val tup2 = 1 *: 2 *: EmptyTuple + val tup3 = 1 *: 2 *: 3 *: EmptyTuple + val tup4 = 1 *: 2 *: 3 *: 4 *: EmptyTuple + val tup5 = 1 *: 2 *: 3 *: 4 *: 5 *: EmptyTuple + val tup22 = 1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: EmptyTuple + val tup23 = 1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: 23 *: EmptyTuple + + tup1._2 // error + + tup2._3 // error + + tup22._23 // error + + tup23._1 // error + tup23._2 // error + tup23._3 // error + tup23._4 // error + tup23._5 // error + tup23._6 // error + tup23._7 // error + tup23._8 // error + tup23._9 // error + tup23._10 // error + tup23._11 // error + tup23._12 // error + tup23._13 // error + tup23._14 // error + tup23._15 // error + tup23._16 // error + tup23._17 // error + tup23._18 // error + tup23._19 // error + tup23._20 // error + tup23._21 // error + tup23._22 // error + tup23._23 // error diff --git a/tests/run/genericTupleMembers.scala b/tests/run/genericTupleMembers.scala new file mode 100644 index 000000000000..1b6de1486a05 --- /dev/null +++ b/tests/run/genericTupleMembers.scala @@ -0,0 +1,46 @@ + +@main def Test: Unit = + val tup1 = 1 *: EmptyTuple + val tup2 = 1 *: 2 *: EmptyTuple + val tup3 = 1 *: 2 *: 3 *: EmptyTuple + val tup4 = 1 *: 2 *: 3 *: 4 *: EmptyTuple + val tup5 = 1 *: 2 *: 3 *: 4 *: 5 *: EmptyTuple + val tup22 = 1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: 21 *: 22 *: EmptyTuple + + tup1._1 + + tup2._1 + tup2._2 + tup2.swap + + tup3._1 + tup3._2 + tup3._3 + + tup4._1 + tup4._2 + tup4._3 + tup4._4 + + tup22._1 + tup22._2 + tup22._3 + tup22._4 + tup22._5 + tup22._6 + tup22._7 + tup22._8 + tup22._9 + tup22._10 + tup22._11 + tup22._12 + tup22._13 + tup22._14 + tup22._15 + tup22._16 + tup22._17 + tup22._18 + tup22._19 + tup22._20 + tup22._21 + tup22._22 diff --git a/tests/run/i14215.scala b/tests/run/i14215.scala new file mode 100644 index 000000000000..d732337ce0f2 --- /dev/null +++ b/tests/run/i14215.scala @@ -0,0 +1,12 @@ +def f[T <: Tuple2[Int, Int]](tup: T): T = tup + +@main def Test: Unit = + (1, 2)._1 + f((1, 2))._1 + + (1 *: 2 *: EmptyTuple)._1 + f(1 *: 2 *: EmptyTuple)._1 + f[Int *: Int *: EmptyTuple](1 *: 2 *: EmptyTuple)._1 + + f[Int *: Int *: EmptyTuple]((1, 2))._1 + f[Tuple2[Int, Int]](1 *: 2 *: EmptyTuple)._1 From ab31a0824b294b047001a815cbbbf0c21c264b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Thu, 28 Oct 2021 13:02:24 +0200 Subject: [PATCH 0993/1244] Run test groups with different compiler versions --- .../dotty/tools/vulpix/ParallelTesting.scala | 93 +++++++++++++------ tests/pos/target_version/A_1_t3.0.scala | 2 + tests/pos/target_version/B_2_v3.0.scala | 2 + 3 files changed, 69 insertions(+), 28 deletions(-) create mode 100644 tests/pos/target_version/A_1_t3.0.scala create mode 100644 tests/pos/target_version/B_2_v3.0.scala diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 4ba1229feecb..cb26492b8e3b 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -4,6 +4,7 @@ package vulpix import java.io.{File => JFile, IOException} import java.lang.System.{lineSeparator => EOL} +import java.net.URL import java.nio.file.StandardCopyOption.REPLACE_EXISTING import java.nio.file.{Files, NoSuchFileException, Path, Paths} import java.nio.charset.StandardCharsets @@ -127,10 +128,10 @@ trait ParallelTesting extends RunnerOrchestration { self => } sb.toString + "\n\n" } - case self: SeparateCompilationSource => { + case self: SeparateCompilationSource => { // TODO: this is incorrect when using other versions of compiler val command = sb.toString val fsb = new StringBuilder(command) - self.compilationGroups.foreach { files => + self.compilationGroups.foreach { (_, files) => files.map(_.getPath).foreach { path => fsb.append(delimiter) lineLen = 8 @@ -173,31 +174,28 @@ trait ParallelTesting extends RunnerOrchestration { self => flags: TestFlags, outDir: JFile ) extends TestSource { - - /** Get the files grouped by `_X` as a list of groups, files missing this - * suffix will be put into the same group. - * Files in each group are sorted alphabetically. - * - * Filters out all none source files - */ - def compilationGroups: List[Array[JFile]] = - dir - .listFiles - .groupBy { file => - val name = file.getName - Try { - val potentialNumber = name - .substring(0, name.lastIndexOf('.')) - .reverse.takeWhile(_ != '_').reverse - - potentialNumber.toInt.toString - } - .toOption - .getOrElse("") - } - .toList.sortBy(_._1).map(_._2.filter(isSourceFile).sorted) - - def sourceFiles: Array[JFile] = compilationGroups.flatten.toArray + case class Group(ordinal: Int, compiler: String, target: String) + + def compilationGroups: List[(Group, Array[JFile])] = + val Name = """[^_]*((?:_.*)*)\.\w+""".r + val Target = """t([\d\.]+)""".r + val Compiler = """v([\d\.]+)""".r + val Ordinal = """(\d+)""".r + def groupFor(file: JFile): Group = + val Name(annotPart) = file.getName + val annots = annotPart.split("_") + val ordinal = annots.collectFirst { case Ordinal(n) => n.toInt }.getOrElse(Int.MinValue) + val target = annots.collectFirst { case Target(t) => t }.getOrElse("") + val compiler = annots.collectFirst { case Compiler(c) => c}.getOrElse("") + Group(ordinal, compiler, target) + + dir.listFiles + .groupBy(groupFor) + .toList + .sortBy { (g, _) => (g.ordinal, g.compiler, g.target) } + .map { (g, f) => (g, f.sorted) } + + def sourceFiles = compilationGroups.map(_._2).flatten.toArray } private trait CompilationLogic { this: Test => @@ -216,7 +214,12 @@ trait ParallelTesting extends RunnerOrchestration { self => List(reporter) case testSource @ SeparateCompilationSource(_, dir, flags, outDir) => - testSource.compilationGroups.map(files => compile(files, flags, suppressErrors, outDir)) // TODO? only `compile` option? + testSource.compilationGroups.map { (group, files) => + if group.compiler.isEmpty then + compile(files, flags, suppressErrors, outDir) + else + compileWithOtherCompiler(group.compiler, files, flags, outDir) + } }) final def countErrorsAndWarnings(reporters: Seq[TestReporter]): (Int, Int) = @@ -500,6 +503,18 @@ trait ParallelTesting extends RunnerOrchestration { self => reporter } + protected def compileWithOtherCompiler(compiler: String, files: Array[JFile], flags: TestFlags, targetDir: JFile): TestReporter = + val reporter = TestReporter.reporter(realStdout, ERROR) // TODO: do some reporting + + val command = Array(getCompiler(compiler).toString + "/bin/scalac") ++ flags.and("-d", targetDir.getPath).all ++ files.map(_.getPath) + val process = Runtime.getRuntime.exec(command) + val output = Source.fromInputStream(process.getErrorStream).mkString + if process.waitFor() != 0 then + echo(s"\nCompilation using Scala $compiler failed: \n$output") + fail() + + reporter + protected def compileFromTasty(flags0: TestFlags, suppressErrors: Boolean, targetDir: JFile): TestReporter = { val tastyOutput = new JFile(targetDir.getPath + "_from-tasty") tastyOutput.mkdir() @@ -1371,4 +1386,26 @@ object ParallelTesting { def isTastyFile(f: JFile): Boolean = f.getName.endsWith(".tasty") + + def getCompiler(version: String): JFile = + val patch = trueVersions(version) + val dir = cache.resolve(s"scala3-${patch}").toFile + if dir.exists then + dir + else + import scala.sys.process._ + val zipPath = cache.resolve(s"scala3-$patch.zip") + (URL(s"https://github.com/lampepfl/dotty/releases/download/$patch/scala3-$patch.zip") #>> zipPath.toFile #&& s"unzip $zipPath -d $cache").!! + dir + + + private val trueVersions = Map( + "3.0" -> "3.0.2", + "3.1" -> "3.1.0" + ) + + private lazy val cache = + val dir = Files.createTempDirectory("dotty.tests") + // dir.toFile.deleteOnExit() + dir } diff --git a/tests/pos/target_version/A_1_t3.0.scala b/tests/pos/target_version/A_1_t3.0.scala new file mode 100644 index 000000000000..39402d87587f --- /dev/null +++ b/tests/pos/target_version/A_1_t3.0.scala @@ -0,0 +1,2 @@ +trait A: + def a: Int \ No newline at end of file diff --git a/tests/pos/target_version/B_2_v3.0.scala b/tests/pos/target_version/B_2_v3.0.scala new file mode 100644 index 000000000000..bb4ae81da4b4 --- /dev/null +++ b/tests/pos/target_version/B_2_v3.0.scala @@ -0,0 +1,2 @@ +object B extends A: + def a = 7 \ No newline at end of file From 5716046618cd8a1f66082729e0f506089bec45c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Mon, 8 Nov 2021 18:09:02 +0100 Subject: [PATCH 0994/1244] Add -scala-release flag --- compiler/src/dotty/tools/dotc/config/ScalaSettings.scala | 1 + compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index 45cc3406a736..615b17277259 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -101,6 +101,7 @@ trait CommonScalaSettings: val silentWarnings: Setting[Boolean] = BooleanSetting("-nowarn", "Silence all warnings.", aliases = List("--no-warnings")) val release: Setting[String] = ChoiceSetting("-release", "release", "Compile code with classes specific to the given version of the Java platform available on the classpath and emit bytecode for this version.", ScalaSettings.supportedReleaseVersions, "", aliases = List("--release")) + val scalaRelease: Setting[String] = ChoiceSetting("-scala-release", "release", "Emit TASTy files that can be consumed by specified version of the compiler.", List("3.0", "3.1"), "3.1", aliases = List("--scala-release")) val deprecation: Setting[Boolean] = BooleanSetting("-deprecation", "Emit warning and location for usages of deprecated APIs.", aliases = List("--deprecation")) val feature: Setting[Boolean] = BooleanSetting("-feature", "Emit warning and location for usages of features that should be imported explicitly.", aliases = List("--feature")) val explain: Setting[Boolean] = BooleanSetting("-explain", "Explain errors in more detail.", aliases = List("--explain")) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index cb26492b8e3b..65365e36f588 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -215,10 +215,11 @@ trait ParallelTesting extends RunnerOrchestration { self => case testSource @ SeparateCompilationSource(_, dir, flags, outDir) => testSource.compilationGroups.map { (group, files) => + val flags1 = if group.target.isEmpty then flags else flags.and("-scala-release", group.target) if group.compiler.isEmpty then - compile(files, flags, suppressErrors, outDir) + compile(files, flags1, suppressErrors, outDir) else - compileWithOtherCompiler(group.compiler, files, flags, outDir) + compileWithOtherCompiler(group.compiler, files, flags1, outDir) } }) From 7025ccbf31d507973906678935a2c2756aa729c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Mon, 8 Nov 2021 20:06:51 +0100 Subject: [PATCH 0995/1244] Output specified tasty version --- compiler/src/dotty/tools/dotc/core/Contexts.scala | 10 +++++++++- .../dotty/tools/dotc/core/tasty/TastyPickler.scala | 12 ++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala index 3e3f8a800ebf..cdb32272b9cf 100644 --- a/compiler/src/dotty/tools/dotc/core/Contexts.scala +++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala @@ -38,6 +38,7 @@ import xsbti.AnalysisCallback import plugins._ import java.util.concurrent.atomic.AtomicInteger import java.nio.file.InvalidPathException +import dotty.tools.tasty.TastyFormat object Contexts { @@ -480,7 +481,14 @@ object Contexts { /** A new context that summarizes an import statement */ def importContext(imp: Import[?], sym: Symbol): FreshContext = - fresh.setImportInfo(ImportInfo(sym, imp.selectors, imp.expr)) + fresh.setImportInfo(ImportInfo(sym, imp.selectors, imp.expr)) + + def tastyVersion: (Int, Int, Int) = + base.settings.scalaRelease.value match + case "" => + import TastyFormat.* + (MajorVersion, MinorVersion, ExperimentalVersion) + case s"$maj.$min" => (maj.toInt + 25, min.toInt, 0) /** Is the debug option set? */ def debug: Boolean = base.settings.Ydebug.value diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala index 3aeb7e6f35c9..147eaef4eb7f 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala @@ -7,6 +7,8 @@ import dotty.tools.tasty.{TastyBuffer, TastyFormat, TastyHash} import TastyFormat._ import TastyBuffer._ +import Contexts._ + import collection.mutable import core.Symbols.{Symbol, ClassSymbol} import ast.tpd @@ -30,10 +32,12 @@ class TastyPickler(val rootCls: ClassSymbol) { def newSection(name: String, buf: TastyBuffer): Unit = sections += ((nameBuffer.nameIndex(name.toTermName), buf)) - def assembleParts(): Array[Byte] = { + def assembleParts()(using Context): Array[Byte] = { def lengthWithLength(buf: TastyBuffer) = buf.length + natSize(buf.length) + val (majorVersion, minorVersion, experimentalVersion) = ctx.tastyVersion + nameBuffer.assemble() sections.foreach(_._2.assemble()) @@ -48,9 +52,9 @@ class TastyPickler(val rootCls: ClassSymbol) { val headerBuffer = { val buf = new TastyBuffer(header.length + TastyPickler.versionStringBytes.length + 32) for (ch <- header) buf.writeByte(ch.toByte) - buf.writeNat(MajorVersion) - buf.writeNat(MinorVersion) - buf.writeNat(ExperimentalVersion) + buf.writeNat(majorVersion) + buf.writeNat(minorVersion) + buf.writeNat(experimentalVersion) buf.writeNat(TastyPickler.versionStringBytes.length) buf.writeBytes(TastyPickler.versionStringBytes, TastyPickler.versionStringBytes.length) buf.writeUncompressedLong(uuidLow) From bc19637e4060d575aa6a79b27bd47729fd8f6cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Tue, 9 Nov 2021 11:24:20 +0100 Subject: [PATCH 0996/1244] Handle classpath substitution in classpath --- .../dotty/tools/vulpix/ParallelTesting.scala | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 65365e36f588..0a8f330c2309 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -505,9 +505,21 @@ trait ParallelTesting extends RunnerOrchestration { self => } protected def compileWithOtherCompiler(compiler: String, files: Array[JFile], flags: TestFlags, targetDir: JFile): TestReporter = + val compilerDir = getCompiler(compiler).toString + + def substituteClasspath(old: String): String = + old.split(JFile.pathSeparator).map { o => + if JFile(o) == JFile(Properties.dottyLibrary) then s"$compilerDir/lib/scala3-library_3-${trueVersions(compiler)}.jar" + else o + }.mkString(JFile.pathSeparator) + + val flags1 = flags.copy(defaultClassPath = substituteClasspath(flags.defaultClassPath)) + .withClasspath(targetDir.getPath) + .and("-d", targetDir.getPath) + val reporter = TestReporter.reporter(realStdout, ERROR) // TODO: do some reporting - val command = Array(getCompiler(compiler).toString + "/bin/scalac") ++ flags.and("-d", targetDir.getPath).all ++ files.map(_.getPath) + val command = Array(compilerDir + "/bin/scalac") ++ flags1.all ++ files.map(_.getPath) val process = Runtime.getRuntime.exec(command) val output = Source.fromInputStream(process.getErrorStream).mkString if process.waitFor() != 0 then @@ -1400,7 +1412,7 @@ object ParallelTesting { dir - private val trueVersions = Map( + val trueVersions = Map( "3.0" -> "3.0.2", "3.1" -> "3.1.0" ) From 45c65e46436a36eb8b40630a32bd776ab1aafd31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Wed, 10 Nov 2021 13:29:25 +0100 Subject: [PATCH 0997/1244] Fix pickler tests --- .../test/dotty/tools/vulpix/ParallelTesting.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 0a8f330c2309..4c25cab3ca19 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -176,13 +176,12 @@ trait ParallelTesting extends RunnerOrchestration { self => ) extends TestSource { case class Group(ordinal: Int, compiler: String, target: String) - def compilationGroups: List[(Group, Array[JFile])] = - val Name = """[^_]*((?:_.*)*)\.\w+""".r + lazy val compilationGroups: List[(Group, Array[JFile])] = val Target = """t([\d\.]+)""".r val Compiler = """v([\d\.]+)""".r val Ordinal = """(\d+)""".r def groupFor(file: JFile): Group = - val Name(annotPart) = file.getName + val annotPart = file.getName.dropWhile(_ != '_').stripSuffix(".scala").stripSuffix(".java") val annots = annotPart.split("_") val ordinal = annots.collectFirst { case Ordinal(n) => n.toInt }.getOrElse(Int.MinValue) val target = annots.collectFirst { case Target(t) => t }.getOrElse("") @@ -190,6 +189,7 @@ trait ParallelTesting extends RunnerOrchestration { self => Group(ordinal, compiler, target) dir.listFiles + .filter(isSourceFile) .groupBy(groupFor) .toList .sortBy { (g, _) => (g.ordinal, g.compiler, g.target) } @@ -1255,14 +1255,14 @@ trait ParallelTesting extends RunnerOrchestration { self => val (dirs, files) = compilationTargets(sourceDir, fileFilter) val isPicklerTest = flags.options.contains("-Ytest-pickler") - def ignoreDir(dir: JFile): Boolean = { + def picklerDirFilter(source: SeparateCompilationSource): Boolean = { // Pickler tests stop after pickler not producing class/tasty files. The second part of the compilation // will not be able to compile due to the missing artifacts from the first part. - isPicklerTest && dir.listFiles().exists(file => file.getName.endsWith("_2.scala") || file.getName.endsWith("_2.java")) + !isPicklerTest || source.compilationGroups.length == 1 } val targets = files.map(f => JointCompilationSource(testGroup.name, Array(f), flags, createOutputDirsForFile(f, sourceDir, outDir))) ++ - dirs.collect { case dir if !ignoreDir(dir) => SeparateCompilationSource(testGroup.name, dir, flags, createOutputDirsForDir(dir, sourceDir, outDir)) } + dirs.map { dir => SeparateCompilationSource(testGroup.name, dir, flags, createOutputDirsForDir(dir, sourceDir, outDir)) }.filter(picklerDirFilter) // Create a CompilationTest and let the user decide whether to execute a pos or a neg test new CompilationTest(targets) From 54a9d0e87db1e8bce75c56641c30489dbdcba4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Mon, 15 Nov 2021 17:50:10 +0100 Subject: [PATCH 0998/1244] Change `-scala-release` flag into proper VersionSetting --- compiler/src/dotty/tools/dotc/config/ScalaSettings.scala | 2 +- compiler/src/dotty/tools/dotc/core/Contexts.scala | 6 ++++-- compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index 615b17277259..6abc9b2e2435 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -101,7 +101,7 @@ trait CommonScalaSettings: val silentWarnings: Setting[Boolean] = BooleanSetting("-nowarn", "Silence all warnings.", aliases = List("--no-warnings")) val release: Setting[String] = ChoiceSetting("-release", "release", "Compile code with classes specific to the given version of the Java platform available on the classpath and emit bytecode for this version.", ScalaSettings.supportedReleaseVersions, "", aliases = List("--release")) - val scalaRelease: Setting[String] = ChoiceSetting("-scala-release", "release", "Emit TASTy files that can be consumed by specified version of the compiler.", List("3.0", "3.1"), "3.1", aliases = List("--scala-release")) + val scalaRelease: Setting[ScalaVersion] = VersionSetting("-scala-release", "Emit TASTy files that can be consumed by specified version of the compiler.") val deprecation: Setting[Boolean] = BooleanSetting("-deprecation", "Emit warning and location for usages of deprecated APIs.", aliases = List("--deprecation")) val feature: Setting[Boolean] = BooleanSetting("-feature", "Emit warning and location for usages of features that should be imported explicitly.", aliases = List("--feature")) val explain: Setting[Boolean] = BooleanSetting("-explain", "Explain errors in more detail.", aliases = List("--explain")) diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala index cdb32272b9cf..ce827f6af59c 100644 --- a/compiler/src/dotty/tools/dotc/core/Contexts.scala +++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala @@ -39,6 +39,7 @@ import plugins._ import java.util.concurrent.atomic.AtomicInteger import java.nio.file.InvalidPathException import dotty.tools.tasty.TastyFormat +import dotty.tools.dotc.config.{ NoScalaVersion, SpecificScalaVersion, AnyScalaVersion } object Contexts { @@ -485,10 +486,11 @@ object Contexts { def tastyVersion: (Int, Int, Int) = base.settings.scalaRelease.value match - case "" => + case NoScalaVersion => import TastyFormat.* (MajorVersion, MinorVersion, ExperimentalVersion) - case s"$maj.$min" => (maj.toInt + 25, min.toInt, 0) + case SpecificScalaVersion(maj, min, _, _) => (maj.toInt + 25, min.toInt, 0) + case AnyScalaVersion => (28, 0, 0) // 3.0 /** Is the debug option set? */ def debug: Boolean = base.settings.Ydebug.value diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 4c25cab3ca19..537606afd584 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -215,7 +215,7 @@ trait ParallelTesting extends RunnerOrchestration { self => case testSource @ SeparateCompilationSource(_, dir, flags, outDir) => testSource.compilationGroups.map { (group, files) => - val flags1 = if group.target.isEmpty then flags else flags.and("-scala-release", group.target) + val flags1 = if group.target.isEmpty then flags else flags.and(s"-scala-release:${group.target}") if group.compiler.isEmpty then compile(files, flags1, suppressErrors, outDir) else From 7b7498acf30a830e4234218b103ff9b173a733df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Tue, 16 Nov 2021 08:41:25 +0100 Subject: [PATCH 0999/1244] Add `since` annotation --- .../src/dotty/tools/dotc/core/Definitions.scala | 1 + .../src/dotty/tools/dotc/typer/RefChecks.scala | 16 ++++++++++++++++ library/src/scala/annotation/since.scala | 4 ++++ library/src/scala/quoted/Quotes.scala | 3 ++- tests/neg/since/since_t3.0.scala | 6 ++++++ 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 library/src/scala/annotation/since.scala create mode 100644 tests/neg/since/since_t3.0.scala diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 464c7900a54f..2e9c81332200 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -948,6 +948,7 @@ class Definitions { @tu lazy val FunctionalInterfaceAnnot: ClassSymbol = requiredClass("java.lang.FunctionalInterface") @tu lazy val TargetNameAnnot: ClassSymbol = requiredClass("scala.annotation.targetName") @tu lazy val VarargsAnnot: ClassSymbol = requiredClass("scala.annotation.varargs") + @tu lazy val SinceAnnot: ClassSymbol = requiredClass("scala.annotation.since") @tu lazy val JavaRepeatableAnnot: ClassSymbol = requiredClass("java.lang.annotation.Repeatable") diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala index dcc4ac09d5ec..d8cc59d2d430 100644 --- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala @@ -911,6 +911,7 @@ object RefChecks { private def checkUndesiredProperties(sym: Symbol, pos: SrcPos)(using Context): Unit = checkDeprecated(sym, pos) checkExperimental(sym, pos) + checkSinceAnnot(sym, pos) val xMigrationValue = ctx.settings.Xmigration.value if xMigrationValue != NoScalaVersion then @@ -970,6 +971,21 @@ object RefChecks { for annot <- sym.annotations if annot.symbol.isExperimental do Feature.checkExperimentalDef(annot.symbol, annot.tree) + private def checkSinceAnnot(sym: Symbol, pos: SrcPos)(using Context): Unit = + for + annot <- sym.getAnnotation(defn.SinceAnnot) + version <- annot.argumentConstantString(0) + do + val releaseVersion = ctx.settings.scalaRelease.value + ScalaVersion.parse(version) match + case Success(symVersion) if symVersion > ctx.settings.scalaRelease.value => + report.error( + i"$sym was added in Scala $version, therefore it cannot be used in the code targeting Scala ${releaseVersion.unparse}", + pos) + case Failure(ex) => + report.warning(i"$sym has an unparsable version number: ${ex.getMessage}", pos) + case _ => + /** If @migration is present (indicating that the symbol has changed semantics between versions), * emit a warning. */ diff --git a/library/src/scala/annotation/since.scala b/library/src/scala/annotation/since.scala new file mode 100644 index 000000000000..082639dcfdd8 --- /dev/null +++ b/library/src/scala/annotation/since.scala @@ -0,0 +1,4 @@ +package scala.annotation + +/** An annotation that is used to mark symbols added to the stdlib after 3.0 release */ +class since(scalaRelease: String) extends scala.annotation.StaticAnnotation \ No newline at end of file diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala index f5decee041f4..7f097c099e90 100644 --- a/library/src/scala/quoted/Quotes.scala +++ b/library/src/scala/quoted/Quotes.scala @@ -1,6 +1,6 @@ package scala.quoted -import scala.annotation.experimental +import scala.annotation.{ experimental, since } import scala.reflect.TypeTest /** Current Quotes in scope @@ -3704,6 +3704,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => def memberField(name: String): Symbol /** Get named non-private fields declared or inherited */ + @since("3.1") def fieldMember(name: String): Symbol /** Get all non-private fields declared or inherited */ diff --git a/tests/neg/since/since_t3.0.scala b/tests/neg/since/since_t3.0.scala new file mode 100644 index 000000000000..a902952b4f1d --- /dev/null +++ b/tests/neg/since/since_t3.0.scala @@ -0,0 +1,6 @@ +import scala.quoted.* + +def useQuotes(using Quotes) = + import quotes.reflect.* + def useFieldMember(s: Symbol) = s.fieldMember("abc") // error + useFieldMember \ No newline at end of file From e535c8594edc24307b61c5efe36afcd9fe33d455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Tue, 16 Nov 2021 13:47:41 +0100 Subject: [PATCH 1000/1244] Add since annotations to all symbols added in 3.1 --- library/src/scala/CanEqual.scala | 6 +++++- library/src/scala/Selectable.scala | 3 ++- library/src/scala/Tuple.scala | 4 +++- library/src/scala/annotation/experimental.scala | 1 + .../scala/annotation/internal/ErasedParam.scala | 1 + .../internal/ProvisionalSuperClass.scala | 1 + library/src/scala/quoted/Quotes.scala | 14 ++++++++++++++ library/src/scala/quoted/Type.scala | 3 ++- 8 files changed, 29 insertions(+), 4 deletions(-) diff --git a/library/src/scala/CanEqual.scala b/library/src/scala/CanEqual.scala index dfb4ec7d2bfc..f09df1455c2c 100644 --- a/library/src/scala/CanEqual.scala +++ b/library/src/scala/CanEqual.scala @@ -1,6 +1,6 @@ package scala -import annotation.implicitNotFound +import annotation.{ implicitNotFound, since } import scala.collection.{Seq, Set} /** A marker trait indicating that values of type `L` can be compared to values of type `R`. */ @@ -29,14 +29,18 @@ object CanEqual { // The next 6 definitions can go into the companion objects of their corresponding // classes. For now they are here in order not to have to touch the // source code of these classes + @since("3.1") given canEqualSeqs[T, U](using eq: CanEqual[T, U]): CanEqual[Seq[T], Seq[U]] = derived given canEqualSeq[T](using eq: CanEqual[T, T]): CanEqual[Seq[T], Seq[T]] = derived // for `case Nil` in pattern matching given canEqualSet[T, U](using eq: CanEqual[T, U]): CanEqual[Set[T], Set[U]] = derived + @since("3.1") given canEqualOptions[T, U](using eq: CanEqual[T, U]): CanEqual[Option[T], Option[U]] = derived + @since("3.1") given canEqualOption[T](using eq: CanEqual[T, T]): CanEqual[Option[T], Option[T]] = derived // for `case None` in pattern matching + @since("3.1") given canEqualEither[L1, R1, L2, R2]( using eqL: CanEqual[L1, L2], eqR: CanEqual[R1, R2] ): CanEqual[Either[L1, R1], Either[L2, R2]] = derived diff --git a/library/src/scala/Selectable.scala b/library/src/scala/Selectable.scala index 7a520ee6af64..536c760988ab 100644 --- a/library/src/scala/Selectable.scala +++ b/library/src/scala/Selectable.scala @@ -1,6 +1,6 @@ package scala -import scala.annotation.experimental +import scala.annotation.since /** A marker trait for objects that support structural selection via * `selectDynamic` and `applyDynamic` @@ -49,5 +49,6 @@ object Selectable: * the additional restriction that the signatures of the refinement and * the definition that implements the refinment must match. */ + @since("3.1") trait WithoutPreciseParameterTypes extends Selectable end Selectable diff --git a/library/src/scala/Tuple.scala b/library/src/scala/Tuple.scala index c509551ef12e..cc26061c203c 100644 --- a/library/src/scala/Tuple.scala +++ b/library/src/scala/Tuple.scala @@ -1,6 +1,6 @@ package scala -import annotation.{experimental, showAsInfix} +import annotation.{experimental, showAsInfix, since} import compiletime._ import compiletime.ops.int._ @@ -260,7 +260,9 @@ object Tuple { def fromProductTyped[P <: Product](p: P)(using m: scala.deriving.Mirror.ProductOf[P]): m.MirroredElemTypes = runtime.Tuples.fromProduct(p).asInstanceOf[m.MirroredElemTypes] + @since("3.1") given canEqualEmptyTuple: CanEqual[EmptyTuple, EmptyTuple] = CanEqual.derived + @since("3.1") given canEqualTuple[H1, T1 <: Tuple, H2, T2 <: Tuple]( using eqHead: CanEqual[H1, H2], eqTail: CanEqual[T1, T2] ): CanEqual[H1 *: T1, H2 *: T2] = CanEqual.derived diff --git a/library/src/scala/annotation/experimental.scala b/library/src/scala/annotation/experimental.scala index 3d7a023176e3..abd8012fbe54 100644 --- a/library/src/scala/annotation/experimental.scala +++ b/library/src/scala/annotation/experimental.scala @@ -5,4 +5,5 @@ package scala.annotation * @see [[https://dotty.epfl.ch/docs/reference/other-new-features/experimental-defs]] * @syntax markdown */ +@since("3.1") class experimental extends StaticAnnotation diff --git a/library/src/scala/annotation/internal/ErasedParam.scala b/library/src/scala/annotation/internal/ErasedParam.scala index a5ed192820c3..769b9a710d5f 100644 --- a/library/src/scala/annotation/internal/ErasedParam.scala +++ b/library/src/scala/annotation/internal/ErasedParam.scala @@ -2,4 +2,5 @@ package scala.annotation package internal /** An annotation produced by Namer to indicate an erased parameter */ +@since("3.1") final class ErasedParam() extends Annotation diff --git a/library/src/scala/annotation/internal/ProvisionalSuperClass.scala b/library/src/scala/annotation/internal/ProvisionalSuperClass.scala index 147b7b087c5a..a9748540de56 100644 --- a/library/src/scala/annotation/internal/ProvisionalSuperClass.scala +++ b/library/src/scala/annotation/internal/ProvisionalSuperClass.scala @@ -2,5 +2,6 @@ package scala.annotation package internal /** An annotation to record a provisional super class */ +@since("3.1") class ProvisionalSuperClass extends StaticAnnotation diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala index 7f097c099e90..88eecad65485 100644 --- a/library/src/scala/quoted/Quotes.scala +++ b/library/src/scala/quoted/Quotes.scala @@ -68,6 +68,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => * Emits an error and aborts if the expression does not represent a value or possibly contains side effects. * Otherwise returns the value. */ + @since("3.1") def valueOrAbort(using FromExpr[T]): T end extension @@ -803,15 +804,18 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => end IdentMethods /** Pattern representing a `_` wildcard. */ + @since("3.1") type Wildcard <: Ident /** `TypeTest` that allows testing at runtime in a pattern match if a `Tree` is a `Wildcard` */ + @since("3.1") given WildcardTypeTest: TypeTest[Tree, Wildcard] /** Module object of `type Wildcard` */ val Wildcard: WildcardModule /** Methods of the module object `val Wildcard` */ + @since("3.1") trait WildcardModule { this: Wildcard.type => /** Create a tree representing a `_` wildcard. */ def apply(): Wildcard @@ -1614,15 +1618,19 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => end WhileMethods /** `TypeTest` that allows testing at runtime in a pattern match if a `Tree` is a `TypedOrTest` */ + @since("3.1") given TypedOrTestTypeTest: TypeTest[Tree, TypedOrTest] /** Tree representing a type ascription or type test pattern `x: T` in the source code. */ + @since("3.1") type TypedOrTest <: Tree /** Module object of `type TypedOrTest` */ + @since("3.1") val TypedOrTest: TypedOrTestModule /** Methods of the module object `val TypedOrTest` */ + @since("3.1") trait TypedOrTestModule { this: TypedOrTest.type => /** Create a type ascription `: ` */ @@ -1635,9 +1643,11 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => } /** Makes extension methods on `TypedOrTest` available without any imports */ + @since("3.1") given TypedOrTestMethods: TypedOrTestMethods /** Extension methods of `TypedOrTest` */ + @since("3.1") trait TypedOrTestMethods: extension (self: TypedOrTest) def tree: Tree @@ -2165,6 +2175,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => /** Methods of the module object `val Unapply` */ trait UnapplyModule { this: Unapply.type => /** Create an `Unapply` tree representing a pattern `()(using )` */ + @since("3.1") def apply(fun: Term, implicits: List[Term], patterns: List[Tree]): Unapply /** Copy an `Unapply` tree representing a pattern `()(using )` */ def copy(original: Tree)(fun: Term, implicits: List[Term], patterns: List[Tree]): Unapply @@ -2278,6 +2289,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => /** Is this a given parameter clause `(using X1, ..., Xn)` or `(using x1: X1, ..., xn: Xn)` */ def isGiven: Boolean /** Is this a erased parameter clause `(erased x1: X1, ..., xn: Xn)` */ + @since("3.1") def isErased: Boolean end TermParamClauseMethods @@ -2563,6 +2575,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => * * @return true if the dealiased type of `self` is `TupleN[T1, T2, ..., Tn]` */ + @since("3.1") def isTupleN: Boolean /** The type , reduced if possible */ @@ -3712,6 +3725,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => def memberFields: List[Symbol] /** Get all non-private fields declared or inherited */ + @since("3.1") def fieldMembers: List[Symbol] /** Get non-private named methods defined directly inside the class */ diff --git a/library/src/scala/quoted/Type.scala b/library/src/scala/quoted/Type.scala index b2516171b4ae..6f1f7aefede7 100644 --- a/library/src/scala/quoted/Type.scala +++ b/library/src/scala/quoted/Type.scala @@ -1,6 +1,6 @@ package scala.quoted -import scala.annotation.{compileTimeOnly, experimental} +import scala.annotation.{compileTimeOnly, experimental, since} /** Type (or type constructor) `T` needed contextually when using `T` in a quoted expression `'{... T ...}` */ abstract class Type[T <: AnyKind] private[scala]: @@ -68,6 +68,7 @@ object Type: * ``` * @syntax markdown */ + @since("3.1") def valueOfTuple[T <: Tuple](using Type[T])(using Quotes): Option[T] = valueOfTuple(quotes.reflect.TypeRepr.of[T]).asInstanceOf[Option[T]] From d03c3271c73b5ba36a53c221d4404ca5c26c034a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Tue, 16 Nov 2021 15:11:53 +0100 Subject: [PATCH 1001/1244] Restrict scope of `since` annotation --- library/src/scala/annotation/since.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/scala/annotation/since.scala b/library/src/scala/annotation/since.scala index 082639dcfdd8..7fe57a0b4d96 100644 --- a/library/src/scala/annotation/since.scala +++ b/library/src/scala/annotation/since.scala @@ -1,4 +1,4 @@ package scala.annotation /** An annotation that is used to mark symbols added to the stdlib after 3.0 release */ -class since(scalaRelease: String) extends scala.annotation.StaticAnnotation \ No newline at end of file +private[scala] class since(scalaRelease: String) extends scala.annotation.StaticAnnotation \ No newline at end of file From 68017a3eae6ce74277d791efb29c9f079ffb4886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Wed, 17 Nov 2021 13:10:18 +0100 Subject: [PATCH 1002/1244] Check for types with `since` annotation --- compiler/src/dotty/tools/dotc/typer/RefChecks.scala | 11 +++++++++++ tests/neg/since/since_t3.0.scala | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala index d8cc59d2d430..3b03e7d91256 100644 --- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala @@ -986,6 +986,15 @@ object RefChecks { report.warning(i"$sym has an unparsable version number: ${ex.getMessage}", pos) case _ => + private def checkSinceAnnotInSignature(sym: Symbol, pos: SrcPos)(using Context) = + new TypeTraverser: + def traverse(tp: Type) = + if tp.typeSymbol.hasAnnotation(defn.SinceAnnot) then + checkSinceAnnot(tp.typeSymbol, pos) + else + traverseChildren(tp) + .traverse(sym.info) + /** If @migration is present (indicating that the symbol has changed semantics between versions), * emit a warning. */ @@ -1272,6 +1281,7 @@ class RefChecks extends MiniPhase { thisPhase => checkDeprecatedOvers(tree) checkExperimentalAnnots(tree.symbol) checkExperimentalSignature(tree.symbol, tree) + checkSinceAnnotInSignature(tree.symbol, tree) val sym = tree.symbol if (sym.exists && sym.owner.isTerm) { tree.rhs match { @@ -1294,6 +1304,7 @@ class RefChecks extends MiniPhase { thisPhase => checkDeprecatedOvers(tree) checkExperimentalAnnots(tree.symbol) checkExperimentalSignature(tree.symbol, tree) + checkSinceAnnotInSignature(tree.symbol, tree) checkImplicitNotFoundAnnotation.defDef(tree.symbol.denot) checkUnaryMethods(tree.symbol) tree diff --git a/tests/neg/since/since_t3.0.scala b/tests/neg/since/since_t3.0.scala index a902952b4f1d..79d709c1b4e7 100644 --- a/tests/neg/since/since_t3.0.scala +++ b/tests/neg/since/since_t3.0.scala @@ -2,5 +2,10 @@ import scala.quoted.* def useQuotes(using Quotes) = import quotes.reflect.* + def useFieldMember(s: Symbol) = s.fieldMember("abc") // error - useFieldMember \ No newline at end of file + def getWildcard: Wildcard = ??? // error + def acceptWildcard(w: Wildcard) = "" // error + def boundByWildcard[T <: Wildcard]: T = ??? // error + + (useFieldMember, getWildcard, acceptWildcard) // error \ No newline at end of file From 6e041110c415988de74cb344ce0372621b627614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Mon, 22 Nov 2021 12:01:46 +0100 Subject: [PATCH 1003/1244] wip --- tests/neg/since/since_t3.0.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/neg/since/since_t3.0.scala b/tests/neg/since/since_t3.0.scala index 79d709c1b4e7..1970034180bf 100644 --- a/tests/neg/since/since_t3.0.scala +++ b/tests/neg/since/since_t3.0.scala @@ -8,4 +8,9 @@ def useQuotes(using Quotes) = def acceptWildcard(w: Wildcard) = "" // error def boundByWildcard[T <: Wildcard]: T = ??? // error - (useFieldMember, getWildcard, acceptWildcard) // error \ No newline at end of file + (useFieldMember, getWildcard, acceptWildcard) // error + +def equality = + import language.strictEquality + val a = 1 :: Nil == Nil + val b = Some(5) == None // error \ No newline at end of file From 99080ede49b4f0f0839688d2e28cfa26e29e94be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Mon, 20 Dec 2021 17:31:45 +0100 Subject: [PATCH 1004/1244] Finalize work on @since and -scala-release: * Add missing @since annotations to definitions * Add missing checks for @since * Add more tests --- .../tools/dotc/config/ScalaRelease.scala | 21 +++++++ .../tools/dotc/config/ScalaSettings.scala | 5 +- .../src/dotty/tools/dotc/core/Contexts.scala | 27 +++++---- .../dotc/core/classfile/ClassfileParser.scala | 20 ++++++- .../dotc/core/tasty/DottyUnpickler.scala | 4 +- .../tools/dotc/core/tasty/TastyPickler.scala | 10 ++-- .../tools/dotc/quoted/PickledQuotes.scala | 2 +- .../dotty/tools/dotc/transform/Pickler.scala | 2 +- .../dotty/tools/dotc/typer/RefChecks.scala | 17 +++--- .../dotc/core/tasty/CommentPicklingTest.scala | 2 +- .../dotty/tools/vulpix/ParallelTesting.scala | 56 +++++++++---------- library/src/scala/annotation/since.scala | 2 +- tasty/src/dotty/tools/tasty/TastyFormat.scala | 14 ++--- .../tools/tasty/TastyHeaderUnpickler.scala | 25 ++++----- .../src/dotty/tools/tasty/TastyVersion.scala | 16 ++++++ .../tools/tasty/TastyVersionFormatTest.scala | 28 +++++----- .../neg/forwardCompat-export/Test_r3.0.scala | 5 ++ .../Test_r3.0.scala | 27 +++++++++ .../Test_r3.0.scala | 1 + .../Bar_2_r3.0.scala | 1 + .../Foo_1_r3.1.scala | 1 + tests/neg/since/since_t3.0.scala | 16 ------ .../Test_r3.0.scala | 2 + tests/pos/target_version/A_1_t3.0.scala | 2 - tests/pos/target_version/B_2_v3.0.scala | 2 - .../Equality_1_r3.0.scala | 5 ++ .../Test_2_c3.0.2.scala | 3 + .../Imports_1_r3.0.scala | 14 +++++ .../Test_2_c3.0.2.scala | 7 +++ 29 files changed, 218 insertions(+), 119 deletions(-) create mode 100644 compiler/src/dotty/tools/dotc/config/ScalaRelease.scala create mode 100644 tasty/src/dotty/tools/tasty/TastyVersion.scala create mode 100644 tests/neg/forwardCompat-export/Test_r3.0.scala create mode 100644 tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala create mode 100644 tests/neg/forwardCompat-leakingImplicit/Test_r3.0.scala create mode 100644 tests/neg/forwardCompat-rejectNewerTasty/Bar_2_r3.0.scala create mode 100644 tests/neg/forwardCompat-rejectNewerTasty/Foo_1_r3.1.scala delete mode 100644 tests/neg/since/since_t3.0.scala create mode 100644 tests/pos/forwardCompat-excludedExport/Test_r3.0.scala delete mode 100644 tests/pos/target_version/A_1_t3.0.scala delete mode 100644 tests/pos/target_version/B_2_v3.0.scala create mode 100644 tests/run/forwardCompat-strictEquals/Equality_1_r3.0.scala create mode 100644 tests/run/forwardCompat-strictEquals/Test_2_c3.0.2.scala create mode 100644 tests/run/forwardCompat-unusedImport/Imports_1_r3.0.scala create mode 100644 tests/run/forwardCompat-unusedImport/Test_2_c3.0.2.scala diff --git a/compiler/src/dotty/tools/dotc/config/ScalaRelease.scala b/compiler/src/dotty/tools/dotc/config/ScalaRelease.scala new file mode 100644 index 000000000000..9634768d309f --- /dev/null +++ b/compiler/src/dotty/tools/dotc/config/ScalaRelease.scala @@ -0,0 +1,21 @@ +package dotty.tools.dotc.config + +import dotty.tools.tasty.TastyVersion + +enum ScalaRelease(val majorVersion: Int, val minorVersion: Int) extends Ordered[ScalaRelease]: + case Release3_0 extends ScalaRelease(3, 0) + case Release3_1 extends ScalaRelease(3, 1) + + def show = s"$majorVersion.$minorVersion" + + def compare(that: ScalaRelease) = + val ord = summon[Ordering[(Int, Int)]] + ord.compare((majorVersion, minorVersion), (that.majorVersion, that.minorVersion)) + +object ScalaRelease: + def latest = Release3_1 + + def parse(name: String) = name match + case "3.0" => Some(Release3_0) + case "3.1" => Some(Release3_1) + case _ => None diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index 6abc9b2e2435..33407d7540e3 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -26,6 +26,9 @@ object ScalaSettings: (minTargetVersion to maxVersion).toList.map(_.toString) else List(minTargetVersion).map(_.toString) + def supportedScalaReleaseVersions: List[String] = + ScalaRelease.values.toList.map(_.show) + def defaultClasspath: String = sys.env.getOrElse("CLASSPATH", ".") def defaultPageWidth: Int = { @@ -101,7 +104,7 @@ trait CommonScalaSettings: val silentWarnings: Setting[Boolean] = BooleanSetting("-nowarn", "Silence all warnings.", aliases = List("--no-warnings")) val release: Setting[String] = ChoiceSetting("-release", "release", "Compile code with classes specific to the given version of the Java platform available on the classpath and emit bytecode for this version.", ScalaSettings.supportedReleaseVersions, "", aliases = List("--release")) - val scalaRelease: Setting[ScalaVersion] = VersionSetting("-scala-release", "Emit TASTy files that can be consumed by specified version of the compiler.") + val scalaRelease: Setting[String] = ChoiceSetting("-scala-release", "release", "Emit TASTy files that can be consumed by specified version of the compiler.", ScalaSettings.supportedScalaReleaseVersions, "", aliases = List("--scala-release")) val deprecation: Setting[Boolean] = BooleanSetting("-deprecation", "Emit warning and location for usages of deprecated APIs.", aliases = List("--deprecation")) val feature: Setting[Boolean] = BooleanSetting("-feature", "Emit warning and location for usages of features that should be imported explicitly.", aliases = List("--feature")) val explain: Setting[Boolean] = BooleanSetting("-explain", "Explain errors in more detail.", aliases = List("--explain")) diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala index ce827f6af59c..1265063be7e6 100644 --- a/compiler/src/dotty/tools/dotc/core/Contexts.scala +++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala @@ -24,7 +24,7 @@ import io.{AbstractFile, NoAbstractFile, PlainFile, Path} import scala.io.Codec import collection.mutable import printing._ -import config.{JavaPlatform, SJSPlatform, Platform, ScalaSettings} +import config.{JavaPlatform, SJSPlatform, Platform, ScalaSettings, ScalaRelease} import classfile.ReusableDataReader import StdNames.nme @@ -38,8 +38,8 @@ import xsbti.AnalysisCallback import plugins._ import java.util.concurrent.atomic.AtomicInteger import java.nio.file.InvalidPathException -import dotty.tools.tasty.TastyFormat -import dotty.tools.dotc.config.{ NoScalaVersion, SpecificScalaVersion, AnyScalaVersion } +import dotty.tools.tasty.{ TastyFormat, TastyVersion } +import dotty.tools.dotc.config.{ NoScalaVersion, SpecificScalaVersion, AnyScalaVersion, ScalaBuild } object Contexts { @@ -484,13 +484,20 @@ object Contexts { def importContext(imp: Import[?], sym: Symbol): FreshContext = fresh.setImportInfo(ImportInfo(sym, imp.selectors, imp.expr)) - def tastyVersion: (Int, Int, Int) = - base.settings.scalaRelease.value match - case NoScalaVersion => - import TastyFormat.* - (MajorVersion, MinorVersion, ExperimentalVersion) - case SpecificScalaVersion(maj, min, _, _) => (maj.toInt + 25, min.toInt, 0) - case AnyScalaVersion => (28, 0, 0) // 3.0 + def scalaRelease: ScalaRelease = + val releaseName = base.settings.scalaRelease.value + if releaseName.nonEmpty then ScalaRelease.parse(releaseName).get else ScalaRelease.latest + + def tastyVersion: TastyVersion = + import math.Ordered.orderingToOrdered + val latestRelease = ScalaRelease.latest + val specifiedRelease = scalaRelease + if ((specifiedRelease.majorVersion, specifiedRelease.minorVersion) < (latestRelease.majorVersion, latestRelease.majorVersion)) then + // This is needed to make -scala-release a no-op when set to the latest release for unstable versions of the compiler + // (which might have the tasty format version numbers set to higher values before they're decreased during a release) + TastyVersion.fromStableScalaRelease(specifiedRelease.majorVersion, specifiedRelease.minorVersion) + else + TastyVersion.compilerVersion /** Is the debug option set? */ def debug: Boolean = base.settings.Ydebug.value diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala index c0140c5b8641..162d625538b6 100644 --- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala +++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala @@ -3,7 +3,7 @@ package dotc package core package classfile -import dotty.tools.tasty.{ TastyReader, TastyHeaderUnpickler } +import dotty.tools.tasty.{ TastyFormat, TastyReader, TastyHeaderUnpickler, TastyVersion } import Contexts._, Symbols._, Types._, Names._, StdNames._, NameOps._, Scopes._, Decorators._ import SymDenotations._, unpickleScala2.Scala2Unpickler._, Constants._, Annotations._, util.Spans._ @@ -884,7 +884,7 @@ class ClassfileParser( } def unpickleTASTY(bytes: Array[Byte]): Some[Embedded] = { - val unpickler = new tasty.DottyUnpickler(bytes) + val unpickler = new tasty.DottyUnpickler(bytes, ctx.tastyVersion) unpickler.enter(roots = Set(classRoot, moduleRoot, moduleRoot.sourceModule))(using ctx.withSource(util.NoSource)) Some(unpickler) } @@ -950,9 +950,23 @@ class ClassfileParser( if (tastyBytes.nonEmpty) { val reader = new TastyReader(bytes, 0, 16) val expectedUUID = new UUID(reader.readUncompressedLong(), reader.readUncompressedLong()) - val tastyUUID = new TastyHeaderUnpickler(tastyBytes).readHeader() + val tastyHeader = new TastyHeaderUnpickler(tastyBytes).readFullHeader() + val fileTastyVersion = TastyVersion(tastyHeader.majorVersion, tastyHeader.minorVersion, tastyHeader.experimentalVersion) + val tastyUUID = tastyHeader.uuid if (expectedUUID != tastyUUID) report.warning(s"$classfile is out of sync with its TASTy file. Loaded TASTy file. Try cleaning the project to fix this issue", NoSourcePosition) + + val tastyFilePath = classfile.path.stripSuffix(".class") + ".tasty" + val isTastyCompatible = + TastyFormat.isVersionCompatible(fileVersion = fileTastyVersion, compilerVersion = ctx.tastyVersion) || + classRoot.symbol.showFullName.startsWith("scala.") // References to stdlib are considered safe because we check the values of @since annotations + + if !isTastyCompatible then + report.error(s"""The class ${classRoot.symbol.showFullName} cannot be loaded from file ${tastyFilePath} because its TASTy format version is too high + |highest allowed: ${ctx.tastyVersion.show} + |found: ${fileTastyVersion.show} + """.stripMargin) + return unpickleTASTY(tastyBytes) } } diff --git a/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala index ffcab8dc7a90..a9dac87413fe 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala @@ -10,7 +10,7 @@ import classfile.ClassfileParser import Names.SimpleName import TreeUnpickler.UnpickleMode -import dotty.tools.tasty.TastyReader +import dotty.tools.tasty.{ TastyReader, TastyVersion } import dotty.tools.tasty.TastyFormat.{ASTsSection, PositionsSection, CommentsSection} object DottyUnpickler { @@ -39,7 +39,7 @@ object DottyUnpickler { * @param bytes the bytearray containing the Tasty file from which we unpickle * @param mode the tasty file contains package (TopLevel), an expression (Term) or a type (TypeTree) */ -class DottyUnpickler(bytes: Array[Byte], mode: UnpickleMode = UnpickleMode.TopLevel) extends ClassfileParser.Embedded with tpd.TreeProvider { +class DottyUnpickler(bytes: Array[Byte], maximalTastyVersion: TastyVersion, mode: UnpickleMode = UnpickleMode.TopLevel) extends ClassfileParser.Embedded with tpd.TreeProvider { import tpd._ import DottyUnpickler._ diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala index 147eaef4eb7f..74b8b357e00c 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala @@ -36,14 +36,14 @@ class TastyPickler(val rootCls: ClassSymbol) { def lengthWithLength(buf: TastyBuffer) = buf.length + natSize(buf.length) - val (majorVersion, minorVersion, experimentalVersion) = ctx.tastyVersion - nameBuffer.assemble() sections.foreach(_._2.assemble()) val nameBufferHash = TastyHash.pjwHash64(nameBuffer.bytes) val treeSectionHash +: otherSectionHashes = sections.map(x => TastyHash.pjwHash64(x._2.bytes)) + val tastyVersion = ctx.tastyVersion + // Hash of name table and tree val uuidLow: Long = nameBufferHash ^ treeSectionHash // Hash of positions, comments and any additional section @@ -52,9 +52,9 @@ class TastyPickler(val rootCls: ClassSymbol) { val headerBuffer = { val buf = new TastyBuffer(header.length + TastyPickler.versionStringBytes.length + 32) for (ch <- header) buf.writeByte(ch.toByte) - buf.writeNat(majorVersion) - buf.writeNat(minorVersion) - buf.writeNat(experimentalVersion) + buf.writeNat(tastyVersion.major) + buf.writeNat(tastyVersion.minor) + buf.writeNat(tastyVersion.experimental) buf.writeNat(TastyPickler.versionStringBytes.length) buf.writeBytes(TastyPickler.versionStringBytes, TastyPickler.versionStringBytes.length) buf.writeUncompressedLong(uuidLow) diff --git a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala index 6347e6bc4dec..8c72177a76d0 100644 --- a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala +++ b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala @@ -193,7 +193,7 @@ object PickledQuotes { quotePickling.println(s"**** unpickling quote from TASTY\n${TastyPrinter.showContents(bytes, ctx.settings.color.value == "never")}") val mode = if (isType) UnpickleMode.TypeTree else UnpickleMode.Term - val unpickler = new DottyUnpickler(bytes, mode) + val unpickler = new DottyUnpickler(bytes, ctx.tastyVersion, mode) unpickler.enter(Set.empty) val tree = unpickler.tree diff --git a/compiler/src/dotty/tools/dotc/transform/Pickler.scala b/compiler/src/dotty/tools/dotc/transform/Pickler.scala index a7724b4a5a31..7752fc8f2a55 100644 --- a/compiler/src/dotty/tools/dotc/transform/Pickler.scala +++ b/compiler/src/dotty/tools/dotc/transform/Pickler.scala @@ -125,7 +125,7 @@ class Pickler extends Phase { ctx.initialize() val unpicklers = for ((cls, pickler) <- picklers) yield { - val unpickler = new DottyUnpickler(pickler.assembleParts()) + val unpickler = new DottyUnpickler(pickler.assembleParts(), ctx.tastyVersion) unpickler.enter(roots = Set.empty) cls -> unpickler } diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala index 3b03e7d91256..eb43580e8839 100644 --- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala @@ -15,7 +15,7 @@ import ast._ import MegaPhase._ import config.Printers.{checks, noPrinter} import scala.util.{Try, Failure, Success} -import config.{ScalaVersion, NoScalaVersion} +import config.{ScalaVersion, NoScalaVersion, ScalaRelease} import Decorators._ import OverridingPairs.isOverridingPair import typer.ErrorReporting._ @@ -976,14 +976,14 @@ object RefChecks { annot <- sym.getAnnotation(defn.SinceAnnot) version <- annot.argumentConstantString(0) do - val releaseVersion = ctx.settings.scalaRelease.value - ScalaVersion.parse(version) match - case Success(symVersion) if symVersion > ctx.settings.scalaRelease.value => + val releaseVersion = ctx.scalaRelease + ScalaRelease.parse(version) match + case Some(symVersion) if symVersion > releaseVersion => report.error( - i"$sym was added in Scala $version, therefore it cannot be used in the code targeting Scala ${releaseVersion.unparse}", + i"$sym was added in Scala $version, therefore it cannot be used in the code targeting Scala ${releaseVersion.show}", pos) - case Failure(ex) => - report.warning(i"$sym has an unparsable version number: ${ex.getMessage}", pos) + case None => + report.warning(i"$sym has an unparsable release name: '${version}'", pos) case _ => private def checkSinceAnnotInSignature(sym: Symbol, pos: SrcPos)(using Context) = @@ -1320,6 +1320,7 @@ class RefChecks extends MiniPhase { thisPhase => checkImplicitNotFoundAnnotation.template(cls.classDenot) checkExperimentalInheritance(cls) checkExperimentalAnnots(cls) + checkSinceAnnot(cls, cls.srcPos) tree } catch { @@ -1371,9 +1372,11 @@ class RefChecks extends MiniPhase { thisPhase => case TypeRef(_, sym: Symbol) => checkDeprecated(sym, tree.srcPos) checkExperimental(sym, tree.srcPos) + checkSinceAnnot(sym, tree.srcPos) case TermRef(_, sym: Symbol) => checkDeprecated(sym, tree.srcPos) checkExperimental(sym, tree.srcPos) + checkSinceAnnot(sym, tree.srcPos) case _ => } tree diff --git a/compiler/test/dotty/tools/dotc/core/tasty/CommentPicklingTest.scala b/compiler/test/dotty/tools/dotc/core/tasty/CommentPicklingTest.scala index ef5d5c5fd657..064eedd6dceb 100644 --- a/compiler/test/dotty/tools/dotc/core/tasty/CommentPicklingTest.scala +++ b/compiler/test/dotty/tools/dotc/core/tasty/CommentPicklingTest.scala @@ -114,7 +114,7 @@ class CommentPicklingTest { implicit val ctx: Context = setup(args, initCtx).map(_._2).getOrElse(initCtx) ctx.initialize() val trees = files.flatMap { f => - val unpickler = new DottyUnpickler(f.toByteArray()) + val unpickler = new DottyUnpickler(f.toByteArray(), ctx.tastyVersion) unpickler.enter(roots = Set.empty) unpickler.rootTrees(using ctx) } diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 537606afd584..0fcab853ece9 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -128,7 +128,7 @@ trait ParallelTesting extends RunnerOrchestration { self => } sb.toString + "\n\n" } - case self: SeparateCompilationSource => { // TODO: this is incorrect when using other versions of compiler + case self: SeparateCompilationSource => { // TODO: this won't work when using other versions of compiler val command = sb.toString val fsb = new StringBuilder(command) self.compilationGroups.foreach { (_, files) => @@ -174,25 +174,25 @@ trait ParallelTesting extends RunnerOrchestration { self => flags: TestFlags, outDir: JFile ) extends TestSource { - case class Group(ordinal: Int, compiler: String, target: String) + case class Group(ordinal: Int, compiler: String, release: String) lazy val compilationGroups: List[(Group, Array[JFile])] = - val Target = """t([\d\.]+)""".r - val Compiler = """v([\d\.]+)""".r + val Release = """r([\d\.]+)""".r + val Compiler = """c([\d\.]+)""".r val Ordinal = """(\d+)""".r def groupFor(file: JFile): Group = - val annotPart = file.getName.dropWhile(_ != '_').stripSuffix(".scala").stripSuffix(".java") - val annots = annotPart.split("_") - val ordinal = annots.collectFirst { case Ordinal(n) => n.toInt }.getOrElse(Int.MinValue) - val target = annots.collectFirst { case Target(t) => t }.getOrElse("") - val compiler = annots.collectFirst { case Compiler(c) => c}.getOrElse("") - Group(ordinal, compiler, target) + val groupSuffix = file.getName.dropWhile(_ != '_').stripSuffix(".scala").stripSuffix(".java") + val groupSuffixParts = groupSuffix.split("_") + val ordinal = groupSuffixParts.collectFirst { case Ordinal(n) => n.toInt }.getOrElse(Int.MinValue) + val release = groupSuffixParts.collectFirst { case Release(r) => r }.getOrElse("") + val compiler = groupSuffixParts.collectFirst { case Compiler(c) => c }.getOrElse("") + Group(ordinal, compiler, release) dir.listFiles .filter(isSourceFile) .groupBy(groupFor) .toList - .sortBy { (g, _) => (g.ordinal, g.compiler, g.target) } + .sortBy { (g, _) => (g.ordinal, g.compiler, g.release) } .map { (g, f) => (g, f.sorted) } def sourceFiles = compilationGroups.map(_._2).flatten.toArray @@ -215,7 +215,7 @@ trait ParallelTesting extends RunnerOrchestration { self => case testSource @ SeparateCompilationSource(_, dir, flags, outDir) => testSource.compilationGroups.map { (group, files) => - val flags1 = if group.target.isEmpty then flags else flags.and(s"-scala-release:${group.target}") + val flags1 = if group.release.isEmpty then flags else flags.and(s"-scala-release:${group.release}") if group.compiler.isEmpty then compile(files, flags1, suppressErrors, outDir) else @@ -509,7 +509,7 @@ trait ParallelTesting extends RunnerOrchestration { self => def substituteClasspath(old: String): String = old.split(JFile.pathSeparator).map { o => - if JFile(o) == JFile(Properties.dottyLibrary) then s"$compilerDir/lib/scala3-library_3-${trueVersions(compiler)}.jar" + if JFile(o) == JFile(Properties.dottyLibrary) then s"$compilerDir/lib/scala3-library_3-$compiler.jar" else o }.mkString(JFile.pathSeparator) @@ -517,7 +517,7 @@ trait ParallelTesting extends RunnerOrchestration { self => .withClasspath(targetDir.getPath) .and("-d", targetDir.getPath) - val reporter = TestReporter.reporter(realStdout, ERROR) // TODO: do some reporting + val reporter = TestReporter.reporter(realStdout, ERROR) val command = Array(compilerDir + "/bin/scalac") ++ flags1.all ++ files.map(_.getPath) val process = Runtime.getRuntime.exec(command) @@ -1401,24 +1401,20 @@ object ParallelTesting { f.getName.endsWith(".tasty") def getCompiler(version: String): JFile = - val patch = trueVersions(version) - val dir = cache.resolve(s"scala3-${patch}").toFile - if dir.exists then - dir - else - import scala.sys.process._ - val zipPath = cache.resolve(s"scala3-$patch.zip") - (URL(s"https://github.com/lampepfl/dotty/releases/download/$patch/scala3-$patch.zip") #>> zipPath.toFile #&& s"unzip $zipPath -d $cache").!! - dir - - - val trueVersions = Map( - "3.0" -> "3.0.2", - "3.1" -> "3.1.0" - ) + val dir = cache.resolve(s"scala3-${version}").toFile + synchronized { + if dir.exists then + dir + else + import scala.sys.process._ + val zipPath = cache.resolve(s"scala3-$version.zip") + val compilerDownloadUrl = s"https://github.com/lampepfl/dotty/releases/download/$version/scala3-$version.zip" + (URL(compilerDownloadUrl) #>> zipPath.toFile #&& s"unzip $zipPath -d $cache").!! + dir + } private lazy val cache = val dir = Files.createTempDirectory("dotty.tests") - // dir.toFile.deleteOnExit() + dir.toFile.deleteOnExit() dir } diff --git a/library/src/scala/annotation/since.scala b/library/src/scala/annotation/since.scala index 7fe57a0b4d96..3c335dc020ba 100644 --- a/library/src/scala/annotation/since.scala +++ b/library/src/scala/annotation/since.scala @@ -1,4 +1,4 @@ package scala.annotation /** An annotation that is used to mark symbols added to the stdlib after 3.0 release */ -private[scala] class since(scalaRelease: String) extends scala.annotation.StaticAnnotation \ No newline at end of file +private[scala] class since(scalaRelease: String) extends scala.annotation.StaticAnnotation diff --git a/tasty/src/dotty/tools/tasty/TastyFormat.scala b/tasty/src/dotty/tools/tasty/TastyFormat.scala index f4f72a6e7e19..046cda0efb53 100644 --- a/tasty/src/dotty/tools/tasty/TastyFormat.scala +++ b/tasty/src/dotty/tools/tasty/TastyFormat.scala @@ -343,16 +343,12 @@ object TastyFormat { * @syntax markdown */ def isVersionCompatible( - fileMajor: Int, - fileMinor: Int, - fileExperimental: Int, - compilerMajor: Int, - compilerMinor: Int, - compilerExperimental: Int + fileVersion: TastyVersion, + compilerVersion: TastyVersion ): Boolean = ( - fileMajor == compilerMajor && - ( fileMinor == compilerMinor && fileExperimental == compilerExperimental // full equality - || fileMinor < compilerMinor && fileExperimental == 0 // stable backwards compatibility + fileVersion.major == compilerVersion.major && + ( fileVersion.minor == compilerVersion.minor && fileVersion.experimental == compilerVersion.experimental // full equality + || fileVersion.minor < compilerVersion.minor && fileVersion.experimental == 0 // stable backwards compatibility ) ) diff --git a/tasty/src/dotty/tools/tasty/TastyHeaderUnpickler.scala b/tasty/src/dotty/tools/tasty/TastyHeaderUnpickler.scala index c0ed5dbd58fa..295250fdbad2 100644 --- a/tasty/src/dotty/tools/tasty/TastyHeaderUnpickler.scala +++ b/tasty/src/dotty/tools/tasty/TastyHeaderUnpickler.scala @@ -45,7 +45,8 @@ class TastyHeaderUnpickler(reader: TastyReader) { val fileMajor = readNat() if (fileMajor <= 27) { // old behavior before `tasty-core` 3.0.0-M4 val fileMinor = readNat() - val signature = signatureString(fileMajor, fileMinor, 0) + val fileTastyVersion = TastyVersion(fileMajor, fileMinor, 0) + val signature = signatureString(fileTastyVersion, TastyVersion.compilerVersion) throw new UnpickleException(signature + backIncompatAddendum + toolingAddendum) } else { @@ -59,17 +60,15 @@ class TastyHeaderUnpickler(reader: TastyReader) { new String(bytes, start.index, length) } + val fileTastyVersion = TastyVersion(fileMajor, fileMinor, fileExperimental) + val validVersion = TastyFormat.isVersionCompatible( - fileMajor = fileMajor, - fileMinor = fileMinor, - fileExperimental = fileExperimental, - compilerMajor = MajorVersion, - compilerMinor = MinorVersion, - compilerExperimental = ExperimentalVersion + fileVersion = fileTastyVersion, + compilerVersion = TastyVersion.compilerVersion ) check(validVersion, { - val signature = signatureString(fileMajor, fileMinor, fileExperimental) + val signature = signatureString(fileTastyVersion, TastyVersion.compilerVersion) val producedByAddendum = s"\nThe TASTy file was produced by $toolingVersion.$toolingAddendum" val msg = ( if (fileExperimental != 0) unstableAddendum @@ -100,16 +99,16 @@ object TastyHeaderUnpickler { "" ) - private def signatureString(fileMajor: Int, fileMinor: Int, fileExperimental: Int) = { + private def signatureString(found: TastyVersion, expected: TastyVersion) = { def showMinorVersion(min: Int, exp: Int) = { val expStr = if (exp == 0) "" else s" [unstable release: $exp]" s"$min$expStr" } - val minorVersion = showMinorVersion(MinorVersion, ExperimentalVersion) - val fileMinorVersion = showMinorVersion(fileMinor, fileExperimental) + val expectedMinorVersion = showMinorVersion(expected.minor, expected.experimental) + val foundMinorVersion = showMinorVersion(found.minor, found.experimental) s"""TASTy signature has wrong version. - | expected: {majorVersion: $MajorVersion, minorVersion: $minorVersion} - | found : {majorVersion: $fileMajor, minorVersion: $fileMinorVersion} + | expected: {majorVersion: ${expected.major}, minorVersion: $expectedMinorVersion} + | found : {majorVersion: ${found.major}, minorVersion: $foundMinorVersion} | |""".stripMargin } diff --git a/tasty/src/dotty/tools/tasty/TastyVersion.scala b/tasty/src/dotty/tools/tasty/TastyVersion.scala new file mode 100644 index 000000000000..9d7bd5c7ced9 --- /dev/null +++ b/tasty/src/dotty/tools/tasty/TastyVersion.scala @@ -0,0 +1,16 @@ +package dotty.tools.tasty + +case class TastyVersion(major: Int, minor: Int, experimental: Int) { + def show = s"$major.$minor-$experimental" +} + +object TastyVersion { + def compilerVersion = TastyVersion(TastyFormat.MajorVersion, TastyFormat.MinorVersion, TastyFormat.ExperimentalVersion) + + def fromStableScalaRelease(majorVersion: Int, minorVersion: Int) = { + val tastyMajor = majorVersion + 25 + val tastyMinor = minorVersion + TastyVersion(tastyMajor, tastyMinor, 0) + } + +} diff --git a/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala b/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala index 3e29c9baaf81..cdf27d366627 100644 --- a/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala +++ b/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala @@ -3,6 +3,8 @@ package dotty.tools.tasty import org.junit.Assert._ import org.junit.{Test, Ignore} +import dotty.tools.tasty.TastyVersion + import TastyFormat._ import TastyBuffer._ @@ -11,10 +13,10 @@ class TastyVersionFormatTest { import TastyVersionFormatTest._ /** aliases `TastyVersion.apply` */ - def compiler(major: Int, minor: Int, experimental: Experimental) = TastyVersion(major, minor, experimental) + def compiler(major: Int, minor: Int, experimental: Experimental) = tastyVersion(major, minor, experimental) /** aliases `TastyVersion.apply` */ - def file(major: Int, minor: Int, experimental: Experimental) = TastyVersion(major, minor, experimental) + def file(major: Int, minor: Int, experimental: Experimental) = tastyVersion(major, minor, experimental) @Test def accept_ExperimentalReadEQExperimental_EQMinor: Unit = { assert(file(28,1,Exp(1)) <:< compiler(28,1,Exp(1))) // same minor, same experimental @@ -69,22 +71,18 @@ object TastyVersionFormatTest { val Final: Experimental = 0 def Exp(i: Int): Experimental = i.ensuring(_ > 0) - case class TastyVersion(major: Int, minor: Int, experimental: Experimental) { file => + implicit class TastyVersionOps(fileVersion: TastyVersion) { + def <:<(compilerVersion: TastyVersion): Boolean = TastyFormat.isVersionCompatible(fileVersion, compilerVersion) + + /**if `file unrelated compiler` then tasty file must be rejected.*/ + def unrelatedTo(compilerVersion: TastyVersion): Boolean = !(fileVersion <:< compilerVersion) + } + + def tastyVersion(major: Int, minor: Int, experimental: Experimental) = { assert(major >= 0) assert(minor >= 0) assert(experimental >= 0) - - def <:<(compiler: TastyVersion): Boolean = TastyFormat.isVersionCompatible( - fileMajor = file.major, - fileMinor = file.minor, - fileExperimental = file.experimental, - compilerMajor = compiler.major, - compilerMinor = compiler.minor, - compilerExperimental = compiler.experimental - ) - - /**if `file unrelated compiler` then tasty file must be rejected.*/ - def unrelatedTo(compiler: TastyVersion): Boolean = !(file <:< compiler) + TastyVersion(major, minor, experimental) } } diff --git a/tests/neg/forwardCompat-export/Test_r3.0.scala b/tests/neg/forwardCompat-export/Test_r3.0.scala new file mode 100644 index 000000000000..92ba88d36d85 --- /dev/null +++ b/tests/neg/forwardCompat-export/Test_r3.0.scala @@ -0,0 +1,5 @@ +object A: + export CanEqual.canEqualOption // error + +object B: + export CanEqual.given // error diff --git a/tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala b/tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala new file mode 100644 index 000000000000..458040295b83 --- /dev/null +++ b/tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala @@ -0,0 +1,27 @@ +import scala.quoted.* + +def useQuotes(using Quotes) = + import quotes.reflect.* + + def useFieldMember(s: Symbol) = s.fieldMember("abc") // error + def getWildcard: Wildcard = ??? // error + def acceptWildcard(w: Wildcard) = "" // error + def boundByWildcard[T <: Wildcard]: T = ??? // error + + val wildcard = getWildcard // error + + type MyWildcard = Wildcard // error + + type Foo[W <: Wildcard] = Any // error + + type Bar[T] = T match { case Wildcard => Any } // error + + type Baz[T] = T match { case String => Wildcard } // error + + trait Wrapped[T] + trait WrappedWildcard extends Wrapped[Wildcard] // error + trait WrappedLikeWildcard[W <: Wildcard] extends Wrapped[W] // error + + class Box(w: Wildcard) // error + + def castToWildcard(x: Any) = x.asInstanceOf[Wildcard] // error // error diff --git a/tests/neg/forwardCompat-leakingImplicit/Test_r3.0.scala b/tests/neg/forwardCompat-leakingImplicit/Test_r3.0.scala new file mode 100644 index 000000000000..c9f0835bc053 --- /dev/null +++ b/tests/neg/forwardCompat-leakingImplicit/Test_r3.0.scala @@ -0,0 +1 @@ +val canEq = summon[CanEqual[EmptyTuple, EmptyTuple]] // error diff --git a/tests/neg/forwardCompat-rejectNewerTasty/Bar_2_r3.0.scala b/tests/neg/forwardCompat-rejectNewerTasty/Bar_2_r3.0.scala new file mode 100644 index 000000000000..d78004d6dedf --- /dev/null +++ b/tests/neg/forwardCompat-rejectNewerTasty/Bar_2_r3.0.scala @@ -0,0 +1 @@ +def bar = foo // nopos-error diff --git a/tests/neg/forwardCompat-rejectNewerTasty/Foo_1_r3.1.scala b/tests/neg/forwardCompat-rejectNewerTasty/Foo_1_r3.1.scala new file mode 100644 index 000000000000..fe04f0623a1c --- /dev/null +++ b/tests/neg/forwardCompat-rejectNewerTasty/Foo_1_r3.1.scala @@ -0,0 +1 @@ +def foo = 1 diff --git a/tests/neg/since/since_t3.0.scala b/tests/neg/since/since_t3.0.scala deleted file mode 100644 index 1970034180bf..000000000000 --- a/tests/neg/since/since_t3.0.scala +++ /dev/null @@ -1,16 +0,0 @@ -import scala.quoted.* - -def useQuotes(using Quotes) = - import quotes.reflect.* - - def useFieldMember(s: Symbol) = s.fieldMember("abc") // error - def getWildcard: Wildcard = ??? // error - def acceptWildcard(w: Wildcard) = "" // error - def boundByWildcard[T <: Wildcard]: T = ??? // error - - (useFieldMember, getWildcard, acceptWildcard) // error - -def equality = - import language.strictEquality - val a = 1 :: Nil == Nil - val b = Some(5) == None // error \ No newline at end of file diff --git a/tests/pos/forwardCompat-excludedExport/Test_r3.0.scala b/tests/pos/forwardCompat-excludedExport/Test_r3.0.scala new file mode 100644 index 000000000000..c635935471d8 --- /dev/null +++ b/tests/pos/forwardCompat-excludedExport/Test_r3.0.scala @@ -0,0 +1,2 @@ +object A: + export Tuple.{canEqualEmptyTuple as _, canEqualTuple as _, given, *} diff --git a/tests/pos/target_version/A_1_t3.0.scala b/tests/pos/target_version/A_1_t3.0.scala deleted file mode 100644 index 39402d87587f..000000000000 --- a/tests/pos/target_version/A_1_t3.0.scala +++ /dev/null @@ -1,2 +0,0 @@ -trait A: - def a: Int \ No newline at end of file diff --git a/tests/pos/target_version/B_2_v3.0.scala b/tests/pos/target_version/B_2_v3.0.scala deleted file mode 100644 index bb4ae81da4b4..000000000000 --- a/tests/pos/target_version/B_2_v3.0.scala +++ /dev/null @@ -1,2 +0,0 @@ -object B extends A: - def a = 7 \ No newline at end of file diff --git a/tests/run/forwardCompat-strictEquals/Equality_1_r3.0.scala b/tests/run/forwardCompat-strictEquals/Equality_1_r3.0.scala new file mode 100644 index 000000000000..538b85075bf9 --- /dev/null +++ b/tests/run/forwardCompat-strictEquals/Equality_1_r3.0.scala @@ -0,0 +1,5 @@ +// Instances of CanEqual are erased during compilation so their absence at runtime should not cause a crash + +import scala.language.strictEquality + +def emptyTupleEquality = EmptyTuple == EmptyTuple diff --git a/tests/run/forwardCompat-strictEquals/Test_2_c3.0.2.scala b/tests/run/forwardCompat-strictEquals/Test_2_c3.0.2.scala new file mode 100644 index 000000000000..1d1d811d0a9b --- /dev/null +++ b/tests/run/forwardCompat-strictEquals/Test_2_c3.0.2.scala @@ -0,0 +1,3 @@ +object Test: + def main(args: Array[String]): Unit = + println(emptyTupleEquality) diff --git a/tests/run/forwardCompat-unusedImport/Imports_1_r3.0.scala b/tests/run/forwardCompat-unusedImport/Imports_1_r3.0.scala new file mode 100644 index 000000000000..7946a9c9e2cc --- /dev/null +++ b/tests/run/forwardCompat-unusedImport/Imports_1_r3.0.scala @@ -0,0 +1,14 @@ +object A: + import scala.quoted.Type.valueOfTuple + +object B: + import scala.quoted.Type.* + +object C: + import Tuple.canEqualTuple + +object D: + import Tuple.given + +object E: + import Selectable.WithoutPreciseParameterTypes diff --git a/tests/run/forwardCompat-unusedImport/Test_2_c3.0.2.scala b/tests/run/forwardCompat-unusedImport/Test_2_c3.0.2.scala new file mode 100644 index 000000000000..c670ace4e768 --- /dev/null +++ b/tests/run/forwardCompat-unusedImport/Test_2_c3.0.2.scala @@ -0,0 +1,7 @@ +object Test: + def main(args: Array[String]): Unit = + println(A) + println(B) + println(C) + println(D) + println(E) From e99a5246837e51954f5bdde6524902fd6c2c7292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Tue, 28 Dec 2021 10:32:47 +0100 Subject: [PATCH 1005/1244] Reworks for forward compat: * Make -scala-release an experimental setting * Add better checks of of TASTy version * Validate names of releases inside since annotations * Extend Vulpix to check actual counts and possitions of errors from other compilers --- .../tools/dotc/config/ScalaSettings.scala | 2 +- .../src/dotty/tools/dotc/core/Contexts.scala | 6 ++-- .../dotc/core/classfile/ClassfileParser.scala | 23 +++++++----- .../dotty/tools/dotc/typer/RefChecks.scala | 14 ++++---- .../dotty/tools/vulpix/ParallelTesting.scala | 35 ++++++++++++++----- .../src/dotty/tools/tasty/TastyVersion.scala | 2 +- .../Test_r3.0.scala | 4 +++ tests/neg/forwardCompat-invalidSince.scala | 21 +++++++++++ .../Lib_1_r3.0.scala | 8 +++++ .../Test_2_c3.0.2.scala | 5 +++ .../Lib1_1_r3.0.scala | 8 +++++ .../Lib2_2_r3.0.scala | 3 ++ .../Test_3_c3.0.2.scala | 3 ++ .../Lib_1_r3.0.scala | 16 +++++++++ .../Test_2_c3.0.2.scala | 7 ++++ 15 files changed, 129 insertions(+), 28 deletions(-) create mode 100644 tests/neg/forwardCompat-invalidSince.scala create mode 100644 tests/neg/forwardCompat-nestedSumMirror/Lib_1_r3.0.scala create mode 100644 tests/neg/forwardCompat-nestedSumMirror/Test_2_c3.0.2.scala create mode 100644 tests/run/forwardCompat-nestedSumMirror/Lib1_1_r3.0.scala create mode 100644 tests/run/forwardCompat-nestedSumMirror/Lib2_2_r3.0.scala create mode 100644 tests/run/forwardCompat-nestedSumMirror/Test_3_c3.0.2.scala create mode 100644 tests/run/forwardCompat-refinedGivens/Lib_1_r3.0.scala create mode 100644 tests/run/forwardCompat-refinedGivens/Test_2_c3.0.2.scala diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index 33407d7540e3..4914b2714622 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -104,7 +104,6 @@ trait CommonScalaSettings: val silentWarnings: Setting[Boolean] = BooleanSetting("-nowarn", "Silence all warnings.", aliases = List("--no-warnings")) val release: Setting[String] = ChoiceSetting("-release", "release", "Compile code with classes specific to the given version of the Java platform available on the classpath and emit bytecode for this version.", ScalaSettings.supportedReleaseVersions, "", aliases = List("--release")) - val scalaRelease: Setting[String] = ChoiceSetting("-scala-release", "release", "Emit TASTy files that can be consumed by specified version of the compiler.", ScalaSettings.supportedScalaReleaseVersions, "", aliases = List("--scala-release")) val deprecation: Setting[Boolean] = BooleanSetting("-deprecation", "Emit warning and location for usages of deprecated APIs.", aliases = List("--deprecation")) val feature: Setting[Boolean] = BooleanSetting("-feature", "Emit warning and location for usages of features that should be imported explicitly.", aliases = List("--feature")) val explain: Setting[Boolean] = BooleanSetting("-explain", "Explain errors in more detail.", aliases = List("--explain")) @@ -311,6 +310,7 @@ private sealed trait YSettings: val YexplicitNulls: Setting[Boolean] = BooleanSetting("-Yexplicit-nulls", "Make reference types non-nullable. Nullable types can be expressed with unions: e.g. String|Null.") val YcheckInit: Setting[Boolean] = BooleanSetting("-Ysafe-init", "Ensure safe initialization of objects") val YrequireTargetName: Setting[Boolean] = BooleanSetting("-Yrequire-targetName", "Warn if an operator is defined without a @targetName annotation") + val YscalaRelease: Setting[String] = ChoiceSetting("-Yscala-release", "release", "Emit TASTy files that can be consumed by specified version of the compiler.", ScalaSettings.supportedScalaReleaseVersions, "", aliases = List("--Yscala-release")) /** Area-specific debug output */ val YexplainLowlevel: Setting[Boolean] = BooleanSetting("-Yexplain-lowlevel", "When explaining type errors, show types at a lower level.") diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala index 1265063be7e6..e3497b9fa3ab 100644 --- a/compiler/src/dotty/tools/dotc/core/Contexts.scala +++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala @@ -485,15 +485,15 @@ object Contexts { fresh.setImportInfo(ImportInfo(sym, imp.selectors, imp.expr)) def scalaRelease: ScalaRelease = - val releaseName = base.settings.scalaRelease.value + val releaseName = base.settings.YscalaRelease.value if releaseName.nonEmpty then ScalaRelease.parse(releaseName).get else ScalaRelease.latest def tastyVersion: TastyVersion = import math.Ordered.orderingToOrdered val latestRelease = ScalaRelease.latest val specifiedRelease = scalaRelease - if ((specifiedRelease.majorVersion, specifiedRelease.minorVersion) < (latestRelease.majorVersion, latestRelease.majorVersion)) then - // This is needed to make -scala-release a no-op when set to the latest release for unstable versions of the compiler + if ((specifiedRelease.majorVersion, specifiedRelease.minorVersion) < (latestRelease.majorVersion, latestRelease.minorVersion)) then + // This is needed to make -Yscala-release a no-op when set to the latest release for unstable versions of the compiler // (which might have the tasty format version numbers set to higher values before they're decreased during a release) TastyVersion.fromStableScalaRelease(specifiedRelease.majorVersion, specifiedRelease.minorVersion) else diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala index 162d625538b6..37690323854a 100644 --- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala +++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala @@ -957,16 +957,23 @@ class ClassfileParser( report.warning(s"$classfile is out of sync with its TASTy file. Loaded TASTy file. Try cleaning the project to fix this issue", NoSourcePosition) val tastyFilePath = classfile.path.stripSuffix(".class") + ".tasty" - val isTastyCompatible = - TastyFormat.isVersionCompatible(fileVersion = fileTastyVersion, compilerVersion = ctx.tastyVersion) || - classRoot.symbol.showFullName.startsWith("scala.") // References to stdlib are considered safe because we check the values of @since annotations - - if !isTastyCompatible then - report.error(s"""The class ${classRoot.symbol.showFullName} cannot be loaded from file ${tastyFilePath} because its TASTy format version is too high - |highest allowed: ${ctx.tastyVersion.show} - |found: ${fileTastyVersion.show} + + def reportWrongTasty(reason: String, highestAllowed: TastyVersion) = + report.error(s"""The class ${classRoot.symbol.showFullName} cannot be loaded from file ${tastyFilePath} because $reason: + |highest allowed: ${highestAllowed.show} + |found: ${fileTastyVersion.show} """.stripMargin) + val isTastyReadable = TastyFormat.isVersionCompatible(fileVersion = fileTastyVersion, compilerVersion = TastyVersion.compilerVersion) + if !isTastyReadable then + reportWrongTasty("its TASTy format cannot be read by the compiler", TastyVersion.compilerVersion) + else + val isTastyCompatible = + TastyFormat.isVersionCompatible(fileVersion = fileTastyVersion, compilerVersion = ctx.tastyVersion) || + classRoot.symbol.showFullName.startsWith("scala.") // References to stdlib are considered safe because we check the values of @since annotations + if !isTastyCompatible then + reportWrongTasty(s"its TASTy format is not compatible with the one of the targeted Scala release (${ctx.scalaRelease.show})", ctx.tastyVersion) + return unpickleTASTY(tastyBytes) } } diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala index eb43580e8839..c7ba668b7e79 100644 --- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala @@ -974,16 +974,15 @@ object RefChecks { private def checkSinceAnnot(sym: Symbol, pos: SrcPos)(using Context): Unit = for annot <- sym.getAnnotation(defn.SinceAnnot) - version <- annot.argumentConstantString(0) + releaseName <- annot.argumentConstantString(0) do - val releaseVersion = ctx.scalaRelease - ScalaRelease.parse(version) match - case Some(symVersion) if symVersion > releaseVersion => + ScalaRelease.parse(releaseName) match + case Some(release) if release > ctx.scalaRelease => report.error( - i"$sym was added in Scala $version, therefore it cannot be used in the code targeting Scala ${releaseVersion.show}", + i"$sym was added in Scala release ${releaseName.show}, therefore it cannot be used in the code targeting Scala ${ctx.scalaRelease.show}", pos) case None => - report.warning(i"$sym has an unparsable release name: '${version}'", pos) + report.error(i"$sym has an unparsable release name: '${releaseName}'", annot.tree.srcPos) case _ => private def checkSinceAnnotInSignature(sym: Symbol, pos: SrcPos)(using Context) = @@ -1281,6 +1280,7 @@ class RefChecks extends MiniPhase { thisPhase => checkDeprecatedOvers(tree) checkExperimentalAnnots(tree.symbol) checkExperimentalSignature(tree.symbol, tree) + checkSinceAnnot(tree.symbol, tree.srcPos) checkSinceAnnotInSignature(tree.symbol, tree) val sym = tree.symbol if (sym.exists && sym.owner.isTerm) { @@ -1320,7 +1320,6 @@ class RefChecks extends MiniPhase { thisPhase => checkImplicitNotFoundAnnotation.template(cls.classDenot) checkExperimentalInheritance(cls) checkExperimentalAnnots(cls) - checkSinceAnnot(cls, cls.srcPos) tree } catch { @@ -1384,6 +1383,7 @@ class RefChecks extends MiniPhase { thisPhase => override def transformTypeDef(tree: TypeDef)(using Context): TypeDef = { checkExperimentalAnnots(tree.symbol) + checkSinceAnnot(tree.symbol, tree.srcPos) tree } } diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 0fcab853ece9..5bf3b34173da 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -2,7 +2,7 @@ package dotty package tools package vulpix -import java.io.{File => JFile, IOException} +import java.io.{File => JFile, IOException, PrintStream, ByteArrayOutputStream} import java.lang.System.{lineSeparator => EOL} import java.net.URL import java.nio.file.StandardCopyOption.REPLACE_EXISTING @@ -13,7 +13,7 @@ import java.util.{HashMap, Timer, TimerTask} import java.util.concurrent.{TimeUnit, TimeoutException, Executors => JExecutors} import scala.collection.mutable -import scala.io.Source +import scala.io.{Codec, Source} import scala.util.{Random, Try, Failure => TryFailure, Success => TrySuccess, Using} import scala.util.control.NonFatal import scala.util.matching.Regex @@ -27,7 +27,7 @@ import dotc.interfaces.Diagnostic.ERROR import dotc.reporting.{Reporter, TestReporter} import dotc.reporting.Diagnostic import dotc.config.Config -import dotc.util.DiffUtil +import dotc.util.{DiffUtil, SourceFile, SourcePosition, Spans} import io.AbstractFile import dotty.tools.vulpix.TestConfiguration.defaultOptions @@ -215,7 +215,7 @@ trait ParallelTesting extends RunnerOrchestration { self => case testSource @ SeparateCompilationSource(_, dir, flags, outDir) => testSource.compilationGroups.map { (group, files) => - val flags1 = if group.release.isEmpty then flags else flags.and(s"-scala-release:${group.release}") + val flags1 = if group.release.isEmpty then flags else flags.and("-Yscala-release", group.release) if group.compiler.isEmpty then compile(files, flags1, suppressErrors, outDir) else @@ -504,6 +504,21 @@ trait ParallelTesting extends RunnerOrchestration { self => reporter } + private def parseErrors(errorsText: String, compilerVersion: String) = + val errorPattern = """.*Error: (.*\.scala):(\d+):(\d+).*""".r + errorsText.linesIterator.toSeq.collect { + case errorPattern(filePath, line, column) => + val lineNum = line.toInt + val columnNum = column.toInt + val abstractFile = AbstractFile.getFile(filePath) + val sourceFile = SourceFile(abstractFile, Codec.UTF8) + val offset = sourceFile.lineToOffset(lineNum - 1) + columnNum - 1 + val span = Spans.Span(offset) + val sourcePos = SourcePosition(sourceFile, span) + + Diagnostic.Error(s"Compilation of $filePath with Scala $compilerVersion failed at line: $line, column: $column. Full error output:\n\n$errorsText\n", sourcePos) + } + protected def compileWithOtherCompiler(compiler: String, files: Array[JFile], flags: TestFlags, targetDir: JFile): TestReporter = val compilerDir = getCompiler(compiler).toString @@ -517,14 +532,18 @@ trait ParallelTesting extends RunnerOrchestration { self => .withClasspath(targetDir.getPath) .and("-d", targetDir.getPath) - val reporter = TestReporter.reporter(realStdout, ERROR) + val dummyStream = new PrintStream(new ByteArrayOutputStream()) + val reporter = TestReporter.reporter(dummyStream, ERROR) val command = Array(compilerDir + "/bin/scalac") ++ flags1.all ++ files.map(_.getPath) val process = Runtime.getRuntime.exec(command) - val output = Source.fromInputStream(process.getErrorStream).mkString + val errorsText = Source.fromInputStream(process.getErrorStream).mkString if process.waitFor() != 0 then - echo(s"\nCompilation using Scala $compiler failed: \n$output") - fail() + val diagnostics = parseErrors(errorsText, compiler) + diagnostics.foreach { diag => + val context = (new ContextBase).initialCtx + reporter.report(diag)(using context) + } reporter diff --git a/tasty/src/dotty/tools/tasty/TastyVersion.scala b/tasty/src/dotty/tools/tasty/TastyVersion.scala index 9d7bd5c7ced9..f97433485a12 100644 --- a/tasty/src/dotty/tools/tasty/TastyVersion.scala +++ b/tasty/src/dotty/tools/tasty/TastyVersion.scala @@ -1,7 +1,7 @@ package dotty.tools.tasty case class TastyVersion(major: Int, minor: Int, experimental: Int) { - def show = s"$major.$minor-$experimental" + def show = "" + major + "." + minor + "-" + experimental } object TastyVersion { diff --git a/tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala b/tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala index 458040295b83..8dfeeeff3d29 100644 --- a/tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala +++ b/tests/neg/forwardCompat-illegalReferences/Test_r3.0.scala @@ -24,4 +24,8 @@ def useQuotes(using Quotes) = class Box(w: Wildcard) // error + // The inferred result type also gets reported even though it's not written explicitly def castToWildcard(x: Any) = x.asInstanceOf[Wildcard] // error // error + + // 2 errors reported because at the stage of compilation when this is checked (already after some code transformations) the illegal type is referred to more than once + val selectable: Any = new Selectable.WithoutPreciseParameterTypes {} // error // error diff --git a/tests/neg/forwardCompat-invalidSince.scala b/tests/neg/forwardCompat-invalidSince.scala new file mode 100644 index 000000000000..dfd128e84061 --- /dev/null +++ b/tests/neg/forwardCompat-invalidSince.scala @@ -0,0 +1,21 @@ +package scala.test + +import annotation.since + +@since("") // error +val x = 1 + +@since("1.2.3.4") // error +val y = "abc" + +@since("xyz") // error +class Foo + +@since("-3") // error +trait Bar + +@since("3.0.2") // error +type Baz = Int + +@since("3.0 ") // error +given String = "" \ No newline at end of file diff --git a/tests/neg/forwardCompat-nestedSumMirror/Lib_1_r3.0.scala b/tests/neg/forwardCompat-nestedSumMirror/Lib_1_r3.0.scala new file mode 100644 index 000000000000..aaac31229228 --- /dev/null +++ b/tests/neg/forwardCompat-nestedSumMirror/Lib_1_r3.0.scala @@ -0,0 +1,8 @@ +// Adapted from i11050 + +sealed trait TreeValue + +sealed trait SubLevel extends TreeValue + +case class Leaf1(value: String) extends TreeValue +case class Leaf2(value: Int) extends SubLevel diff --git a/tests/neg/forwardCompat-nestedSumMirror/Test_2_c3.0.2.scala b/tests/neg/forwardCompat-nestedSumMirror/Test_2_c3.0.2.scala new file mode 100644 index 000000000000..9fa2e4003002 --- /dev/null +++ b/tests/neg/forwardCompat-nestedSumMirror/Test_2_c3.0.2.scala @@ -0,0 +1,5 @@ +import scala.deriving._ + +object Test: + def main(args: Array[String]): Unit = + println(summon[Mirror.Of[TreeValue]]) // error diff --git a/tests/run/forwardCompat-nestedSumMirror/Lib1_1_r3.0.scala b/tests/run/forwardCompat-nestedSumMirror/Lib1_1_r3.0.scala new file mode 100644 index 000000000000..aaac31229228 --- /dev/null +++ b/tests/run/forwardCompat-nestedSumMirror/Lib1_1_r3.0.scala @@ -0,0 +1,8 @@ +// Adapted from i11050 + +sealed trait TreeValue + +sealed trait SubLevel extends TreeValue + +case class Leaf1(value: String) extends TreeValue +case class Leaf2(value: Int) extends SubLevel diff --git a/tests/run/forwardCompat-nestedSumMirror/Lib2_2_r3.0.scala b/tests/run/forwardCompat-nestedSumMirror/Lib2_2_r3.0.scala new file mode 100644 index 000000000000..833fe13bb71e --- /dev/null +++ b/tests/run/forwardCompat-nestedSumMirror/Lib2_2_r3.0.scala @@ -0,0 +1,3 @@ +import scala.deriving._ + +val treeValueMirror = summon[Mirror.Of[TreeValue]] \ No newline at end of file diff --git a/tests/run/forwardCompat-nestedSumMirror/Test_3_c3.0.2.scala b/tests/run/forwardCompat-nestedSumMirror/Test_3_c3.0.2.scala new file mode 100644 index 000000000000..13438d173ffb --- /dev/null +++ b/tests/run/forwardCompat-nestedSumMirror/Test_3_c3.0.2.scala @@ -0,0 +1,3 @@ +object Test: + def main(args: Array[String]): Unit = + println(treeValueMirror) diff --git a/tests/run/forwardCompat-refinedGivens/Lib_1_r3.0.scala b/tests/run/forwardCompat-refinedGivens/Lib_1_r3.0.scala new file mode 100644 index 000000000000..6da2077b0086 --- /dev/null +++ b/tests/run/forwardCompat-refinedGivens/Lib_1_r3.0.scala @@ -0,0 +1,16 @@ +// Adapted from i12949 + +object Catch22: + trait TC[V] + object TC: + export Hodor.TC.given + +object Hodor: + object TC: + import Catch22.TC + given fromString[V <: String]: TC[V] = new TC[V] {} + transparent inline given fromDouble[V <: Double]: TC[V] = + new TC[V]: + type Out = Double + given fromInt[V <: Int]: TC[V] with + type Out = Int \ No newline at end of file diff --git a/tests/run/forwardCompat-refinedGivens/Test_2_c3.0.2.scala b/tests/run/forwardCompat-refinedGivens/Test_2_c3.0.2.scala new file mode 100644 index 000000000000..35f2b594881d --- /dev/null +++ b/tests/run/forwardCompat-refinedGivens/Test_2_c3.0.2.scala @@ -0,0 +1,7 @@ +// Adapted from i12949 + +object Test: + def main(args: Array[String]): Unit = + summon[Catch22.TC["hi"]] + summon[Catch22.TC[7.7]] + summon[Catch22.TC[1]] From f88395d1add3a69399c02cabdd9c633566707f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Wed, 29 Dec 2021 11:35:16 +0100 Subject: [PATCH 1006/1244] Use a more portable way to download an old compiler for tests --- compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 5bf3b34173da..02fc8d785a61 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -1426,9 +1426,9 @@ object ParallelTesting { dir else import scala.sys.process._ - val zipPath = cache.resolve(s"scala3-$version.zip") - val compilerDownloadUrl = s"https://github.com/lampepfl/dotty/releases/download/$version/scala3-$version.zip" - (URL(compilerDownloadUrl) #>> zipPath.toFile #&& s"unzip $zipPath -d $cache").!! + val zipPath = cache.resolve(s"scala3-$version.tar.gz") + val compilerDownloadUrl = s"https://github.com/lampepfl/dotty/releases/download/$version/scala3-$version.tar.gz" + (URL(compilerDownloadUrl) #>> zipPath.toFile #&& s"tar -xf $zipPath -C $cache").!! dir } From 3104401512fbf23539797366209a107510b31ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Wed, 29 Dec 2021 13:34:30 +0100 Subject: [PATCH 1007/1244] scala-release: Adjust MiMa filters; Revert changes to tasty module --- .../tools/dotc/config/ScalaRelease.scala | 2 -- .../src/dotty/tools/dotc/core/Contexts.scala | 3 +- .../dotc/core/classfile/ClassfileParser.scala | 7 +++-- .../dotc/core/tasty/DottyUnpickler.scala | 2 +- .../tools/dotc/core}/tasty/TastyVersion.scala | 13 +++++++-- project/MiMaFilters.scala | 3 ++ tasty/src/dotty/tools/tasty/TastyFormat.scala | 14 ++++++---- .../tools/tasty/TastyHeaderUnpickler.scala | 25 +++++++++-------- .../tools/tasty/TastyVersionFormatTest.scala | 28 ++++++++++--------- 9 files changed, 57 insertions(+), 40 deletions(-) rename {tasty/src/dotty/tools => compiler/src/dotty/tools/dotc/core}/tasty/TastyVersion.scala (57%) diff --git a/compiler/src/dotty/tools/dotc/config/ScalaRelease.scala b/compiler/src/dotty/tools/dotc/config/ScalaRelease.scala index 9634768d309f..acca9ce9298c 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaRelease.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaRelease.scala @@ -1,7 +1,5 @@ package dotty.tools.dotc.config -import dotty.tools.tasty.TastyVersion - enum ScalaRelease(val majorVersion: Int, val minorVersion: Int) extends Ordered[ScalaRelease]: case Release3_0 extends ScalaRelease(3, 0) case Release3_1 extends ScalaRelease(3, 1) diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala index e3497b9fa3ab..0af08146bca0 100644 --- a/compiler/src/dotty/tools/dotc/core/Contexts.scala +++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala @@ -38,8 +38,9 @@ import xsbti.AnalysisCallback import plugins._ import java.util.concurrent.atomic.AtomicInteger import java.nio.file.InvalidPathException -import dotty.tools.tasty.{ TastyFormat, TastyVersion } +import dotty.tools.tasty.TastyFormat import dotty.tools.dotc.config.{ NoScalaVersion, SpecificScalaVersion, AnyScalaVersion, ScalaBuild } +import dotty.tools.dotc.core.tasty.TastyVersion object Contexts { diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala index 37690323854a..9e388b88b72a 100644 --- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala +++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala @@ -3,7 +3,7 @@ package dotc package core package classfile -import dotty.tools.tasty.{ TastyFormat, TastyReader, TastyHeaderUnpickler, TastyVersion } +import dotty.tools.tasty.{ TastyFormat, TastyReader, TastyHeaderUnpickler } import Contexts._, Symbols._, Types._, Names._, StdNames._, NameOps._, Scopes._, Decorators._ import SymDenotations._, unpickleScala2.Scala2Unpickler._, Constants._, Annotations._, util.Spans._ @@ -20,6 +20,7 @@ import java.util.UUID import scala.collection.immutable import scala.collection.mutable.{ ListBuffer, ArrayBuffer } import scala.annotation.switch +import tasty.TastyVersion import typer.Checking.checkNonCyclic import io.{AbstractFile, PlainFile, ZipArchive} import scala.util.control.NonFatal @@ -964,12 +965,12 @@ class ClassfileParser( |found: ${fileTastyVersion.show} """.stripMargin) - val isTastyReadable = TastyFormat.isVersionCompatible(fileVersion = fileTastyVersion, compilerVersion = TastyVersion.compilerVersion) + val isTastyReadable = fileTastyVersion.isCompatibleWith(TastyVersion.compilerVersion) if !isTastyReadable then reportWrongTasty("its TASTy format cannot be read by the compiler", TastyVersion.compilerVersion) else val isTastyCompatible = - TastyFormat.isVersionCompatible(fileVersion = fileTastyVersion, compilerVersion = ctx.tastyVersion) || + fileTastyVersion.isCompatibleWith(ctx.tastyVersion) || classRoot.symbol.showFullName.startsWith("scala.") // References to stdlib are considered safe because we check the values of @since annotations if !isTastyCompatible then reportWrongTasty(s"its TASTy format is not compatible with the one of the targeted Scala release (${ctx.scalaRelease.show})", ctx.tastyVersion) diff --git a/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala index a9dac87413fe..7396adf76991 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala @@ -10,7 +10,7 @@ import classfile.ClassfileParser import Names.SimpleName import TreeUnpickler.UnpickleMode -import dotty.tools.tasty.{ TastyReader, TastyVersion } +import dotty.tools.tasty.TastyReader import dotty.tools.tasty.TastyFormat.{ASTsSection, PositionsSection, CommentsSection} object DottyUnpickler { diff --git a/tasty/src/dotty/tools/tasty/TastyVersion.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyVersion.scala similarity index 57% rename from tasty/src/dotty/tools/tasty/TastyVersion.scala rename to compiler/src/dotty/tools/dotc/core/tasty/TastyVersion.scala index f97433485a12..9c417563a1e3 100644 --- a/tasty/src/dotty/tools/tasty/TastyVersion.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyVersion.scala @@ -1,7 +1,14 @@ -package dotty.tools.tasty +package dotty.tools.dotc.core.tasty + +import dotty.tools.tasty.TastyFormat case class TastyVersion(major: Int, minor: Int, experimental: Int) { - def show = "" + major + "." + minor + "-" + experimental + def show = s"$major.$minor-$experimental" + + def isCompatibleWith(that: TastyVersion): Boolean = TastyFormat.isVersionCompatible( + this.major, this.minor, this.experimental, + that.major, that.minor, that.experimental + ) } object TastyVersion { @@ -13,4 +20,4 @@ object TastyVersion { TastyVersion(tastyMajor, tastyMinor, 0) } -} +} \ No newline at end of file diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index 097a82ff2ef0..ff1e7ae906e2 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -27,5 +27,8 @@ object MiMaFilters { ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1"), ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$"), ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$minusmigration$"), + + // Private to the compiler - needed for forward binary compatibility + ProblemFilters.exclude[MissingClassProblem]("scala.annotation.since") ) } diff --git a/tasty/src/dotty/tools/tasty/TastyFormat.scala b/tasty/src/dotty/tools/tasty/TastyFormat.scala index 046cda0efb53..f4f72a6e7e19 100644 --- a/tasty/src/dotty/tools/tasty/TastyFormat.scala +++ b/tasty/src/dotty/tools/tasty/TastyFormat.scala @@ -343,12 +343,16 @@ object TastyFormat { * @syntax markdown */ def isVersionCompatible( - fileVersion: TastyVersion, - compilerVersion: TastyVersion + fileMajor: Int, + fileMinor: Int, + fileExperimental: Int, + compilerMajor: Int, + compilerMinor: Int, + compilerExperimental: Int ): Boolean = ( - fileVersion.major == compilerVersion.major && - ( fileVersion.minor == compilerVersion.minor && fileVersion.experimental == compilerVersion.experimental // full equality - || fileVersion.minor < compilerVersion.minor && fileVersion.experimental == 0 // stable backwards compatibility + fileMajor == compilerMajor && + ( fileMinor == compilerMinor && fileExperimental == compilerExperimental // full equality + || fileMinor < compilerMinor && fileExperimental == 0 // stable backwards compatibility ) ) diff --git a/tasty/src/dotty/tools/tasty/TastyHeaderUnpickler.scala b/tasty/src/dotty/tools/tasty/TastyHeaderUnpickler.scala index 295250fdbad2..c0ed5dbd58fa 100644 --- a/tasty/src/dotty/tools/tasty/TastyHeaderUnpickler.scala +++ b/tasty/src/dotty/tools/tasty/TastyHeaderUnpickler.scala @@ -45,8 +45,7 @@ class TastyHeaderUnpickler(reader: TastyReader) { val fileMajor = readNat() if (fileMajor <= 27) { // old behavior before `tasty-core` 3.0.0-M4 val fileMinor = readNat() - val fileTastyVersion = TastyVersion(fileMajor, fileMinor, 0) - val signature = signatureString(fileTastyVersion, TastyVersion.compilerVersion) + val signature = signatureString(fileMajor, fileMinor, 0) throw new UnpickleException(signature + backIncompatAddendum + toolingAddendum) } else { @@ -60,15 +59,17 @@ class TastyHeaderUnpickler(reader: TastyReader) { new String(bytes, start.index, length) } - val fileTastyVersion = TastyVersion(fileMajor, fileMinor, fileExperimental) - val validVersion = TastyFormat.isVersionCompatible( - fileVersion = fileTastyVersion, - compilerVersion = TastyVersion.compilerVersion + fileMajor = fileMajor, + fileMinor = fileMinor, + fileExperimental = fileExperimental, + compilerMajor = MajorVersion, + compilerMinor = MinorVersion, + compilerExperimental = ExperimentalVersion ) check(validVersion, { - val signature = signatureString(fileTastyVersion, TastyVersion.compilerVersion) + val signature = signatureString(fileMajor, fileMinor, fileExperimental) val producedByAddendum = s"\nThe TASTy file was produced by $toolingVersion.$toolingAddendum" val msg = ( if (fileExperimental != 0) unstableAddendum @@ -99,16 +100,16 @@ object TastyHeaderUnpickler { "" ) - private def signatureString(found: TastyVersion, expected: TastyVersion) = { + private def signatureString(fileMajor: Int, fileMinor: Int, fileExperimental: Int) = { def showMinorVersion(min: Int, exp: Int) = { val expStr = if (exp == 0) "" else s" [unstable release: $exp]" s"$min$expStr" } - val expectedMinorVersion = showMinorVersion(expected.minor, expected.experimental) - val foundMinorVersion = showMinorVersion(found.minor, found.experimental) + val minorVersion = showMinorVersion(MinorVersion, ExperimentalVersion) + val fileMinorVersion = showMinorVersion(fileMinor, fileExperimental) s"""TASTy signature has wrong version. - | expected: {majorVersion: ${expected.major}, minorVersion: $expectedMinorVersion} - | found : {majorVersion: ${found.major}, minorVersion: $foundMinorVersion} + | expected: {majorVersion: $MajorVersion, minorVersion: $minorVersion} + | found : {majorVersion: $fileMajor, minorVersion: $fileMinorVersion} | |""".stripMargin } diff --git a/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala b/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala index cdf27d366627..3e29c9baaf81 100644 --- a/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala +++ b/tasty/test/dotty/tools/tasty/TastyVersionFormatTest.scala @@ -3,8 +3,6 @@ package dotty.tools.tasty import org.junit.Assert._ import org.junit.{Test, Ignore} -import dotty.tools.tasty.TastyVersion - import TastyFormat._ import TastyBuffer._ @@ -13,10 +11,10 @@ class TastyVersionFormatTest { import TastyVersionFormatTest._ /** aliases `TastyVersion.apply` */ - def compiler(major: Int, minor: Int, experimental: Experimental) = tastyVersion(major, minor, experimental) + def compiler(major: Int, minor: Int, experimental: Experimental) = TastyVersion(major, minor, experimental) /** aliases `TastyVersion.apply` */ - def file(major: Int, minor: Int, experimental: Experimental) = tastyVersion(major, minor, experimental) + def file(major: Int, minor: Int, experimental: Experimental) = TastyVersion(major, minor, experimental) @Test def accept_ExperimentalReadEQExperimental_EQMinor: Unit = { assert(file(28,1,Exp(1)) <:< compiler(28,1,Exp(1))) // same minor, same experimental @@ -71,18 +69,22 @@ object TastyVersionFormatTest { val Final: Experimental = 0 def Exp(i: Int): Experimental = i.ensuring(_ > 0) - implicit class TastyVersionOps(fileVersion: TastyVersion) { - def <:<(compilerVersion: TastyVersion): Boolean = TastyFormat.isVersionCompatible(fileVersion, compilerVersion) - - /**if `file unrelated compiler` then tasty file must be rejected.*/ - def unrelatedTo(compilerVersion: TastyVersion): Boolean = !(fileVersion <:< compilerVersion) - } - - def tastyVersion(major: Int, minor: Int, experimental: Experimental) = { + case class TastyVersion(major: Int, minor: Int, experimental: Experimental) { file => assert(major >= 0) assert(minor >= 0) assert(experimental >= 0) - TastyVersion(major, minor, experimental) + + def <:<(compiler: TastyVersion): Boolean = TastyFormat.isVersionCompatible( + fileMajor = file.major, + fileMinor = file.minor, + fileExperimental = file.experimental, + compilerMajor = compiler.major, + compilerMinor = compiler.minor, + compilerExperimental = compiler.experimental + ) + + /**if `file unrelated compiler` then tasty file must be rejected.*/ + def unrelatedTo(compiler: TastyVersion): Boolean = !(file <:< compiler) } } From b7276eeb714023f5a736199dbb3a85bd710ed0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Wed, 12 Jan 2022 13:24:19 +0100 Subject: [PATCH 1008/1244] -Yscala-release support: extend community build with basic forward-compat tests (compiling selected projects with "-Yscala-release 3.0") --- .github/workflows/ci.yaml | 39 +++- .gitmodules | 31 +++ community-build/README.md | 2 +- .../cats-effect-3-forward-compat | 1 + .../community-projects/cats-forward-compat | 1 + .../cats-mtl-forward-compat | 1 + .../community-projects/coop-forward-compat | 1 + .../discipline-forward-compat | 1 + .../discipline-munit-forward-compat | 1 + .../discipline-specs2-forward-compat | 1 + .../community-projects/munit-forward-compat | 1 + .../scalacheck-forward-compat | 1 + .../simulacrum-scalafix-forward-compat | 1 + .../communitybuild/CommunityBuildRunner.scala | 5 +- .../src/scala/dotty/communitybuild/Main.scala | 2 +- .../scala/dotty/communitybuild/projects.scala | 220 +++++++++++------- .../communitybuild/CommunityBuildTest.scala | 14 ++ .../sbtplugin/CommunityBuildPlugin.scala | 30 ++- 18 files changed, 265 insertions(+), 88 deletions(-) create mode 160000 community-build/community-projects/cats-effect-3-forward-compat create mode 160000 community-build/community-projects/cats-forward-compat create mode 160000 community-build/community-projects/cats-mtl-forward-compat create mode 160000 community-build/community-projects/coop-forward-compat create mode 160000 community-build/community-projects/discipline-forward-compat create mode 160000 community-build/community-projects/discipline-munit-forward-compat create mode 160000 community-build/community-projects/discipline-specs2-forward-compat create mode 160000 community-build/community-projects/munit-forward-compat create mode 160000 community-build/community-projects/scalacheck-forward-compat create mode 160000 community-build/community-projects/simulacrum-scalafix-forward-compat diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index aa7a7a773a99..ad26d9881243 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -317,6 +317,43 @@ jobs: git submodule update --init --recursive --jobs 7 ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC" + community_build_forward_compat: + runs-on: [self-hosted, Linux] + container: + image: lampepfl/dotty:2021-03-22 + options: --cpu-shares 4096 + volumes: + - ${{ github.workspace }}/../../cache/sbt:/root/.sbt + - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache + - ${{ github.workspace }}/../../cache/general:/root/.cache + if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty' + || ( + github.event_name == 'workflow_dispatch' + && github.repository == 'lampepfl/dotty' + )" + + steps: + - name: Reset existing repo + run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true + + - name: Checkout cleanup script + uses: actions/checkout@v2 + + - name: Cleanup + run: .github/workflows/cleanup.sh + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Add SBT proxy repositories + run: cp -vf .github/workflows/repositories /root/.sbt/ ; true + + - name: Test + run: | + git submodule sync + git submodule update --init --recursive --jobs 7 + ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestForwardCompat" + test_sbt: runs-on: [self-hosted, Linux] container: @@ -415,7 +452,7 @@ jobs: - ${{ github.workspace }}/../../cache/sbt:/root/.sbt - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache - ${{ github.workspace }}/../../cache/general:/root/.cache - needs: [test_non_bootstrapped, test, community_build_a, community_build_b, community_build_c, test_sbt, test_java8] + needs: [test_non_bootstrapped, test, community_build_a, community_build_b, community_build_c, community_build_forward_compat, test_sbt, test_java8] if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'" env: NIGHTLYBUILD: yes diff --git a/.gitmodules b/.gitmodules index 848021e16a1b..3e88ba1c898e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -216,3 +216,34 @@ [submodule "community-build/community-projects/spire"] path = community-build/community-projects/spire url = https://github.com/dotty-staging/spire.git +[submodule "community-build/community-projects/munit-forward-compat"] + path = community-build/community-projects/munit-forward-compat + url = https://github.com/dotty-staging/munit.git +[submodule "community-build/community-projects/discipline-forward-compat"] + path = community-build/community-projects/discipline-forward-compat + url = https://github.com/dotty-staging/discipline.git +[submodule "community-build/community-projects/discipline-munit-forward-compat"] + path = community-build/community-projects/discipline-munit-forward-compat + url = https://github.com/dotty-staging/discipline-munit.git +[submodule "community-build/community-projects/discipline-specs2-forward-compat"] + path = community-build/community-projects/discipline-specs2-forward-compat + url = https://github.com/dotty-staging/discipline-specs2.git +[submodule "community-build/community-projects/simulacrum-scalafix-forward-compat"] + path = community-build/community-projects/simulacrum-scalafix-forward-compat + url = https://github.com/dotty-staging/simulacrum-scalafix.git +[submodule "community-build/community-projects/cats-forward-compat"] + path = community-build/community-projects/cats-forward-compat + url = https://github.com/dotty-staging/cats.git +[submodule "community-build/community-projects/cats-mtl-forward-compat"] + path = community-build/community-projects/cats-mtl-forward-compat + url = https://github.com/dotty-staging/cats-mtl.git +[submodule "community-build/community-projects/coop-forward-compat"] + path = community-build/community-projects/coop-forward-compat + url = https://github.com/dotty-staging/coop.git +[submodule "community-build/community-projects/cats-effect-3-forward-compat"] + path = community-build/community-projects/cats-effect-3-forward-compat + url = https://github.com/dotty-staging/cats-effect.git + branch = series/3.x +[submodule "community-build/community-projects/scalacheck-forward-compat"] + path = community-build/community-projects/scalacheck-forward-compat + url = https://github.com/dotty-staging/scalacheck diff --git a/community-build/README.md b/community-build/README.md index 297aad93ec46..26396d372936 100644 --- a/community-build/README.md +++ b/community-build/README.md @@ -17,6 +17,6 @@ To add your project to the community build you can follow these steps: 2. Open a PR against this repo that: - Adds your project as a new git submodule - - `git submodule add https://github.com/lampepfl/XYZ.git community-build/community-projects/XYZ` + - `git submodule add https://github.com/dotty-staging/XYZ.git community-build/community-projects/XYZ` - Add the project to [projects.scala](https://github.com/lampepfl/dotty/blob/master/community-build/src/scala/dotty/communitybuild/projects.scala) - Adds a test in [CommunityBuildTest.scala](https://github.com/lampepfl/dotty/blob/master/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala) diff --git a/community-build/community-projects/cats-effect-3-forward-compat b/community-build/community-projects/cats-effect-3-forward-compat new file mode 160000 index 000000000000..af11317d40ce --- /dev/null +++ b/community-build/community-projects/cats-effect-3-forward-compat @@ -0,0 +1 @@ +Subproject commit af11317d40cee8979c4e40b60431bc0f3b9e03f0 diff --git a/community-build/community-projects/cats-forward-compat b/community-build/community-projects/cats-forward-compat new file mode 160000 index 000000000000..878472d7bff4 --- /dev/null +++ b/community-build/community-projects/cats-forward-compat @@ -0,0 +1 @@ +Subproject commit 878472d7bff4c3bfec8a265782c1e0d6a3147541 diff --git a/community-build/community-projects/cats-mtl-forward-compat b/community-build/community-projects/cats-mtl-forward-compat new file mode 160000 index 000000000000..7679d606336a --- /dev/null +++ b/community-build/community-projects/cats-mtl-forward-compat @@ -0,0 +1 @@ +Subproject commit 7679d606336a4da0e6dfca43c0a481db273cc10c diff --git a/community-build/community-projects/coop-forward-compat b/community-build/community-projects/coop-forward-compat new file mode 160000 index 000000000000..4babee9613a4 --- /dev/null +++ b/community-build/community-projects/coop-forward-compat @@ -0,0 +1 @@ +Subproject commit 4babee9613a4bc0713d195676dd169c4f636a31a diff --git a/community-build/community-projects/discipline-forward-compat b/community-build/community-projects/discipline-forward-compat new file mode 160000 index 000000000000..b0865da0c5e0 --- /dev/null +++ b/community-build/community-projects/discipline-forward-compat @@ -0,0 +1 @@ +Subproject commit b0865da0c5e016ad1d45060f52885219256d3205 diff --git a/community-build/community-projects/discipline-munit-forward-compat b/community-build/community-projects/discipline-munit-forward-compat new file mode 160000 index 000000000000..014f8ca26fef --- /dev/null +++ b/community-build/community-projects/discipline-munit-forward-compat @@ -0,0 +1 @@ +Subproject commit 014f8ca26fefab7c32a2779b9d3382df14ccf860 diff --git a/community-build/community-projects/discipline-specs2-forward-compat b/community-build/community-projects/discipline-specs2-forward-compat new file mode 160000 index 000000000000..3603b0874940 --- /dev/null +++ b/community-build/community-projects/discipline-specs2-forward-compat @@ -0,0 +1 @@ +Subproject commit 3603b08749404f83946aab48203f8bd9f9410b49 diff --git a/community-build/community-projects/munit-forward-compat b/community-build/community-projects/munit-forward-compat new file mode 160000 index 000000000000..662953cdb57f --- /dev/null +++ b/community-build/community-projects/munit-forward-compat @@ -0,0 +1 @@ +Subproject commit 662953cdb57fec0d8e1baa7fcd1ab178a0bba8c6 diff --git a/community-build/community-projects/scalacheck-forward-compat b/community-build/community-projects/scalacheck-forward-compat new file mode 160000 index 000000000000..976db31cd549 --- /dev/null +++ b/community-build/community-projects/scalacheck-forward-compat @@ -0,0 +1 @@ +Subproject commit 976db31cd549328167a90ecc6f5f31efa83cd845 diff --git a/community-build/community-projects/simulacrum-scalafix-forward-compat b/community-build/community-projects/simulacrum-scalafix-forward-compat new file mode 160000 index 000000000000..2515271c46ad --- /dev/null +++ b/community-build/community-projects/simulacrum-scalafix-forward-compat @@ -0,0 +1 @@ +Subproject commit 2515271c46ad46512a43d20e1e8ae0793433cf0b diff --git a/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala b/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala index 5f0dffd15705..3d52a3ff0631 100644 --- a/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala +++ b/community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala @@ -17,10 +17,10 @@ object CommunityBuildRunner: * for more infrastructural details. */ extension (self: CommunityProject) def run()(using suite: CommunityBuildRunner): Unit = - if self.requiresExperimental && !compilerSupportExperimental then + if self.requiresExperimental && !self.compilerSupportExperimental then log(s"Skipping ${self.project} - it needs experimental features unsupported in this build.") return - self.dependencies.foreach(_.publish()) + self.dependencies().foreach(_.publish()) self.testOnlyDependencies().foreach(_.publish()) suite.runProject(self) @@ -45,6 +45,7 @@ trait CommunityBuildRunner: val project = projectDef.project val command = projectDef.binaryName val arguments = projectDef.buildCommands + val compilerVersion = projectDef.compilerVersion @annotation.tailrec def execTimes(task: () => Int, timesToRerun: Int): Boolean = diff --git a/community-build/src/scala/dotty/communitybuild/Main.scala b/community-build/src/scala/dotty/communitybuild/Main.scala index 852cee46af22..7c3a39261eb0 100644 --- a/community-build/src/scala/dotty/communitybuild/Main.scala +++ b/community-build/src/scala/dotty/communitybuild/Main.scala @@ -57,7 +57,7 @@ object Main: val (toRun, ignored) = allProjects.partition( p => p.docCommand != null - && (!p.requiresExperimental || compilerSupportExperimental) + && (!p.requiresExperimental || p.compilerSupportExperimental) ) val paths = toRun.map { project => diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 4450993b1848..eda9d55c3468 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -6,13 +6,10 @@ import java.nio.charset.StandardCharsets.UTF_8 lazy val communitybuildDir: Path = Paths.get(sys.props("user.dir")) -lazy val compilerVersion: String = +lazy val testedCompilerVersion: String = val file = communitybuildDir.resolve("scala3-bootstrapped.version") new String(Files.readAllBytes(file), UTF_8) -lazy val compilerSupportExperimental: Boolean = - compilerVersion.contains("SNAPSHOT") || compilerVersion.contains("NIGHTLY") - lazy val sbtPluginFilePath: String = // Workaround for https://github.com/sbt/sbt/issues/4395 new File(sys.props("user.home") + "/.sbt/1.0/plugins").mkdirs() @@ -39,17 +36,21 @@ sealed trait CommunityProject: val testCommand: String val publishCommand: String val docCommand: String - val dependencies: List[CommunityProject] + val dependencies: () => List[CommunityProject] val testOnlyDependencies: () => List[CommunityProject] val binaryName: String val runCommandsArgs: List[String] = Nil val requiresExperimental: Boolean val environment: Map[String, String] = Map.empty + val compilerVersion: String final val projectDir = communitybuildDir.resolve("community-projects").resolve(project) + final val compilerSupportExperimental: Boolean = + compilerVersion.contains("SNAPSHOT") || compilerVersion.contains("NIGHTLY") + final def publishDependencies(): Unit = - dependencies.foreach(_.publish()) + dependencies().foreach(_.publish()) /** Publish this project to the local Maven repository */ final def publish(): Unit = @@ -87,10 +88,11 @@ end CommunityProject final case class MillCommunityProject( project: String, baseCommand: String, - dependencies: List[CommunityProject] = Nil, + dependencies: () => List[CommunityProject] = () => Nil, testOnlyDependencies: () => List[CommunityProject] = () => Nil, ignoreDocs: Boolean = false, requiresExperimental: Boolean = false, + compilerVersion: String = testedCompilerVersion ) extends CommunityProject: override val binaryName: String = "./mill" override val testCommand = s"$baseCommand.test" @@ -105,12 +107,14 @@ final case class SbtCommunityProject( project: String, sbtTestCommand: String, extraSbtArgs: List[String] = Nil, - dependencies: List[CommunityProject] = Nil, + dependencies: () => List[CommunityProject] = () => Nil, testOnlyDependencies: () => List[CommunityProject] = () => Nil, sbtPublishCommand: String = null, sbtDocCommand: String = null, scalacOptions: List[String] = SbtCommunityProject.scalacOptions, requiresExperimental: Boolean = false, + compilerVersion: String = testedCompilerVersion, + isForwardCompatProject: Boolean = false ) extends CommunityProject: override val binaryName: String = "sbt" @@ -119,6 +123,7 @@ final case class SbtCommunityProject( private val baseCommand = "clean; set Global/logLevel := Level.Error; set Global/updateOptions ~= (_.withLatestSnapshots(false)); " + ++ (if isForwardCompatProject then "set Global / isForwardCompatProject := true; " else "") ++ (if scalacOptions.isEmpty then "" else s"""set Global/scalacOptions ++= $scalacOptionsString;""") ++ s"++$compilerVersion!; " @@ -146,6 +151,19 @@ final case class SbtCommunityProject( s"--addPluginSbtFile=$sbtPluginFilePath" ) + def forwardCompat: SbtCommunityProject = + this.copy( + project = project + "-forward-compat", + dependencies = () => dependencies().map(forwardCompatMapping), + testOnlyDependencies = () => testOnlyDependencies().map(forwardCompatMapping), + isForwardCompatProject = true + ) + + def withScalaRelease(release: String): SbtCommunityProject = + this.copy( + scalacOptions = scalacOptions ++ Seq("-Yscala-release", release) + ) + object SbtCommunityProject: def scalacOptions = List( "-Xcheck-macros", @@ -166,89 +184,89 @@ object projects: lazy val utest = MillCommunityProject( project = "utest", - baseCommand = s"utest.jvm[$compilerVersion]", + baseCommand = s"utest.jvm[$testedCompilerVersion]", ignoreDocs = true ) lazy val sourcecode = MillCommunityProject( project = "sourcecode", - baseCommand = s"sourcecode.jvm[$compilerVersion]", + baseCommand = s"sourcecode.jvm[$testedCompilerVersion]", ignoreDocs = true ) lazy val oslib = MillCommunityProject( project = "os-lib", - baseCommand = s"os.jvm[$compilerVersion]", - dependencies = List(utest, sourcecode) + baseCommand = s"os.jvm[$testedCompilerVersion]", + dependencies = () => List(utest, sourcecode) ) lazy val oslibWatch = MillCommunityProject( project = "os-lib", - baseCommand = s"os.watch[$compilerVersion]", - dependencies = List(utest, sourcecode), + baseCommand = s"os.watch[$testedCompilerVersion]", + dependencies = () => List(utest, sourcecode), ignoreDocs = true ) lazy val ujson = MillCommunityProject( project = "upickle", - baseCommand = s"ujson.jvm[$compilerVersion]", - dependencies = List(geny) + baseCommand = s"ujson.jvm[$testedCompilerVersion]", + dependencies = () => List(geny) ) lazy val upickle = MillCommunityProject( project = "upickle", - baseCommand = s"upickle.jvm[$compilerVersion]", - dependencies = List(geny, utest) + baseCommand = s"upickle.jvm[$testedCompilerVersion]", + dependencies = () => List(geny, utest) ) lazy val upickleCore = MillCommunityProject( project = "upickle", - baseCommand = s"core.jvm[$compilerVersion]", - dependencies = List(geny, utest) + baseCommand = s"core.jvm[$testedCompilerVersion]", + dependencies = () => List(geny, utest) ) lazy val upickleImplicits = MillCommunityProject( project = "upickle", - baseCommand = s"implicits.jvm[$compilerVersion]", - dependencies = List(upickleCore, ujson) + baseCommand = s"implicits.jvm[$testedCompilerVersion]", + dependencies = () => List(upickleCore, ujson) ) lazy val upack = MillCommunityProject( project = "upickle", - baseCommand = s"upack.jvm[$compilerVersion]", - dependencies = List(ujson, upickleCore) + baseCommand = s"upack.jvm[$testedCompilerVersion]", + dependencies = () => List(ujson, upickleCore) ) lazy val geny = MillCommunityProject( project = "geny", - baseCommand = s"geny.jvm[$compilerVersion]", - dependencies = List(utest) + baseCommand = s"geny.jvm[$testedCompilerVersion]", + dependencies = () => List(utest) ) lazy val fansi = MillCommunityProject( project = "fansi", - baseCommand = s"fansi.jvm[$compilerVersion]", - dependencies = List(utest, sourcecode), + baseCommand = s"fansi.jvm[$testedCompilerVersion]", + dependencies = () => List(utest, sourcecode), ignoreDocs = true ) lazy val pprint = MillCommunityProject( project = "PPrint", - baseCommand = s"pprint.jvm[$compilerVersion]", - dependencies = List(fansi), + baseCommand = s"pprint.jvm[$testedCompilerVersion]", + dependencies = () => List(fansi), ignoreDocs = true ) lazy val requests = MillCommunityProject( project = "requests-scala", - baseCommand = s"requests[$compilerVersion]", - dependencies = List(geny, utest, ujson, upickleCore) + baseCommand = s"requests[$testedCompilerVersion]", + dependencies = () => List(geny, utest, ujson, upickleCore) ) lazy val cask = MillCommunityProject( project = "cask", - baseCommand = s"cask[$compilerVersion]", - dependencies = List(utest, geny, sourcecode, pprint, upickle, upickleImplicits, upack, requests) + baseCommand = s"cask[$testedCompilerVersion]", + dependencies = () => List(utest, geny, sourcecode, pprint, upickle, upickleImplicits, upack, requests) ) lazy val scas = MillCommunityProject( @@ -276,6 +294,8 @@ object projects: sbtDocCommand = forceDoc("jvm") ) + lazy val scalacheckForwardCompat = scalacheck.forwardCompat.withScalaRelease("3.0") + lazy val scalatest: SbtCommunityProject = SbtCommunityProject( project = "scalatest", sbtTestCommand = @@ -297,7 +317,7 @@ object projects: // org.scalatest.Outcome // Problem parsing scalatest.dotty/target/scala-3.0.0-M2/src_managed/main/org/scalatest/concurrent/ConductorFixture.scala:[602..624..3843], documentation may not be generated. // dotty.tools.dotc.core.MissingType: - dependencies = List(scalaXml), + dependencies = () => List(scalaXml), testOnlyDependencies = () => List(scalatestplusJunit, scalatestplusTestNG) ) @@ -306,21 +326,21 @@ object projects: sbtTestCommand = "scalatestPlusScalaCheckJVM/test", sbtPublishCommand = "scalatestPlusScalaCheckJVM/publishLocal", sbtDocCommand = "scalatestPlusScalaCheckJVM/doc", - dependencies = List(scalatest, scalacheck) + dependencies = () => List(scalatest, scalacheck) ) lazy val scalatestplusJunit = SbtCommunityProject( project = "scalatestplus-junit", sbtTestCommand = "scalatestplus-junit/test", sbtPublishCommand = "scalatestplus-junit/publishLocal", - dependencies = List(scalatest) + dependencies = () => List(scalatest) ) lazy val scalatestplusTestNG = SbtCommunityProject( project = "scalatestplus-testng", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = List(scalatest) + dependencies = () => List(scalatest) ) lazy val scalaXml = SbtCommunityProject( @@ -356,7 +376,7 @@ object projects: project = "minitest", sbtTestCommand = "test", sbtDocCommand = aggregateDoc("lawsJVM")("minitestJVM"), - dependencies = List(scalacheck) + dependencies = () => List(scalacheck) ) lazy val fastparse = SbtCommunityProject( @@ -414,14 +434,14 @@ object projects: project = "sconfig", sbtTestCommand = "sconfigJVM/test", sbtDocCommand = "sconfigJVM/doc", - dependencies = List(scalaCollectionCompat) + dependencies = () => List(scalaCollectionCompat) ) lazy val zio = SbtCommunityProject( project = "zio", sbtTestCommand = "testJVMDotty", sbtDocCommand = forceDoc("coreJVM"), - dependencies = List(izumiReflect) + dependencies = () => List(izumiReflect) ) lazy val munit = SbtCommunityProject( @@ -429,15 +449,17 @@ object projects: sbtTestCommand = "testsJVM/test;testsJS/test;", sbtPublishCommand = "munitJVM/publishLocal; munitJS/publishLocal; munitScalacheckJVM/publishLocal; munitScalacheckJS/publishLocal; junit/publishLocal", sbtDocCommand = "junit/doc; munitJVM/doc", - dependencies = List(scalacheck) + dependencies = () => List(scalacheck) ) + lazy val munitForwardCompat = munit.forwardCompat.withScalaRelease("3.0") + lazy val scodecBits = SbtCommunityProject( project = "scodec-bits", sbtTestCommand = "coreJVM/test;coreJS/test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", sbtDocCommand = "coreJVM/doc", - dependencies = List(munit), + dependencies = () => List(munit), ) lazy val scodec = SbtCommunityProject( @@ -445,7 +467,7 @@ object projects: sbtTestCommand = "unitTests/test", // Adds package sbtDocCommand = "coreJVM/doc", - dependencies = List(munit, scodecBits), + dependencies = () => List(munit, scodecBits), ) lazy val scalaParserCombinators = SbtCommunityProject( @@ -478,7 +500,7 @@ object projects: // [error] class scalaz.iteratee.Iteratee cannot be unpickled because no class file was found sbtDocCommand = forceDoc("effectJVM"), - dependencies = List(scalacheck) + dependencies = () => List(scalacheck) ) lazy val endpoints4s = SbtCommunityProject( @@ -492,14 +514,16 @@ object projects: sbtTestCommand = "test", sbtPublishCommand = "publishLocal", sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc ;kernelJVM/doc", - dependencies = List(cats, coop, disciplineSpecs2, scalacheck) + dependencies = () => List(cats, coop, disciplineSpecs2, scalacheck) ) + lazy val catsEffect3ForwardCompat = catsEffect3.forwardCompat.withScalaRelease("3.0") + lazy val scalaParallelCollections = SbtCommunityProject( project = "scala-parallel-collections", sbtTestCommand = "test", sbtDocCommand = forceDoc("core"), - dependencies = List(scalacheck) + dependencies = () => List(scalacheck) ) lazy val scalaCollectionCompat = SbtCommunityProject( @@ -511,8 +535,8 @@ object projects: lazy val scalaJava8Compat = SbtCommunityProject( project = "scala-java8-compat", // the fnGen subproject must be built with 2.12.x - sbtTestCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; test", - sbtPublishCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; publishLocal", + sbtTestCommand = s"++2.12.14; ++$testedCompilerVersion; set fnGen/dependencyOverrides := Nil; test", + sbtPublishCommand = s"++2.12.14; ++$testedCompilerVersion; set fnGen/dependencyOverrides := Nil; publishLocal", scalacOptions = Nil // avoid passing Scala 3 options to Scala 2.12 in fnGen subproject ) @@ -527,67 +551,81 @@ object projects: project = "discipline", sbtTestCommand = "coreJVM/test;coreJS/test", sbtPublishCommand = "set every credentials := Nil;coreJVM/publishLocal;coreJS/publishLocal", - dependencies = List(scalacheck) + dependencies = () => List(scalacheck) ) + lazy val disciplineForwardCompat = discipline.forwardCompat.withScalaRelease("3.0") + lazy val disciplineMunit = SbtCommunityProject( project = "discipline-munit", sbtTestCommand = "coreJVM/test;coreJS/test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", - dependencies = List(discipline, munit) + dependencies = () => List(discipline, munit) ) + lazy val disciplineMunitForwardCompat = disciplineMunit.forwardCompat.withScalaRelease("3.0") + lazy val disciplineSpecs2 = SbtCommunityProject( project = "discipline-specs2", sbtTestCommand = "test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", - dependencies = List(discipline), + dependencies = () => List(discipline), scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init") ) + lazy val disciplineSpecs2ForwardCompat = disciplineSpecs2.forwardCompat.withScalaRelease("3.0") + lazy val simulacrumScalafixAnnotations = SbtCommunityProject( project = "simulacrum-scalafix", sbtTestCommand = "annotation/test:compile;annotationJS/test:compile", sbtPublishCommand = "annotation/publishLocal;annotationJS/publishLocal", ) + lazy val simulacrumScalafixAnnotationsForwardCompat = simulacrumScalafixAnnotations.forwardCompat.withScalaRelease("3.0") + lazy val cats = SbtCommunityProject( project = "cats", sbtTestCommand = "set Global/scalaJSStage := FastOptStage;buildJVM;validateAllJS", sbtPublishCommand = "catsJVM/publishLocal;catsJS/publishLocal", - dependencies = List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations), + dependencies = () => List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations), scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init") // disable -Ysafe-init, due to -Xfatal-warning ) + lazy val catsForwardCompat = cats.forwardCompat.withScalaRelease("3.0") + lazy val catsMtl = SbtCommunityProject( project = "cats-mtl", sbtTestCommand = "testsJVM/test;testsJS/test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal;lawsJVM/publishLocal;lawsJS/publishLocal", - dependencies = List(cats, disciplineMunit) + dependencies = () => List(cats, disciplineMunit) ) + lazy val catsMtlForwardCompat = catsMtl.forwardCompat.withScalaRelease("3.0") + lazy val coop = SbtCommunityProject( project = "coop", sbtTestCommand = "test", sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal", - dependencies = List(cats, catsMtl) + dependencies = () => List(cats, catsMtl) ) + lazy val coopForwardCompat = coop.forwardCompat.withScalaRelease("3.0") + // 'Sciss/Lucre' with its dependencies: lazy val scissEqual = SbtCommunityProject( project = "Equal", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", - dependencies = List(scalatest), + dependencies = () => List(scalatest), ) lazy val scissFingerTree = SbtCommunityProject( project = "FingerTree", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", - dependencies = List(scalatest), + dependencies = () => List(scalatest), ) lazy val scissLog = SbtCommunityProject( @@ -600,42 +638,42 @@ object projects: project = "Model", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", - dependencies = List(scalatest), + dependencies = () => List(scalatest), ) lazy val scissNumbers = SbtCommunityProject( project = "Numbers", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", - dependencies = List(scalatest), + dependencies = () => List(scalatest), ) lazy val scissSerial = SbtCommunityProject( project = "Serial", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", - dependencies = List(scalatest), + dependencies = () => List(scalatest), ) lazy val scissAsyncFile = SbtCommunityProject( project = "AsyncFile", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", - dependencies = List(scissLog, scalatest), + dependencies = () => List(scissLog, scalatest), ) lazy val scissSpan = SbtCommunityProject( project = "Span", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", - dependencies = List(scissSerial, scalatest), + dependencies = () => List(scissSerial, scalatest), ) lazy val scalaSTM = SbtCommunityProject( project = "scala-stm", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", - dependencies = List(scalatestplusJunit), + dependencies = () => List(scalatestplusJunit), ) lazy val scissLucre = SbtCommunityProject( @@ -643,14 +681,14 @@ object projects: sbtTestCommand = "adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;expr0JVM/test;expr1JVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test", extraSbtArgs = List("-Dde.sciss.lucre.ShortTests=true"), sbtPublishCommand = "adjunctJVM/publishLocal;baseJVM/publishLocal;confluentJVM/publishLocal;coreJVM/publishLocal;dataJVM/publishLocal;expr0JVM/publishLocal;expr1JVM/publishLocal;exprJVM/publishLocal;geomJVM/publishLocal;lucre-bdb/publishLocal", - dependencies = List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan, scalatest), + dependencies = () => List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan, scalatest), ) lazy val izumiReflect = SbtCommunityProject( project = "izumi-reflect", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = List(scalatest) + dependencies = () => List(scalatest) ) lazy val perspective = SbtCommunityProject( @@ -658,27 +696,27 @@ object projects: // No library with easy typeclasses to verify data against exist for Dotty, so no tests yet // Until then I guess this mainly serves to check that it still compiles at all sbtTestCommand = "dottyPerspectiveExamples/compile", - dependencies = List(cats) + dependencies = () => List(cats) ) lazy val akka = SbtCommunityProject( project = "akka", - extraSbtArgs = List(s"-Dakka.build.scalaVersion=$compilerVersion"), + extraSbtArgs = List(s"-Dakka.build.scalaVersion=$testedCompilerVersion"), sbtTestCommand = "set every targetSystemJdk := true; akka-actor-tests/Test/compile", - dependencies = List(scalatest, scalatestplusJunit, scalatestplusScalacheck) + dependencies = () => List(scalatest, scalatestplusJunit, scalatestplusScalacheck) ) lazy val monocle = SbtCommunityProject( project = "Monocle", sbtTestCommand = "coreJVM/test; macrosJVM/test; testJVM/test", - dependencies = List(cats, munit, discipline, disciplineMunit) + dependencies = () => List(cats, munit, discipline, disciplineMunit) ) lazy val protoquill = SbtCommunityProject( project = "protoquill", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = List(), // TODO add scalatest and pprint (see protoquill/build.sbt) + dependencies = () => List(), // TODO add scalatest and pprint (see protoquill/build.sbt) scalacOptions = List("-language:implicitConversions"), // disabled -Ysafe-init, due to bug in macro ) @@ -686,66 +724,79 @@ object projects: project = "onnx-scala", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = List(scalatest) + dependencies = () => List(scalatest) ) lazy val playJson = SbtCommunityProject( project = "play-json", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = List(scalatest, scalatestplusScalacheck), + dependencies = () => List(scalatest, scalatestplusScalacheck), ) lazy val munitCatsEffect = SbtCommunityProject( project = "munit-cats-effect", sbtTestCommand = "ce3JVM/test; ce3JS/test", sbtPublishCommand = "ce3JVM/publishLocal; ce3JS/publishLocal", - dependencies = List(munit, catsEffect3) + dependencies = () => List(munit, catsEffect3) ) lazy val scalacheckEffect = SbtCommunityProject( project = "scalacheck-effect", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = List(cats, catsEffect3, munit, scalacheck) + dependencies = () => List(cats, catsEffect3, munit, scalacheck) ) lazy val fs2 = SbtCommunityProject( project = "fs2", sbtTestCommand = "coreJVM/test; coreJS/test", // io/test requires JDK9+ sbtPublishCommand = "coreJVM/publishLocal; coreJS/publishLocal", - dependencies = List(cats, catsEffect3, munitCatsEffect, scalacheckEffect, scodecBits) + dependencies = () => List(cats, catsEffect3, munitCatsEffect, scalacheckEffect, scodecBits) ) lazy val libretto = SbtCommunityProject( project = "libretto", sbtTestCommand = "core/test; examples/compile", sbtPublishCommand = "core/publishLocal; examples/publishLocal", - dependencies = List(scalatest) + dependencies = () => List(scalatest) ) lazy val jacksonModuleScala = SbtCommunityProject( project = "jackson-module-scala", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = List(scalaJava8Compat, scalatest) + dependencies = () => List(scalaJava8Compat, scalatest) ) lazy val specs2 = SbtCommunityProject( project = "specs2", sbtTestCommand = "core/testOnly -- exclude ci", sbtPublishCommand = "core/publishLocal", - dependencies = List() + dependencies = () => List() ) lazy val spire = SbtCommunityProject( project = "spire", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = List(cats, algebra, disciplineMunit) + dependencies = () => List(cats, disciplineMunit) ) end projects +lazy val forwardCompatMapping = Map[CommunityProject, CommunityProject]( + projects.scalacheck -> projects.scalacheckForwardCompat, + projects.munit -> projects.munitForwardCompat, + projects.discipline -> projects.disciplineForwardCompat, + projects.disciplineMunit -> projects.disciplineMunitForwardCompat, + projects.disciplineSpecs2 -> projects.disciplineSpecs2ForwardCompat, + projects.simulacrumScalafixAnnotations -> projects.simulacrumScalafixAnnotationsForwardCompat, + projects.cats -> projects.catsForwardCompat, + projects.catsMtl -> projects.catsMtlForwardCompat, + projects.coop -> projects.coopForwardCompat, + projects.catsEffect3 -> projects.catsEffect3ForwardCompat, +) + def allProjects = List( projects.utest, projects.sourcecode, @@ -765,6 +816,7 @@ def allProjects = List( projects.intent, projects.algebra, projects.scalacheck, + projects.scalacheckForwardCompat, projects.scalatest, projects.scalatestplusScalacheck, projects.scalatestplusJunit, @@ -781,6 +833,7 @@ def allProjects = List( projects.sconfig, projects.zio, projects.munit, + projects.munitForwardCompat, projects.scodecBits, projects.scodec, projects.scalaParserCombinators, @@ -788,16 +841,23 @@ def allProjects = List( projects.scalaz, projects.endpoints4s, projects.catsEffect3, + projects.catsEffect3ForwardCompat, projects.scalaParallelCollections, projects.scalaCollectionCompat, projects.scalaJava8Compat, projects.verify, projects.discipline, + projects.disciplineForwardCompat, projects.disciplineMunit, + projects.disciplineMunitForwardCompat, projects.disciplineSpecs2, + projects.disciplineSpecs2ForwardCompat, projects.simulacrumScalafixAnnotations, + projects.simulacrumScalafixAnnotationsForwardCompat, projects.cats, + projects.catsForwardCompat, projects.catsMtl, + projects.catsMtlForwardCompat, projects.coop, projects.scissEqual, projects.scissFingerTree, @@ -823,6 +883,8 @@ def allProjects = List( projects.libretto, projects.jacksonModuleScala, projects.specs2, + projects.coop, + projects.coopForwardCompat ) lazy val projectMap = allProjects.groupBy(_.project) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 4aad0e26d265..f3f0bf90188e 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -100,3 +100,17 @@ class CommunityBuildTestC: @Test def verify = projects.verify.run() @Test def xmlInterpolator = projects.xmlInterpolator.run() end CommunityBuildTestC + +@Category(Array(classOf[TestCategory])) +class CommunityBuildTestForwardCompat: + @Test def catsEffect3ForwardCompat = projects.catsEffect3ForwardCompat.run() + @Test def catsForwardCompat = projects.catsForwardCompat.run() + @Test def catsMtlForwardCompat = projects.catsMtlForwardCompat.run() + @Test def coopForwardCompat = projects.coopForwardCompat.run() + @Test def disciplineForwardCompat = projects.disciplineForwardCompat.run() + @Test def disciplineMunitForwardCompat = projects.disciplineMunitForwardCompat.run() + @Test def disciplineSpecs2ForwardCompat = projects.disciplineSpecs2ForwardCompat.run() + @Test def munitForwardCompat = projects.munitForwardCompat.run() + @Test def scalacheckForwardCompat = projects.scalacheckForwardCompat.run() + @Test def simulacrumScalafixAnnotationsForwardCompat = projects.simulacrumScalafixAnnotationsForwardCompat.run() +end CommunityBuildTestForwardCompat diff --git a/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala b/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala index 0b580e1cb77a..536d8a36d453 100644 --- a/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala +++ b/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala @@ -15,6 +15,16 @@ object CommunityBuildPlugin extends AutoPlugin { override def requires = plugins.JvmPlugin override def trigger = allRequirements + object autoImport { + val isForwardCompatProject = settingKey[Boolean]("Is it a project used for testing forward binary compatibility?") + } + + import autoImport._ + + override val globalSettings: Seq[Setting[_]] = Seq( + isForwardCompatProject := false + ) + override val projectSettings: Seq[Setting[_]] = Seq( publishLocal := Def.taskDyn { val pubLocalResult = publishLocal.value @@ -23,14 +33,26 @@ object CommunityBuildPlugin extends AutoPlugin { CommunityBuildDependencies.publish(projectID.value) pubLocalResult } - }.value + }.value, + projectID := { + val id = projectID.value + if (isForwardCompatProject.value) { + val revision = if (id.revision.endsWith("-SNAPSHOT")) + id.revision.replace("-SNAPSHOT", "-forward-compat-SNAPSHOT") + else + id.revision + "-forward-compat" + id.withRevision(revision) + } else + id + } ) override val buildSettings: Seq[Setting[_]] = Seq( dependencyOverrides ++= { - if (scalaVersion.value.startsWith("3.")) - CommunityBuildDependencies.allOverrides(sLog.value) - else Nil + if (scalaVersion.value.startsWith("3.")) { + val predicate: ModuleID => Boolean = if (isForwardCompatProject.value) (_.revision.contains("-forward-compat")) else (!_.revision.contains("-forward-compat")) + CommunityBuildDependencies.allOverrides(sLog.value).filter(predicate) + } else Nil } ) } From 91fb1c524e507ad4988138ff3fecb5b9881e24cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Thu, 13 Jan 2022 18:07:24 +0100 Subject: [PATCH 1009/1244] -Yscala-release support: test cats-effect compiled with scala 3.0.2 while the dependencies are compiled with -Yscala-release 3.0; improve documentation --- .../src/scala/dotty/communitybuild/projects.scala | 2 +- .../src/dotty/tools/dotc/config/ScalaSettings.scala | 2 +- docs/docs/contributing/testing.md | 11 +++++++++++ .../sbtplugin/CommunityBuildPlugin.scala | 8 ++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index eda9d55c3468..52b2e958aa1d 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -517,7 +517,7 @@ object projects: dependencies = () => List(cats, coop, disciplineSpecs2, scalacheck) ) - lazy val catsEffect3ForwardCompat = catsEffect3.forwardCompat.withScalaRelease("3.0") + lazy val catsEffect3ForwardCompat = catsEffect3.forwardCompat.copy(compilerVersion = "3.0.2") lazy val scalaParallelCollections = SbtCommunityProject( project = "scala-parallel-collections", diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala index 4914b2714622..4dccad86e98c 100644 --- a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -310,7 +310,7 @@ private sealed trait YSettings: val YexplicitNulls: Setting[Boolean] = BooleanSetting("-Yexplicit-nulls", "Make reference types non-nullable. Nullable types can be expressed with unions: e.g. String|Null.") val YcheckInit: Setting[Boolean] = BooleanSetting("-Ysafe-init", "Ensure safe initialization of objects") val YrequireTargetName: Setting[Boolean] = BooleanSetting("-Yrequire-targetName", "Warn if an operator is defined without a @targetName annotation") - val YscalaRelease: Setting[String] = ChoiceSetting("-Yscala-release", "release", "Emit TASTy files that can be consumed by specified version of the compiler.", ScalaSettings.supportedScalaReleaseVersions, "", aliases = List("--Yscala-release")) + val YscalaRelease: Setting[String] = ChoiceSetting("-Yscala-release", "release", "Emit TASTy files that can be consumed by specified version of the compiler. The compilation will fail if for any reason valid TASTy cannot be produced (e.g. the code contains references to some parts of the standard library API that are missing in the older stdlib or uses language features unexpressible in the older version of TASTy format)", ScalaSettings.supportedScalaReleaseVersions, "", aliases = List("--Yscala-release")) /** Area-specific debug output */ val YexplainLowlevel: Setting[Boolean] = BooleanSetting("-Yexplain-lowlevel", "When explaining type errors, show types at a lower level.") diff --git a/docs/docs/contributing/testing.md b/docs/docs/contributing/testing.md index fa333634f07b..41e8b0b9b85e 100644 --- a/docs/docs/contributing/testing.md +++ b/docs/docs/contributing/testing.md @@ -127,6 +127,17 @@ $ sbt > testCompilation --help ``` +### Joint and separate sources compilation + +When the sources of a test consist of multiple source files places in a single directory they are passed to the compiler in a single run and the compiler decides in which order to compile them. In some cases, however, to reproduce a specific test scenario it might be necessary to compile the source files in several steps in a specified order. To achieve that one can add a `_${step_index}` suffix to a file name (before the `.scala` or `.java` extension) indicating the order of compilation. E.g. if the test directory contains files named `Foo_1.scala`, `Bar_2.scala` and `Baz_2.scala` then `Foo_1.scala` will be compiled first and after that `Bar_2.scala` together with `Baz_2.scala`. + +There are also other suffixes indicating how some particular files are compiled: +* `_c${compilerVersion}` - compile a file with a specific version of the compiler instead of the one developed on the current branch + (e.g. `Foo_c3.0.2.scala`) +* `_r${release}` - compile a file with a given value of `-Yscala-release` flag (e.g. `Foo_r3.0.scala`) + +Different suffixes can be mixed together (their order is not important although consistency is advised), e.g. `Foo_1_r3.0`, `Bar_2_c3.0.2`. + ### Bootstrapped-only tests To run `testCompilation` on a bootstrapped Dotty compiler, use diff --git a/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala b/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala index 536d8a36d453..ab5fc803f361 100644 --- a/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala +++ b/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala @@ -50,8 +50,12 @@ object CommunityBuildPlugin extends AutoPlugin { override val buildSettings: Seq[Setting[_]] = Seq( dependencyOverrides ++= { if (scalaVersion.value.startsWith("3.")) { - val predicate: ModuleID => Boolean = if (isForwardCompatProject.value) (_.revision.contains("-forward-compat")) else (!_.revision.contains("-forward-compat")) - CommunityBuildDependencies.allOverrides(sLog.value).filter(predicate) + val forwardCompatFilter: ModuleID => Boolean = if (isForwardCompatProject.value) (_.revision.contains("-forward-compat")) else (!_.revision.contains("-forward-compat")) + val stdlibOverrides = Seq( + scalaOrganization.value %% "scala3-library" % scalaVersion.value, + scalaOrganization.value %% "scala3-library_sjs1" % scalaVersion.value, + ) + CommunityBuildDependencies.allOverrides(sLog.value).filter(forwardCompatFilter) ++ stdlibOverrides } else Nil } ) From 0bf15e77d54424f3d0dcc373a9ae999a150e911c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Fri, 14 Jan 2022 12:25:48 +0100 Subject: [PATCH 1010/1244] -Yscala-release support: Improve caching artifacts downloaded for tests --- compiler/test/dotty/Properties.scala | 5 +++++ compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/compiler/test/dotty/Properties.scala b/compiler/test/dotty/Properties.scala index 042773505dc5..fd0d8c7c1886 100644 --- a/compiler/test/dotty/Properties.scala +++ b/compiler/test/dotty/Properties.scala @@ -15,6 +15,11 @@ object Properties { val isRunByCI: Boolean = sys.env.isDefinedAt("DOTTY_CI_RUN") || sys.env.isDefinedAt("DRONE") // TODO remove this when we drop Drone + val testCache: Path = + sys.env.get("DOTTY_TEST_CACHE").map(Paths.get(_)).getOrElse { + Paths.get(sys.props("user.home"), ".cache", "dotty", "test") + } + /** Tests should run interactive? */ val testsInteractive: Boolean = propIsNullOrTrue("dotty.tests.interactive") diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 02fc8d785a61..28ed07a82ebb 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -1426,14 +1426,15 @@ object ParallelTesting { dir else import scala.sys.process._ - val zipPath = cache.resolve(s"scala3-$version.tar.gz") + val archivePath = cache.resolve(s"scala3-$version.tar.gz") val compilerDownloadUrl = s"https://github.com/lampepfl/dotty/releases/download/$version/scala3-$version.tar.gz" - (URL(compilerDownloadUrl) #>> zipPath.toFile #&& s"tar -xf $zipPath -C $cache").!! + (URL(compilerDownloadUrl) #>> archivePath.toFile #&& s"tar -xf $archivePath -C $cache").!! + archivePath.toFile.delete() dir } private lazy val cache = - val dir = Files.createTempDirectory("dotty.tests") - dir.toFile.deleteOnExit() + val dir = Properties.testCache.resolve("compilers") + dir.toFile.mkdirs() dir } From f72265d9d95abe1540c825c2a012314c765e8e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Fri, 14 Jan 2022 12:34:22 +0100 Subject: [PATCH 1011/1244] -Yscala-release support: temporarily enable forward compat community build tests to run always --- .github/workflows/ci.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ad26d9881243..b5477b526ecc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -327,6 +327,12 @@ jobs: - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache - ${{ github.workspace }}/../../cache/general:/root/.cache if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty' + || github.event_name == 'push' + || ( + github.event_name == 'pull_request' + && !contains(github.event.pull_request.body, '[skip ci]') + && !contains(github.event.pull_request.body, '[skip community_build]') + ) || ( github.event_name == 'workflow_dispatch' && github.repository == 'lampepfl/dotty' From c7f02eae58b18f52018eda966f8b801cf3f33772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Mon, 17 Jan 2022 15:17:46 +0100 Subject: [PATCH 1012/1244] -Yscala-release support: checking if classes come from stdlib based on jar name; better documentation --- .../src/dotty/tools/dotc/core/Contexts.scala | 2 +- .../dotc/core/classfile/ClassfileParser.scala | 10 +++++--- .../language-versions/binary-compatibility.md | 25 +++++++++++++++++++ .../language-versions/language-versions.md | 6 +++++ .../source-compatibility.md} | 6 +++-- docs/sidebar.yml | 6 ++++- .../sbtplugin/CommunityBuildPlugin.scala | 2 +- 7 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 docs/docs/reference/language-versions/binary-compatibility.md create mode 100644 docs/docs/reference/language-versions/language-versions.md rename docs/docs/reference/{language-versions.md => language-versions/source-compatibility.md} (74%) diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala index 0af08146bca0..e9fbd6065261 100644 --- a/compiler/src/dotty/tools/dotc/core/Contexts.scala +++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala @@ -493,7 +493,7 @@ object Contexts { import math.Ordered.orderingToOrdered val latestRelease = ScalaRelease.latest val specifiedRelease = scalaRelease - if ((specifiedRelease.majorVersion, specifiedRelease.minorVersion) < (latestRelease.majorVersion, latestRelease.minorVersion)) then + if specifiedRelease < latestRelease then // This is needed to make -Yscala-release a no-op when set to the latest release for unstable versions of the compiler // (which might have the tasty format version numbers set to higher values before they're decreased during a release) TastyVersion.fromStableScalaRelease(specifiedRelease.majorVersion, specifiedRelease.minorVersion) diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala index 9e388b88b72a..264a46f92eff 100644 --- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala +++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala @@ -969,9 +969,13 @@ class ClassfileParser( if !isTastyReadable then reportWrongTasty("its TASTy format cannot be read by the compiler", TastyVersion.compilerVersion) else - val isTastyCompatible = - fileTastyVersion.isCompatibleWith(ctx.tastyVersion) || - classRoot.symbol.showFullName.startsWith("scala.") // References to stdlib are considered safe because we check the values of @since annotations + def isStdlibClass(cls: ClassDenotation): Boolean = + ctx.platform.classPath.findClassFile(cls.fullName.mangledString) match { + case Some(entry: ZipArchive#Entry) => + entry.underlyingSource.map(_.name.startsWith("scala3-library_3-")).getOrElse(false) + case _ => false + } + val isTastyCompatible = fileTastyVersion.isCompatibleWith(ctx.tastyVersion) || isStdlibClass(classRoot) if !isTastyCompatible then reportWrongTasty(s"its TASTy format is not compatible with the one of the targeted Scala release (${ctx.scalaRelease.show})", ctx.tastyVersion) diff --git a/docs/docs/reference/language-versions/binary-compatibility.md b/docs/docs/reference/language-versions/binary-compatibility.md new file mode 100644 index 000000000000..5697a3e7a388 --- /dev/null +++ b/docs/docs/reference/language-versions/binary-compatibility.md @@ -0,0 +1,25 @@ +--- +layout: doc-page +title: "Binary Compatibility" +--- + +Thanks to TASTy files, which are produced during compilation of Scala 3 sources, unlike Scala 2, Scala 3 is backward binary compatible between different minor versions (i.e. binary artifacts produced with Scala 3.x can be consumed by Scala 3.y programs as long as x <= y). +There are however already some ongoing attempts to make Scala 3 forward binary compatible which means that, with some restrictions, it might be possible to compile Scala code with a newer version of the compiler and then use the produced binaries as dependencies for a project using an older compiler. + +Scala 3.1.2-RC1 adds an experimental `-Yscala-release ` compiler flag which makes the compiler produce TASTy files that should be possible to use by all Scala 3 compilers in version `` or newer (this flag was inspired by how `-release` works for specifying the target version of JDK). More specifically this flag enforces emitting TASTy files in an older format ensuring that: +* the code contains no references to parts of the standard library which were added to the API after `` and would crash at runtime when a program is executed with the older version of the standard library on the classpath +* no dependency found on the classpath during compilation (except for the standard library itself) contains TASTy files produced by a compiler newer than `` (otherwise they could potentially leak such disallowed references to the standard library) +If any of the checks above is not fulfilled or for any other reason older TASTy cannot be emitted (e.g. the code uses some new language features which cannot be expressed the the older format) the entire compilation fails (with errors reported for each of such issues). + +As this feature is experimental it does not have any special support in build tools yet (at least not in sbt 1.6.1 or lower). +E.g. when a project gets compiled with Scala compiler `3.x1.y1` and `-Yscala-release 3.x2` option and then published using sbt +then the standard library in version `3.x1.y1` gets added to the project's dependencies instead of `3.x2.y2`. +When the dependencies are added to the classpath during compilation with Scala `3.x2.y2` the compiler will crash while trying to read TASTy files in the newer format. +A currently known workaround is to modify the build definition of the dependent project by explicitly overriding the version of Scala standard library in dependencies, e.g. + +```scala +dependencyOverrides ++= Seq( + scalaOrganization.value %% "scala3-library" % scalaVersion.value, + scalaOrganization.value %% "scala3-library_sjs1" % scalaVersion.value // for Scala.js projects +) +``` \ No newline at end of file diff --git a/docs/docs/reference/language-versions/language-versions.md b/docs/docs/reference/language-versions/language-versions.md new file mode 100644 index 000000000000..e98aba32fd34 --- /dev/null +++ b/docs/docs/reference/language-versions/language-versions.md @@ -0,0 +1,6 @@ +--- +layout: doc-page +title: "Language Versions" +--- + +Additional information on interoperability and migration between Scala 2 and 3 can be found [here](https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html). diff --git a/docs/docs/reference/language-versions.md b/docs/docs/reference/language-versions/source-compatibility.md similarity index 74% rename from docs/docs/reference/language-versions.md rename to docs/docs/reference/language-versions/source-compatibility.md index ef31ccc28707..029a3674ba73 100644 --- a/docs/docs/reference/language-versions.md +++ b/docs/docs/reference/language-versions/source-compatibility.md @@ -1,10 +1,12 @@ --- layout: doc-page -title: "Language Versions" +title: "Source Compatibility" movedTo: https://docs.scala-lang.org/scala3/reference/language-versions.html --- -The default Scala language version currently supported by the Dotty compiler is [`3.0`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$3/0$.html). There are also other language versions that can be specified instead: +Scala 3 does NOT guarantee source compatibility between different minor language versions (e.g. some syntax valid in 3.x might get deprecated and then phased out in 3.y for y > x). There are also some syntax structures that were valid in Scala 2 but are not anymore in Scala 3. However the compiler provides a possibility to specify the desired version of syntax used in a particular file or globally for a run of the compiler to make migration between versions easier. + +The default Scala language syntax version currently supported by the Dotty compiler is [`3.0`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$3/0$.html). There are also other language versions that can be specified instead: - [`3.0-migration`](https://scala-lang.org/api/3.x/scala/runtime/stdLibPatches/language$$3/0-migration$.html): Same as `3.0` but with a Scala 2 compatibility mode that helps moving Scala 2.13 sources over to Scala 3. In particular, it diff --git a/docs/sidebar.yml b/docs/sidebar.yml index 9ff759a98afe..6f8af7cd53eb 100644 --- a/docs/sidebar.yml +++ b/docs/sidebar.yml @@ -119,7 +119,11 @@ sidebar: - page: docs/reference/experimental/named-typeargs-spec.md - page: docs/reference/experimental/numeric-literals.md - page: docs/reference/syntax.md - - page: docs/reference/language-versions.md + - title: Language Versions + index: docs/reference/language-versions/language-versions.md + subsection: + - page: docs/reference/language-versions/source-compatibility.md + - page: docs/reference/language-versions/binary-compatibility.md - title: Contributing subsection: - page: docs/contributing/contribute-knowledge.md diff --git a/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala b/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala index ab5fc803f361..d6cebbfe3cac 100644 --- a/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala +++ b/sbt-community-build/src/dotty/communitybuild/sbtplugin/CommunityBuildPlugin.scala @@ -53,7 +53,7 @@ object CommunityBuildPlugin extends AutoPlugin { val forwardCompatFilter: ModuleID => Boolean = if (isForwardCompatProject.value) (_.revision.contains("-forward-compat")) else (!_.revision.contains("-forward-compat")) val stdlibOverrides = Seq( scalaOrganization.value %% "scala3-library" % scalaVersion.value, - scalaOrganization.value %% "scala3-library_sjs1" % scalaVersion.value, + scalaOrganization.value %% "scala3-library_sjs1" % scalaVersion.value ) CommunityBuildDependencies.allOverrides(sLog.value).filter(forwardCompatFilter) ++ stdlibOverrides } else Nil From 59444deeff08224452b56e36d730834dca85d325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Tue, 18 Jan 2022 14:22:41 +0100 Subject: [PATCH 1013/1244] -Yscala-release support: checking if classes come from stdlib based on jar name; better documentation - v2 --- .../scala/dotty/communitybuild/projects.scala | 2 +- .../dotc/core/classfile/ClassfileParser.scala | 2 +- .../language-versions/binary-compatibility.md | 18 +++++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 52b2e958aa1d..f91bf89ca363 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -601,7 +601,7 @@ object projects: dependencies = () => List(cats, disciplineMunit) ) - lazy val catsMtlForwardCompat = catsMtl.forwardCompat.withScalaRelease("3.0") + lazy val catsMtlForwardCompat = catsMtl.forwardCompat.copy(compilerVersion = "3.0.2") lazy val coop = SbtCommunityProject( project = "coop", diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala index 264a46f92eff..281ada4b9ae3 100644 --- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala +++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala @@ -972,7 +972,7 @@ class ClassfileParser( def isStdlibClass(cls: ClassDenotation): Boolean = ctx.platform.classPath.findClassFile(cls.fullName.mangledString) match { case Some(entry: ZipArchive#Entry) => - entry.underlyingSource.map(_.name.startsWith("scala3-library_3-")).getOrElse(false) + entry.underlyingSource.map(_.name.startsWith("scala3-library_")).getOrElse(false) case _ => false } val isTastyCompatible = fileTastyVersion.isCompatibleWith(ctx.tastyVersion) || isStdlibClass(classRoot) diff --git a/docs/docs/reference/language-versions/binary-compatibility.md b/docs/docs/reference/language-versions/binary-compatibility.md index 5697a3e7a388..1f04aaf4bdf2 100644 --- a/docs/docs/reference/language-versions/binary-compatibility.md +++ b/docs/docs/reference/language-versions/binary-compatibility.md @@ -3,12 +3,18 @@ layout: doc-page title: "Binary Compatibility" --- -Thanks to TASTy files, which are produced during compilation of Scala 3 sources, unlike Scala 2, Scala 3 is backward binary compatible between different minor versions (i.e. binary artifacts produced with Scala 3.x can be consumed by Scala 3.y programs as long as x <= y). -There are however already some ongoing attempts to make Scala 3 forward binary compatible which means that, with some restrictions, it might be possible to compile Scala code with a newer version of the compiler and then use the produced binaries as dependencies for a project using an older compiler. +In Scala 2 different minor versions of the compiler were free to change the way how they encode different language features in JVM bytecode so each bump of the compiler's minor version resulted in breaking binary compatibility and if a project had any Scala dependencies they all needed to be (cross-)compiled to the same minor Scala version that was used in that project itself. +While in Scala 3 the JVM encoding might still change between minor versions, an additional intermediate format of code representation called TASTy (from `Typed Abstract Syntax Tree`) was introduced. -Scala 3.1.2-RC1 adds an experimental `-Yscala-release ` compiler flag which makes the compiler produce TASTy files that should be possible to use by all Scala 3 compilers in version `` or newer (this flag was inspired by how `-release` works for specifying the target version of JDK). More specifically this flag enforces emitting TASTy files in an older format ensuring that: +TASTy files are produced from Scala 3 sources during compilation, together with classfiles, and they're normally also included in published artifacts. A Scala compiler in version `3.x1.y1` is able to read TASTy files produced by another compiler in version `3.x2.y2` if `x1 >= x2` (assuming two stable versions of the compiler are considered - `SNAPSHOT` or `NIGHTLY` compiler versions can read TASTy in an older stable format but their TASTY versions are not compatible between each other even if the compilers have the same minor version; also compilers in stable versions cannot read TASTy generated by an unstable version). While having TASTy files in an understandable format on its classpath a Scala 3 compiler can generate bytecode for a project's dependencies on the fly. + +Being able to bump the compiler version in a project without having to wait for all of its dependencies to do the same is already a big leap forward when compared to Scala 2. However, me might still try to do better, especially from the perspective of authors of libraries. +If you maintain a library and you would like it to be usable as a dependency for all Scala 3 projects, you would have to always emit TASTy in a version that would be readble by everyone, which would normally mean getting stuck at 3.0.x forever. + +To solve this problem a new experimental compiler flag `-Yscala-release ` (available since 3.1.2-RC1) has been added. Setting this flag makes the compiler produce TASTy files that should be possible to use by all Scala 3 compilers in version `` or newer (this flag was inspired by how `-release` works for specifying the target version of JDK). More specifically this enforces emitting TASTy files in an older format ensuring that: * the code contains no references to parts of the standard library which were added to the API after `` and would crash at runtime when a program is executed with the older version of the standard library on the classpath -* no dependency found on the classpath during compilation (except for the standard library itself) contains TASTy files produced by a compiler newer than `` (otherwise they could potentially leak such disallowed references to the standard library) +* no dependency found on the classpath during compilation (except for the standard library itself) contains TASTy files produced by a compiler newer than `` (otherwise they could potentially leak such disallowed references to the standard library). + If any of the checks above is not fulfilled or for any other reason older TASTy cannot be emitted (e.g. the code uses some new language features which cannot be expressed the the older format) the entire compilation fails (with errors reported for each of such issues). As this feature is experimental it does not have any special support in build tools yet (at least not in sbt 1.6.1 or lower). @@ -22,4 +28,6 @@ dependencyOverrides ++= Seq( scalaOrganization.value %% "scala3-library" % scalaVersion.value, scalaOrganization.value %% "scala3-library_sjs1" % scalaVersion.value // for Scala.js projects ) -``` \ No newline at end of file +``` + +The behaviour of `-Yscala-release` flag might still change in the future, especially it's not guaranteed that every new version of the compiler would be able to generate TASTy in all older formats going back to the one produced by `3.0.x` compiler. From b3facbdccdecb977dad2a9f8f8c7ed96819a7c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Wed, 19 Jan 2022 10:45:21 +0100 Subject: [PATCH 1014/1244] -Yscala-release support: fix documentation; run extended CI only for nightly builds --- .github/workflows/ci.yaml | 6 ------ .../tools/dotc/core/classfile/ClassfileParser.scala | 3 +++ .../language-versions/binary-compatibility.md | 11 +++++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b5477b526ecc..ad26d9881243 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -327,12 +327,6 @@ jobs: - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache - ${{ github.workspace }}/../../cache/general:/root/.cache if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty' - || github.event_name == 'push' - || ( - github.event_name == 'pull_request' - && !contains(github.event.pull_request.body, '[skip ci]') - && !contains(github.event.pull_request.body, '[skip community_build]') - ) || ( github.event_name == 'workflow_dispatch' && github.repository == 'lampepfl/dotty' diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala index 281ada4b9ae3..9920fc060142 100644 --- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala +++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala @@ -975,6 +975,9 @@ class ClassfileParser( entry.underlyingSource.map(_.name.startsWith("scala3-library_")).getOrElse(false) case _ => false } + // While emitting older TASTy the the newer standard library used by the compiler will still be on the class path so trying to read its TASTy files should not cause a crash. + // This is OK however because references to elements of stdlib API are validated according to the values of their `@since` annotations. + // This should guarantee that the code won't crash at runtime when used with the stdlib provided by an older compiler. val isTastyCompatible = fileTastyVersion.isCompatibleWith(ctx.tastyVersion) || isStdlibClass(classRoot) if !isTastyCompatible then reportWrongTasty(s"its TASTy format is not compatible with the one of the targeted Scala release (${ctx.scalaRelease.show})", ctx.tastyVersion) diff --git a/docs/docs/reference/language-versions/binary-compatibility.md b/docs/docs/reference/language-versions/binary-compatibility.md index 1f04aaf4bdf2..a25a4203fd6b 100644 --- a/docs/docs/reference/language-versions/binary-compatibility.md +++ b/docs/docs/reference/language-versions/binary-compatibility.md @@ -3,12 +3,15 @@ layout: doc-page title: "Binary Compatibility" --- -In Scala 2 different minor versions of the compiler were free to change the way how they encode different language features in JVM bytecode so each bump of the compiler's minor version resulted in breaking binary compatibility and if a project had any Scala dependencies they all needed to be (cross-)compiled to the same minor Scala version that was used in that project itself. -While in Scala 3 the JVM encoding might still change between minor versions, an additional intermediate format of code representation called TASTy (from `Typed Abstract Syntax Tree`) was introduced. +In Scala 2 different minor versions of the compiler were free to change the way how they encode different language features in JVM bytecode so each bump of the compiler's minor version resulted in breaking binary compatibility and if a project had any Scala dependencies they all needed to be (cross-)compiled to the same minor Scala version that was used in that project itself. On the contrary, Scala 3 has a stable encoding into JVM bytecode. -TASTy files are produced from Scala 3 sources during compilation, together with classfiles, and they're normally also included in published artifacts. A Scala compiler in version `3.x1.y1` is able to read TASTy files produced by another compiler in version `3.x2.y2` if `x1 >= x2` (assuming two stable versions of the compiler are considered - `SNAPSHOT` or `NIGHTLY` compiler versions can read TASTy in an older stable format but their TASTY versions are not compatible between each other even if the compilers have the same minor version; also compilers in stable versions cannot read TASTy generated by an unstable version). While having TASTy files in an understandable format on its classpath a Scala 3 compiler can generate bytecode for a project's dependencies on the fly. +In addition to classfiles the compilation process in Scala 3 also produces files with `.tasty` extension. The [TASTy](https://docs.scala-lang.org/scala3/guides/tasty-overview.html) format is an intermediate representation of Scala code containing full information about sources together with information provided by the typer. Some of this information is lost during generation of bytecode so Scala 3 compilers read TASTy files during compilation in addition to classfiles to know the exact types of values, methods, etc. in already compiled classes (although compilation from TASTy files only is also possible). TASTy files are also typically distributed together with classfiles in published artifacts. -Being able to bump the compiler version in a project without having to wait for all of its dependencies to do the same is already a big leap forward when compared to Scala 2. However, me might still try to do better, especially from the perspective of authors of libraries. +TASTy format is extensible but it preserves backward compatibility and the evolution happens between minor releases of the language. This means a Scala compiler in version `3.x1.y1` is able to read TASTy files produced by another compiler in version `3.x2.y2` if `x1 >= x2` (assuming two stable versions of the compiler are considered - `SNAPSHOT` or `NIGHTLY` compiler versions can read TASTy in an older stable format but their TASTY versions are not compatible between each other even if the compilers have the same minor version; also compilers in stable versions cannot read TASTy generated by an unstable version). + +TASTy version number has the format of `.-` and the numbering changes in parallel to language releases in such a way that a bump in language minor version corresponds to a bump in TASTy minor version (e.g. for Scala `3.0.0` the TASTy version is `28.0-0`). Experimental version set to 0 signifies a stable version while others are considered unstable/experimental. TASTy version is not strictly bound to the data format itself - any changes to the API of the standard library also require a change in TASTy minor version. + +Being able to bump the compiler version in a project without having to wait for all of its dependencies to do the same is already a big leap forward when compared to Scala 2. However, we might still try to do better, especially from the perspective of authors of libraries. If you maintain a library and you would like it to be usable as a dependency for all Scala 3 projects, you would have to always emit TASTy in a version that would be readble by everyone, which would normally mean getting stuck at 3.0.x forever. To solve this problem a new experimental compiler flag `-Yscala-release ` (available since 3.1.2-RC1) has been added. Setting this flag makes the compiler produce TASTy files that should be possible to use by all Scala 3 compilers in version `` or newer (this flag was inspired by how `-release` works for specifying the target version of JDK). More specifically this enforces emitting TASTy files in an older format ensuring that: From ea487471c6f47ff2acee0ba67fda647f9959ade4 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 17 Jan 2022 17:33:18 +0100 Subject: [PATCH 1015/1244] Add regression test --- tests/pos-macros/null-by-name/Macro_1.scala | 10 ++++++++++ tests/pos-macros/null-by-name/Test_2.scala | 1 + 2 files changed, 11 insertions(+) create mode 100644 tests/pos-macros/null-by-name/Macro_1.scala create mode 100644 tests/pos-macros/null-by-name/Test_2.scala diff --git a/tests/pos-macros/null-by-name/Macro_1.scala b/tests/pos-macros/null-by-name/Macro_1.scala new file mode 100644 index 000000000000..7d57990dd136 --- /dev/null +++ b/tests/pos-macros/null-by-name/Macro_1.scala @@ -0,0 +1,10 @@ +import scala.quoted.* + +inline def foo(x: => Any): Unit = + ${ impl('x) } + +private def impl(x: Expr[Any])(using Quotes) : Expr[Unit] = { + '{ + val a = $x + } +} diff --git a/tests/pos-macros/null-by-name/Test_2.scala b/tests/pos-macros/null-by-name/Test_2.scala new file mode 100644 index 000000000000..34f5a3111ac6 --- /dev/null +++ b/tests/pos-macros/null-by-name/Test_2.scala @@ -0,0 +1 @@ +def test = foo(null) From a67f1df46b64d51c8e892e4c129e45489823e66b Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Wed, 12 Jan 2022 22:57:10 +0100 Subject: [PATCH 1016/1244] Fix #7512: Normalize match type arguments The newly added test is blacklisted for pickling tests because the after pickler code path doesn't go thought TypeApplications and keeps types un-normalized, albeit equivalant to their before pickling counterparts. --- .../src/dotty/tools/dotc/core/Types.scala | 2 +- .../test/dotc/pos-test-pickling.blacklist | 1 + tests/pos/7512.scala | 24 +++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 tests/pos/7512.scala diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 2d02546a6d5e..b090682a4cd1 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4171,7 +4171,7 @@ object Types { case MatchAlias(alias) => trace(i"normalize $this", typr, show = true) { MatchTypeTrace.recurseWith(this) { - alias.applyIfParameterized(args).tryNormalize + alias.applyIfParameterized(args.map(_.normalized)).tryNormalize } } case _ => diff --git a/compiler/test/dotc/pos-test-pickling.blacklist b/compiler/test/dotc/pos-test-pickling.blacklist index c913933c6537..b42d41f0df85 100644 --- a/compiler/test/dotc/pos-test-pickling.blacklist +++ b/compiler/test/dotc/pos-test-pickling.blacklist @@ -39,6 +39,7 @@ i9999.scala 9757.scala 9890.scala 13491.scala +7512.scala # Opaque type i5720.scala diff --git a/tests/pos/7512.scala b/tests/pos/7512.scala new file mode 100644 index 000000000000..fbc8ae6a72e3 --- /dev/null +++ b/tests/pos/7512.scala @@ -0,0 +1,24 @@ +import scala.compiletime.ops.int.S + +object InfiniteLoopMatchType { + def main(args: Array[String]): Unit = { + testProd(2, 10) + } + + def testProd(a: Int, b: Int)(using ev: (a.type * b.type) =:= (b.type * a.type)) = true + + type *[A <: Int, B <: Int] <: Int = A match { + case 0 => 0 + case _ => MultiplyLoop[A, B, 0] + } + + type MultiplyLoop[A <: Int, B <: Int, Acc <: Int] <: Int = A match { + case 0 => Acc + case S[aMinusOne] => MultiplyLoop[aMinusOne, B, B + Acc] + } + + type +[A <: Int, B <: Int] <: Int = A match { + case 0 => B + case S[aMinusOne] => aMinusOne + S[B] + } +} From b181b8a534d301d8e96abaff1c63d99a6623ce8f Mon Sep 17 00:00:00 2001 From: adampauls Date: Sat, 15 Jan 2022 13:03:40 -0800 Subject: [PATCH 1017/1244] Parse splices inside patterns as patterns --- .../dotty/tools/dotc/parsing/Parsers.scala | 17 +++++++++------ docs/docs/internals/syntax.md | 8 ++++--- docs/docs/reference/syntax.md | 6 ++++-- tests/neg/splice-pat.check | 10 +++++++++ tests/neg/splice-pat.scala | 15 +++++++++++++ tests/pos/splice-pat.scala | 21 +++++++++++++++++++ 6 files changed, 66 insertions(+), 11 deletions(-) create mode 100644 tests/neg/splice-pat.check create mode 100644 tests/neg/splice-pat.scala create mode 100644 tests/pos/splice-pat.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 63b6e9f8ac51..c98cc9d51a2f 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -56,7 +56,8 @@ object Parsers { object StageKind { val None = 0 val Quoted = 1 - val Spliced = 2 + val Spliced = 1 << 1 + val Pattern = 1 << 2 } extension (buf: ListBuffer[Tree]) @@ -1566,15 +1567,19 @@ object Parsers { /** The block in a quote or splice */ def stagedBlock() = inBraces(block(simplify = true)) - /** SimpleEpxr ::= spliceId | ‘$’ ‘{’ Block ‘}’) - * SimpleType ::= spliceId | ‘$’ ‘{’ Block ‘}’) + /** SimpleExpr ::= spliceId | ‘$’ ‘{’ Block ‘}’) unless inside quoted pattern + * SimpleType ::= spliceId | ‘$’ ‘{’ Block ‘}’) unless inside quoted pattern + * + * SimpleExpr ::= spliceId | ‘$’ ‘{’ Pattern ‘}’) when inside quoted pattern + * SimpleType ::= spliceId | ‘$’ ‘{’ Pattern ‘}’) when inside quoted pattern */ def splice(isType: Boolean): Tree = atSpan(in.offset) { val expr = if (in.name.length == 1) { in.nextToken() - withinStaged(StageKind.Spliced)(stagedBlock()) + val inPattern = (staged & StageKind.Pattern) != 0 + withinStaged(StageKind.Spliced)(if (inPattern) inBraces(pattern()) else stagedBlock()) } else atSpan(in.offset + 1) { val id = Ident(in.name.drop(1)) @@ -2271,7 +2276,7 @@ object Parsers { blockExpr() case QUOTE => atSpan(in.skipToken()) { - withinStaged(StageKind.Quoted) { + withinStaged(StageKind.Quoted | (if (location.inPattern) StageKind.Pattern else 0)) { Quote { if (in.token == LBRACKET) inBrackets(typ()) else stagedBlock() @@ -2714,7 +2719,7 @@ object Parsers { case LPAREN => atSpan(in.offset) { makeTupleOrParens(inParens(patternsOpt())) } case QUOTE => - simpleExpr(Location.ElseWhere) + simpleExpr(Location.InPattern) case XMLSTART => xmlLiteralPattern() case GIVEN => diff --git a/docs/docs/internals/syntax.md b/docs/docs/internals/syntax.md index 5cb03d5ab322..f8c1aa500490 100644 --- a/docs/docs/internals/syntax.md +++ b/docs/docs/internals/syntax.md @@ -183,7 +183,8 @@ SimpleType1 ::= id | Singleton ‘.’ ‘type’ SingletonTypeTree(p) | ‘(’ Types ‘)’ Tuple(ts) | Refinement RefinedTypeTree(EmptyTree, refinement) - | ‘$’ ‘{’ Block ‘}’ + | ‘$’ ‘{’ Block ‘}’ -- unless inside quoted pattern + | ‘$’ ‘{’ Pattern ‘}’ -- only inside quoted pattern | SimpleType1 TypeArgs AppliedTypeTree(t, args) | SimpleType1 ‘#’ id Select(t, name) Singleton ::= SimpleRef @@ -242,7 +243,8 @@ SimpleExpr ::= SimpleRef | Literal | ‘_’ | BlockExpr - | ‘$’ ‘{’ Block ‘}’ + | ‘$’ ‘{’ Block ‘}’ -- unless inside quoted pattern + | ‘$’ ‘{’ Pattern ‘}’ -- only inside quoted pattern | Quoted | quoteId -- only inside splices | ‘new’ ConstrApp {‘with’ ConstrApp} [TemplateBody] New(constr | templ) @@ -257,7 +259,7 @@ SimpleExpr ::= SimpleRef | SimpleExpr ‘_’ PostfixOp(expr, _) (to be dropped) | XmlExpr -- to be dropped IndentedExpr ::= indent CaseClauses | Block outdent -Quoted ::= ‘'’ ‘{’ Block ‘}’ +Quoted ::= ‘'’ ‘{’ Block ‘}’ | ‘'’ ‘[’ Type ‘]’ ExprsInParens ::= ExprInParens {‘,’ ExprInParens} ExprInParens ::= PostfixExpr ‘:’ Type -- normal Expr allows only RefinedType here diff --git a/docs/docs/reference/syntax.md b/docs/docs/reference/syntax.md index c2f990b0a953..ff219a46081c 100644 --- a/docs/docs/reference/syntax.md +++ b/docs/docs/reference/syntax.md @@ -182,7 +182,8 @@ SimpleType ::= SimpleLiteral | Singleton ‘.’ ‘type’ | ‘(’ Types ‘)’ | Refinement - | ‘$’ ‘{’ Block ‘}’ + | ‘$’ ‘{’ Block ‘}’ -- unless inside quoted pattern + | ‘$’ ‘{’ Pattern ‘}’ -- only inside quoted pattern | SimpleType1 TypeArgs | SimpleType1 ‘#’ id Singleton ::= SimpleRef @@ -240,7 +241,8 @@ SimpleExpr ::= SimpleRef | Literal | ‘_’ | BlockExpr - | ‘$’ ‘{’ Block ‘}’ + | ‘$’ ‘{’ Block ‘}’ -- unless inside quoted pattern + | ‘$’ ‘{’ Pattern ‘}’ -- only inside quoted pattern | Quoted | quoteId -- only inside splices | ‘new’ ConstrApp {‘with’ ConstrApp} [TemplateBody] diff --git a/tests/neg/splice-pat.check b/tests/neg/splice-pat.check new file mode 100644 index 000000000000..68fda3e96e72 --- /dev/null +++ b/tests/neg/splice-pat.check @@ -0,0 +1,10 @@ +-- [E032] Syntax Error: tests/neg/splice-pat.scala:12:16 --------------------------------------------------------------- +12 | case '{ foo(${ // error: pattern expected + | ^ + | pattern expected + +longer explanation available when compiling with `-explain` +-- [E040] Syntax Error: tests/neg/splice-pat.scala:15:5 ---------------------------------------------------------------- +15 | })} => ??? // error + | ^ + | '=>' expected, but ')' found diff --git a/tests/neg/splice-pat.scala b/tests/neg/splice-pat.scala new file mode 100644 index 000000000000..a43659c5e323 --- /dev/null +++ b/tests/neg/splice-pat.scala @@ -0,0 +1,15 @@ +import scala.quoted.* + +object MyMatcher { + def unapply(expr: Expr[Any])(using Quotes): Option[Expr[Int]] = ??? +} + +def foo(x: Any): Unit = ??? + +def bar(): Expr[Any] = ??? + +def f(expr: Expr[Any])(using Quotes): Expr[Int] = expr match + case '{ foo(${ // error: pattern expected + import scala.Int + bar() + })} => ??? // error diff --git a/tests/pos/splice-pat.scala b/tests/pos/splice-pat.scala new file mode 100644 index 000000000000..babebb9e21d1 --- /dev/null +++ b/tests/pos/splice-pat.scala @@ -0,0 +1,21 @@ +import scala.quoted.* + +object MyMatcher { + def unapply(expr: Expr[Any])(using Quotes): Option[Expr[Int]] = ??? +} + +object MyMatcher2 { + def unapply(expr: Expr[Int])(using Quotes): Boolean = ??? +} + +def foo(x: Any): Unit = ??? +def bar(x: Int): Int = ??? + +def oneLevel(expr: Expr[Any])(using Quotes): Expr[Int] = expr match + case '{ foo(${MyMatcher(y@MyMatcher2())}) } => y + +def twoLevel(expr: Expr[Any])(using Quotes): Expr[Int] = expr match + case '{ foo(${MyMatcher('{ bar(${y@MyMatcher2()}).getClass}) }) } => y + +def bindQuote(expr: Expr[Any])(using Quotes): Expr[Int] = expr match + case '{ foo(${y@'{bar($_)}})} => y From 18309fcf26aa8e4ddcbd93686be989387a19b074 Mon Sep 17 00:00:00 2001 From: adampauls Date: Mon, 17 Jan 2022 13:55:02 -0800 Subject: [PATCH 1018/1244] PR comments. --- .../src/dotty/tools/dotc/parsing/Parsers.scala | 6 +++--- tests/pos-macros/splice-pat/Macro_1.scala | 17 +++++++++++++++++ tests/pos-macros/splice-pat/Test_1.scala | 3 +++ tests/pos/splice-pat.scala | 3 +++ 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 tests/pos-macros/splice-pat/Macro_1.scala create mode 100644 tests/pos-macros/splice-pat/Test_1.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index c98cc9d51a2f..fc607e16dd74 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -57,7 +57,7 @@ object Parsers { val None = 0 val Quoted = 1 val Spliced = 1 << 1 - val Pattern = 1 << 2 + val QuotedPattern = 1 << 2 } extension (buf: ListBuffer[Tree]) @@ -1578,7 +1578,7 @@ object Parsers { val expr = if (in.name.length == 1) { in.nextToken() - val inPattern = (staged & StageKind.Pattern) != 0 + val inPattern = (staged & StageKind.QuotedPattern) != 0 withinStaged(StageKind.Spliced)(if (inPattern) inBraces(pattern()) else stagedBlock()) } else atSpan(in.offset + 1) { @@ -2276,7 +2276,7 @@ object Parsers { blockExpr() case QUOTE => atSpan(in.skipToken()) { - withinStaged(StageKind.Quoted | (if (location.inPattern) StageKind.Pattern else 0)) { + withinStaged(StageKind.Quoted | (if (location.inPattern) StageKind.QuotedPattern else 0)) { Quote { if (in.token == LBRACKET) inBrackets(typ()) else stagedBlock() diff --git a/tests/pos-macros/splice-pat/Macro_1.scala b/tests/pos-macros/splice-pat/Macro_1.scala new file mode 100644 index 000000000000..b3fabb046da6 --- /dev/null +++ b/tests/pos-macros/splice-pat/Macro_1.scala @@ -0,0 +1,17 @@ +import scala.quoted.* + +object Macro { + object MyMatcher { + def unapply(expr: Expr[Any])(using Quotes): Option[Expr[Int]] = expr match { + case '{ (${a}: Int) + (${_}: Int) } => Some(a) + case _ => None + } + } + + def foo(x: Int): Int = x - 1 + + def impl(expr: Expr[Any])(using Quotes): Expr[(Int, Int)] = expr match + case '{foo(${bound@MyMatcher(x)})}=> '{($bound, $x)} + + inline def macr(inline x: Int): (Int, Int) = ${impl('x)} +} diff --git a/tests/pos-macros/splice-pat/Test_1.scala b/tests/pos-macros/splice-pat/Test_1.scala new file mode 100644 index 000000000000..672001167616 --- /dev/null +++ b/tests/pos-macros/splice-pat/Test_1.scala @@ -0,0 +1,3 @@ +object Test { + assert(Macro.macr(Macro.foo(1 + 2)) == (3, 1)) +} diff --git a/tests/pos/splice-pat.scala b/tests/pos/splice-pat.scala index babebb9e21d1..6a8852b4a7c0 100644 --- a/tests/pos/splice-pat.scala +++ b/tests/pos/splice-pat.scala @@ -19,3 +19,6 @@ def twoLevel(expr: Expr[Any])(using Quotes): Expr[Int] = expr match def bindQuote(expr: Expr[Any])(using Quotes): Expr[Int] = expr match case '{ foo(${y@'{bar($_)}})} => y + +def noop(expr: Expr[Any])(using Quotes): Expr[Int] = expr match + case '{ bar(${ '{ $y } }) } => y From 70ed0131a0978c4b115492c789588ba244edb149 Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Thu, 23 Dec 2021 12:56:18 +0100 Subject: [PATCH 1019/1244] Allow return in tailrec position --- .../src/dotty/tools/dotc/transform/TailRec.scala | 2 +- tests/run/tailrec-return.check | 2 ++ tests/run/tailrec-return.scala | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 tests/run/tailrec-return.check create mode 100644 tests/run/tailrec-return.scala diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala index 9330016f3292..eb239f00bcce 100644 --- a/compiler/src/dotty/tools/dotc/transform/TailRec.scala +++ b/compiler/src/dotty/tools/dotc/transform/TailRec.scala @@ -444,7 +444,7 @@ class TailRec extends MiniPhase { case Return(expr, from) => val fromSym = from.symbol - val inTailPosition = fromSym.is(Label) && tailPositionLabeledSyms.contains(fromSym) + val inTailPosition = !fromSym.is(Label) || tailPositionLabeledSyms.contains(fromSym) cpy.Return(tree)(transform(expr, inTailPosition), from) case _ => diff --git a/tests/run/tailrec-return.check b/tests/run/tailrec-return.check new file mode 100644 index 000000000000..6b81a566d1a7 --- /dev/null +++ b/tests/run/tailrec-return.check @@ -0,0 +1,2 @@ +6 +false diff --git a/tests/run/tailrec-return.scala b/tests/run/tailrec-return.scala new file mode 100644 index 000000000000..53b5ae73b82d --- /dev/null +++ b/tests/run/tailrec-return.scala @@ -0,0 +1,16 @@ +object Test: + + @annotation.tailrec + def sum(n: Int, acc: Int = 0): Int = + if n != 0 then return sum(n - 1, acc + n) + acc + + @annotation.tailrec + def isEven(n: Int): Boolean = + if n != 0 && n != 1 then return isEven(n - 2) + if n == 1 then return false + true + + def main(args: Array[String]): Unit = + println(sum(3)) + println(isEven(5)) From 370975003dfbf46d868b484655e7561fd866f406 Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Wed, 29 Dec 2021 16:27:00 +0100 Subject: [PATCH 1020/1244] Visit all trees --- .../dotty/tools/dotc/transform/TailRec.scala | 16 +----- tests/run/tailrec-return.check | 5 ++ tests/run/tailrec-return.scala | 50 +++++++++++++++++++ 3 files changed, 57 insertions(+), 14 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala index eb239f00bcce..ba6f1599def6 100644 --- a/compiler/src/dotty/tools/dotc/transform/TailRec.scala +++ b/compiler/src/dotty/tools/dotc/transform/TailRec.scala @@ -277,23 +277,11 @@ class TailRec extends MiniPhase { def yesTailTransform(tree: Tree)(using Context): Tree = transform(tree, tailPosition = true) - /** If not in tail position a tree traversal may not be needed. - * - * A recursive call may still be in tail position if within the return - * expression of a labeled block. - * A tree traversal may also be needed to report a failure to transform - * a recursive call of a @tailrec annotated method (i.e. `isMandatory`). - */ - private def isTraversalNeeded = - isMandatory || tailPositionLabeledSyms.size > 0 - def noTailTransform(tree: Tree)(using Context): Tree = - if (isTraversalNeeded) transform(tree, tailPosition = false) - else tree + transform(tree, tailPosition = false) def noTailTransforms[Tr <: Tree](trees: List[Tr])(using Context): List[Tr] = - if (isTraversalNeeded) trees.mapConserve(noTailTransform).asInstanceOf[List[Tr]] - else trees + trees.mapConserve(noTailTransform).asInstanceOf[List[Tr]] override def transform(tree: Tree)(using Context): Tree = { /* Rewrite an Apply to be considered for tail call transformation. */ diff --git a/tests/run/tailrec-return.check b/tests/run/tailrec-return.check index 6b81a566d1a7..361e76d8a285 100644 --- a/tests/run/tailrec-return.check +++ b/tests/run/tailrec-return.check @@ -1,2 +1,7 @@ 6 false +true +false +true +Ada Lovelace, Alan Turing +List(9, 10) diff --git a/tests/run/tailrec-return.scala b/tests/run/tailrec-return.scala index 53b5ae73b82d..aa760960403d 100644 --- a/tests/run/tailrec-return.scala +++ b/tests/run/tailrec-return.scala @@ -11,6 +11,56 @@ object Test: if n == 1 then return false true + @annotation.tailrec + def isEvenApply(n: Int): Boolean = + // Return inside an `Apply.fun` + ( + if n != 0 && n != 1 then return isEvenApply(n - 2) + else if n == 1 then return false + else (x: Boolean) => x + )(true) + + @annotation.tailrec + def isEvenWhile(n: Int): Boolean = + // Return inside a `WhileDo.cond` + while( + if n != 0 && n != 1 then return isEvenWhile(n - 2) + else if n == 1 then return false + else true + ) {} + true + + @annotation.tailrec + def isEvenReturn(n: Int): Boolean = + // Return inside a `Return` + return + if n != 0 && n != 1 then return isEvenReturn(n - 2) + else if n == 1 then return false + else true + + @annotation.tailrec + def names(l: List[(String, String) | Null], acc: List[String] = Nil): List[String] = + l match + case Nil => acc.reverse + case x :: xs => + if x == null then return names(xs, acc) + + val displayName = x._1 + " " + x._2 + names(xs, displayName :: acc) + + def nonTail(l: List[Int]): List[Int] = + l match + case Nil => Nil + case x :: xs => + // The call to nonTail should *not* be eliminated + (x + 1) :: nonTail(xs) + + def main(args: Array[String]): Unit = println(sum(3)) println(isEven(5)) + println(isEvenApply(6)) + println(isEvenWhile(7)) + println(isEvenReturn(8)) + println(names(List(("Ada", "Lovelace"), null, ("Alan", "Turing"))).mkString(", ")) + println(nonTail(List(8, 9))) From 06468db5beb7cae0545cbf8f0831e02dc02f4c4a Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Fri, 14 Jan 2022 13:30:14 +0100 Subject: [PATCH 1021/1244] Add compiletime benchmarks --- .gitignore | 3 + bench/profiles/compiletime.yml | 51 ++++++ bench/profiles/default.yml | 1 + bench/src/main/scala/Benchmarks.scala | 13 +- bench/src/main/scala/generateBenchmarks.scala | 155 ++++++++++++++++++ bench/tests/compiletime-ops/empty.scala | 6 + 6 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 bench/profiles/compiletime.yml create mode 100644 bench/src/main/scala/generateBenchmarks.scala create mode 100644 bench/tests/compiletime-ops/empty.scala diff --git a/.gitignore b/.gitignore index 297d15748fdf..e182b7114a07 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,9 @@ tests/partest-generated/ tests/locks/ /test-classes/ +# Benchmarks +bench/tests-generated + # Ignore output files but keep the directory out/ build/ diff --git a/bench/profiles/compiletime.yml b/bench/profiles/compiletime.yml new file mode 100644 index 000000000000..df85424c8f56 --- /dev/null +++ b/bench/profiles/compiletime.yml @@ -0,0 +1,51 @@ +charts: + + - name: "Compile-time sums of constant integer types (generated)" + url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + lines: + - key: compiletime-sum-constants + label: bootstrapped + + - name: "Compile-time sums of term reference types (generated)" + url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + lines: + - key: compiletime-sum-termrefs + label: bootstrapped + + - name: "Sums of term references, result type inferred (generated)" + url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + lines: + - key: compiletime-sum-termrefs-terms + label: bootstrapped + + - name: "Compile-time sums of type applications (generated)" + url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + lines: + - key: compiletime-sum-applications + label: bootstrapped + + - name: "Compile-time additions inside multiplications (generated)" + url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + lines: + - key: compiletime-distribute + label: bootstrapped + +scripts: + + compiletime-sum-constants: + - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-constants.scala + + compiletime-sum-termrefs: + - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-termrefs.scala + + compiletime-sum-termrefs-terms: + - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-termrefs-terms.scala + + compiletime-sum-applications: + - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/sum-applications.scala + + compiletime-distribute: + - measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/distribute.scala + +config: + pr_base_url: "https://github.com/lampepfl/dotty/pull/" diff --git a/bench/profiles/default.yml b/bench/profiles/default.yml index 6fc2faef36c5..22ed6d5f31df 100644 --- a/bench/profiles/default.yml +++ b/bench/profiles/default.yml @@ -7,6 +7,7 @@ includes: - empty.yml - quotes.yml - tuples.yml + - compiletime.yml config: diff --git a/bench/src/main/scala/Benchmarks.scala b/bench/src/main/scala/Benchmarks.scala index 6e0bae6e72de..51cd411cc13b 100644 --- a/bench/src/main/scala/Benchmarks.scala +++ b/bench/src/main/scala/Benchmarks.scala @@ -8,6 +8,8 @@ import reporting._ import org.openjdk.jmh.results.RunResult import org.openjdk.jmh.runner.Runner import org.openjdk.jmh.runner.options.OptionsBuilder +import org.openjdk.jmh.runner.options.TimeValue +//import org.openjdk.jmh.results.format.ResultFormatType import org.openjdk.jmh.annotations._ import org.openjdk.jmh.results.format._ import java.util.concurrent.TimeUnit @@ -21,8 +23,11 @@ import dotty.tools.io.AbstractFile object Bench { val COMPILE_OPTS_FILE = "compile.txt" + val GENERATED_BENCHMARKS_DIR = "tests-generated" def main(args: Array[String]): Unit = { + generateBenchmarks(GENERATED_BENCHMARKS_DIR) + if (args.isEmpty) { println("Missing ") return @@ -32,7 +37,7 @@ object Bench { val warmup = if (intArgs.length > 0) intArgs(0).toInt else 30 val iterations = if (intArgs.length > 1) intArgs(1).toInt else 20 val forks = if (intArgs.length > 2) intArgs(2).toInt else 1 - + val measurementTime = if (intArgs.length > 3) intArgs(3).toInt else 1 import File.{ separator => sep } @@ -48,7 +53,13 @@ object Bench { .mode(Mode.AverageTime) .timeUnit(TimeUnit.MILLISECONDS) .warmupIterations(warmup) + .warmupTime(TimeValue.seconds(measurementTime)) .measurementIterations(iterations) + .measurementTime(TimeValue.seconds(measurementTime)) + // To output results to bench/results.json, uncomment the 2 + // following lines and the ResultFormatType import. + //.result("results.json") + //.resultFormat(ResultFormatType.JSON) .forks(forks) .build diff --git a/bench/src/main/scala/generateBenchmarks.scala b/bench/src/main/scala/generateBenchmarks.scala new file mode 100644 index 000000000000..012d81e3f5a2 --- /dev/null +++ b/bench/src/main/scala/generateBenchmarks.scala @@ -0,0 +1,155 @@ +package dotty.tools.benchmarks + +import java.nio.file.{Files, Paths, Path} +import java.util.Random + +/** Generates benchmarks in `genDirName`. + * + * Called automatically by the benchmarks runner ([[Bench.main]]). + */ +def generateBenchmarks(genDirName: String) = + val thisFile = Paths.get("src/main/scala/generateBenchmarks.scala") + val genDir = Paths.get(genDirName) + + def generateBenchmark(subDirName: String, fileName: String, make: () => String) = + val outputDir = genDir.resolve(Paths.get(subDirName)) + Files.createDirectories(outputDir) + val file = outputDir.resolve(Paths.get(fileName)) + if !Files.exists(file) || + Files.getLastModifiedTime(file).toMillis() < + Files.getLastModifiedTime(thisFile).toMillis() then + println(f"Generate benchmark $file") + Files.write(file, make().getBytes()) + + // Big compile-time sums of constant integer types: (1.type + 2.type + …). + // This should ideally have a linear complexity. + generateBenchmark("compiletime-ops", "sum-constants.scala", () => + val innerSum = (1 to 50) // Limited to 50 to avoid stackoverflows in the compiler. + .map(i => f"$i") + .mkString(" + ") + val outerSum = (1 to 50) + .map(_ => f"($innerSum)") + .mkString(" + ") + val vals = (1 to 50) + .map(i => f"val v$i: $outerSum = ???") + .mkString("\n\n ") + + f""" +import scala.compiletime.ops.int.* + +object Test: + val one: 1 = ??? + val n: Int = ??? + val m: Int = ??? + + $vals + """ + ) + + // Big compile-time sums of term reference types: (one.type + m.type + n.type + // + one.type + m.type + n.type + …). This big type is normalized to (8000 + + // 8000 * m.type + 8000 * n.type). + generateBenchmark("compiletime-ops", "sum-termrefs.scala", () => + val innerSum = (1 to 40) + .map(_ => "one.type + m.type + n.type") + .mkString(" + ") + val outerSum = (1 to 20) + .map(_ => f"($innerSum)") + .mkString(" + ") + val vals = (1 to 4) + .map(i => f"val v$i: $outerSum = ???") + .mkString("\n\n ") + + f""" +import scala.compiletime.ops.int.* + +object Test: + val one: 1 = ??? + val n: Int = ??? + val m: Int = ??? + + $vals + """ + ) + + // Big compile-time sums of term references: (n + m + …). The result type is + // inferred. The goal of this benchmark is to measure the performance cost of + // inferring precise types for arithmetic operations. + generateBenchmark("compiletime-ops", "sum-termrefs-terms.scala", () => + val innerSum = (1 to 40) + .map(_ => "one + m + n") + .mkString(" + ") + val outerSum = (1 to 20) + .map(_ => f"($innerSum)") + .mkString(" + ") + val vals = (1 to 4) + .map(i => f"val v$i = $outerSum") + .mkString("\n\n ") + + f""" +import scala.compiletime.ops.int.* + +object Test: + val one: 1 = ??? + val n: Int = ??? + val m: Int = ??? + + $vals + """ + ) + + // Big compile-time product of sums of term references: (one + n + m) * (one + + // n + m) * …. The goal of this benchmark is to measure the performance impact + // of distributing addition over multiplication during compile-time operations + // normalization. + generateBenchmark("compiletime-ops", "distribute.scala", () => + val product = (1 to 18) + .map(_ => "(one.type + m.type + n.type)") + .mkString(" * ") + val vals = (1 to 50) + .map(i => f"val v$i: $product = ???") + .mkString("\n\n ") + + f""" +import scala.compiletime.ops.int.* + +object Test: + val one: 1 = ??? + val n: Int = ??? + val m: Int = ??? + + $vals + """ + ) + + def applicationCount = 14 + def applicationDepth = 10 + def applicationVals = 2 + + // Compile-time sums of big applications: Op[Op[…], Op[…]] + Op[Op[…], Op[…]] + // + …. Applications are deep balanced binary trees only differing in their + // very last (top-right) leafs. These applications are compared pairwise in + // order to sort the terms of the sum. + generateBenchmark("compiletime-ops", "sum-applications.scala", () => + def makeOp(depth: Int, last: Boolean, k: Int): String = + if depth == 0 then f"Op[one.type, ${if last then k.toString else "n.type"}]" + else f"Op[${makeOp(depth - 1, false, k)}, ${makeOp(depth - 1, last, k)}]" + val sum = (applicationCount to 1 by -1) + .map(k => makeOp(applicationDepth, true, k)) + .mkString(" + ") + val vals = (1 to applicationVals) + .map(i => f"val v$i: $sum = ???") + .mkString("\n\n ") + + f""" +import scala.compiletime.ops.int.* + +object Test: + val one: 1 = ??? + val n: Int = ??? + type SInt = Int & Singleton + type Op[A <: SInt, B <: SInt] <:SInt + + $vals + """ + ) diff --git a/bench/tests/compiletime-ops/empty.scala b/bench/tests/compiletime-ops/empty.scala new file mode 100644 index 000000000000..3da2acd61b75 --- /dev/null +++ b/bench/tests/compiletime-ops/empty.scala @@ -0,0 +1,6 @@ +import scala.compiletime.ops.int.* + +object Test: + val one: 1 = ??? + val n: Int = ??? + val m: Int = ??? From 54c033d6b80996403ecbba15c69f6694016c5b1a Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Mon, 17 Jan 2022 19:42:10 +0100 Subject: [PATCH 1022/1244] Avoid creating set on each call --- compiler/src/dotty/tools/dotc/core/Types.scala | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index b090682a4cd1..6805c91168c4 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4248,15 +4248,6 @@ object Types { case _ => None } - val opsSet = Set( - defn.CompiletimeOpsAnyModuleClass, - defn.CompiletimeOpsIntModuleClass, - defn.CompiletimeOpsLongModuleClass, - defn.CompiletimeOpsFloatModuleClass, - defn.CompiletimeOpsBooleanModuleClass, - defn.CompiletimeOpsStringModuleClass - ) - // Returns Some(true) if the type is a constant. // Returns Some(false) if the type is not a constant. // Returns None if there is not enough information to determine if the type is a constant. @@ -4272,7 +4263,7 @@ object Types { // constant if the term is constant case t: TermRef => isConst(t.underlying) // an operation type => recursively check all argument compositions - case applied: AppliedType if opsSet.contains(applied.typeSymbol.owner) => + case applied: AppliedType if defn.isCompiletimeAppliedType(applied.typeSymbol) => val argsConst = applied.args.map(isConst) if (argsConst.exists(_.isEmpty)) None else Some(argsConst.forall(_.get)) From 1eedc4a7af048fe2c35e61178597659d8fbedf4f Mon Sep 17 00:00:00 2001 From: Phil Date: Wed, 12 Jan 2022 17:30:28 -0700 Subject: [PATCH 1023/1244] add -e eval to command line --- .../src/dotty/tools/MainGenericRunner.scala | 15 ++++++++++ .../tools/scripting/BashScriptsTests.scala | 28 ++++++++----------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/compiler/src/dotty/tools/MainGenericRunner.scala b/compiler/src/dotty/tools/MainGenericRunner.scala index 65ee672f0342..95c305c325bb 100644 --- a/compiler/src/dotty/tools/MainGenericRunner.scala +++ b/compiler/src/dotty/tools/MainGenericRunner.scala @@ -149,6 +149,13 @@ object MainGenericRunner { process(remainingArgs, settings) case (o @ colorOption(_*)) :: tail => process(tail, settings.withScalaArgs(o)) + case "-e" :: expression :: tail => + val tempScript = writeFile(s"@main def main(args: String *): Unit =\n ${expression}") + settings + .withExecuteMode(ExecuteMode.Script) + .withTargetScript(tempScript) + .withScriptArgs(tail*) + .noSave // useless case arg :: tail => val line = Try(Source.fromFile(arg).getLines.toList).toOption.flatMap(_.headOption) lazy val hasScalaHashbang = { val s = line.getOrElse("") ; s.startsWith("#!") && s.contains("scala") } @@ -161,6 +168,7 @@ object MainGenericRunner { val newSettings = if arg.startsWith("-") then settings else settings.withPossibleEntryPaths(arg).withModeShouldBePossibleRun process(tail, newSettings.withResidualArgs(arg)) + def main(args: Array[String]): Unit = val scalaOpts = envOrNone("SCALA_OPTS").toArray.flatMap(_.split(" ")).filter(_.nonEmpty) val allArgs = scalaOpts ++ args @@ -251,4 +259,11 @@ object MainGenericRunner { e.foreach(_.printStackTrace()) !isFailure } + def writeFile(contents: String): String = { + val file = Files.createTempFile("exec", ".scala") + file.toFile.deleteOnExit() + Files.write(file, contents.getBytes) + file.toString.replace('\\', '/') + } + } diff --git a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala index 547693c7401f..b366d625c367 100644 --- a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala +++ b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala @@ -190,23 +190,17 @@ class BashScriptsTests: assert(valid, s"script ${scriptFile.absPath} did not report valid java.class.path first entry") /* - * verify that individual scripts can override -save with -nosave (needed to address #13760). + * verify -e println("yo!") works. */ - @Test def sqlDateTest = - val scriptBase = "sqlDateError" - val scriptFile = testFiles.find(_.getName == s"$scriptBase.sc").get - val testJar = testFile(s"$scriptBase.jar") // jar should not be created when scriptFile runs - printf("===> verify '-save' is cancelled by '-nosave' in script hashbang.`\n") - val (validTest, exitCode, stdout, stderr) = bashCommand(s"SCALA_OPTS=-save ${scriptFile.absPath}") - printf("stdout: %s\n", stdout.mkString("\n","\n","")) + @Test def verifyCommandLineExpression = + printf("===> verify -e is properly handled by `dist/bin/scala`\n") + val expected = "9" + val expression = s"println(3*3)" + val cmd = s"bin/scala -e $expression" + val (validTest, exitCode, stdout, stderr) = bashCommand(s"""bin/scala -e '$expression'""") + val result = stdout.filter(_.nonEmpty).mkString("") + printf("stdout: %s\n", result) + printf("stderr: %s\n", stderr.mkString("\n","\n","")) if verifyValid(validTest) then - // the script should print '1969-12-31' or '1970-01-01', depending on time zone - // stdout can be polluted with an ANSI color prefix, in some test environments - val valid = stdout.mkString("").matches(""".*\d{4}-\d{2}-\d{2}.*""") - if (!valid) then - stdout.foreach { printf("stdout[%s]\n", _) } - stderr.foreach { printf("stderr[%s]\n", _) } - if valid then printf(s"\n===> success: scripts can override -save via -nosave\n") - assert(valid, s"script ${scriptFile.absPath} reported unexpected value for java.sql.Date ${stdout.mkString("\n")}") - assert(!testJar.exists,s"unexpected, jar file [$testJar] was created") + assert(result.contains(expected), s"expression [$expression] did not send [$expected] to stdout") From 1edb47cb4e226f7a0c4048ff5b90befb492a697c Mon Sep 17 00:00:00 2001 From: Phil Date: Sun, 16 Jan 2022 11:41:10 -0700 Subject: [PATCH 1024/1244] no source file created ; add more tests --- .../src/dotty/tools/MainGenericRunner.scala | 35 ++++++---- .../tools/scripting/ScriptingDriver.scala | 69 ++----------------- .../dotty/tools/scripting/StringDriver.scala | 45 ++++++++++++ compiler/src/dotty/tools/scripting/Util.scala | 60 ++++++++++++++++ .../tools/scripting/BashScriptsTests.scala | 25 +++++++ .../tools/scripting/ExpressionTest.scala | 49 +++++++++++++ 6 files changed, 204 insertions(+), 79 deletions(-) create mode 100755 compiler/src/dotty/tools/scripting/StringDriver.scala create mode 100755 compiler/src/dotty/tools/scripting/Util.scala create mode 100755 compiler/test/dotty/tools/scripting/ExpressionTest.scala diff --git a/compiler/src/dotty/tools/MainGenericRunner.scala b/compiler/src/dotty/tools/MainGenericRunner.scala index 95c305c325bb..b7ef90dcdc60 100644 --- a/compiler/src/dotty/tools/MainGenericRunner.scala +++ b/compiler/src/dotty/tools/MainGenericRunner.scala @@ -4,8 +4,6 @@ package dotty.tools import scala.annotation.tailrec import scala.io.Source import scala.util.{ Try, Success, Failure } -import java.net.URLClassLoader -import sys.process._ import java.io.File import java.lang.Thread import scala.annotation.internal.sharable @@ -13,12 +11,11 @@ import dotty.tools.dotc.util.ClasspathFromClassloader import dotty.tools.runner.ObjectRunner import dotty.tools.dotc.config.Properties.envOrNone import java.util.jar._ -import java.util.jar.Attributes.Name import dotty.tools.io.Jar import dotty.tools.runner.ScalaClassLoader import java.nio.file.{Files, Paths, Path} -import scala.collection.JavaConverters._ import dotty.tools.dotc.config.CommandLineParser +import dotty.tools.scripting.StringDriver enum ExecuteMode: case Guess @@ -26,6 +23,7 @@ enum ExecuteMode: case Repl case Run case PossibleRun + case Expression case class Settings( verbose: Boolean = false, @@ -38,6 +36,7 @@ case class Settings( possibleEntryPaths: List[String] = List.empty, scriptArgs: List[String] = List.empty, targetScript: String = "", + targetExpression: String = "", targetToRun: String = "", save: Boolean = false, modeShouldBePossibleRun: Boolean = false, @@ -78,6 +77,9 @@ case class Settings( def withTargetToRun(targetToRun: String): Settings = this.copy(targetToRun = targetToRun) + def withExpression(scalaSource: String): Settings = + this.copy(targetExpression = scalaSource) + def withSave: Settings = this.copy(save = true) @@ -150,12 +152,12 @@ object MainGenericRunner { case (o @ colorOption(_*)) :: tail => process(tail, settings.withScalaArgs(o)) case "-e" :: expression :: tail => - val tempScript = writeFile(s"@main def main(args: String *): Unit =\n ${expression}") + val mainSource = s"@main def main(args: String *): Unit =\n ${expression}" settings - .withExecuteMode(ExecuteMode.Script) - .withTargetScript(tempScript) + .withExecuteMode(ExecuteMode.Expression) + .withExpression(mainSource) .withScriptArgs(tail*) - .noSave // useless + .noSave // -save not useful here case arg :: tail => val line = Try(Source.fromFile(arg).getLines.toList).toOption.flatMap(_.headOption) lazy val hasScalaHashbang = { val s = line.getOrElse("") ; s.startsWith("#!") && s.contains("scala") } @@ -243,6 +245,16 @@ object MainGenericRunner { ++ List("-script", settings.targetScript) ++ settings.scriptArgs scripting.Main.main(properArgs.toArray) + case ExecuteMode.Expression => + val cp = settings.classPath match { + case Nil => "" + case list => list.mkString(classpathSeparator) + } + val cpArgs = if cp.isEmpty then Nil else List("-classpath", cp) + val properArgs = cpArgs ++ settings.residualArgs ++ settings.scalaArgs + val driver = StringDriver(properArgs.toArray, settings.targetExpression) + driver.compileAndRun(settings.classPath) + case ExecuteMode.Guess => if settings.modeShouldBePossibleRun then run(settings.withExecuteMode(ExecuteMode.PossibleRun)) @@ -259,11 +271,4 @@ object MainGenericRunner { e.foreach(_.printStackTrace()) !isFailure } - def writeFile(contents: String): String = { - val file = Files.createTempFile("exec", ".scala") - file.toFile.deleteOnExit() - Files.write(file, contents.getBytes) - file.toString.replace('\\', '/') - } - } diff --git a/compiler/src/dotty/tools/scripting/ScriptingDriver.scala b/compiler/src/dotty/tools/scripting/ScriptingDriver.scala index cf3ebe671e1d..bce54183807b 100755 --- a/compiler/src/dotty/tools/scripting/ScriptingDriver.scala +++ b/compiler/src/dotty/tools/scripting/ScriptingDriver.scala @@ -2,19 +2,12 @@ package dotty.tools.scripting import java.nio.file.{ Files, Paths, Path } import java.io.File -import java.net.{ URL, URLClassLoader } -import java.lang.reflect.{ Modifier, Method } +import java.net.{ URLClassLoader } -import scala.jdk.CollectionConverters._ - -import dotty.tools.dotc.{ Driver, Compiler } -import dotty.tools.dotc.core.Contexts, Contexts.{ Context, ContextBase, ctx } -import dotty.tools.dotc.config.CompilerCommand +import dotty.tools.dotc.Driver +import dotty.tools.dotc.core.Contexts, Contexts.{ Context, ctx } import dotty.tools.io.{ PlainDirectory, Directory, ClassPath } -import dotty.tools.dotc.reporting.Reporter -import dotty.tools.dotc.config.Settings.Setting._ - -import sys.process._ +import Util.* class ScriptingDriver(compilerArgs: Array[String], scriptFile: File, scriptArgs: Array[String]) extends Driver: def compileAndRun(pack:(Path, Seq[Path], String) => Boolean = null): Unit = @@ -31,7 +24,7 @@ class ScriptingDriver(compilerArgs: Array[String], scriptFile: File, scriptArgs: try val classpath = s"${ctx.settings.classpath.value}${pathsep}${sys.props("java.class.path")}" val classpathEntries: Seq[Path] = ClassPath.expandPath(classpath, expandStar=true).map { Paths.get(_) } - val (mainClass, mainMethod) = detectMainClassAndMethod(outDir, classpathEntries, scriptFile) + val (mainClass, mainMethod) = detectMainClassAndMethod(outDir, classpathEntries, scriptFile.toString) val invokeMain: Boolean = Option(pack) match case Some(func) => @@ -48,58 +41,6 @@ class ScriptingDriver(compilerArgs: Array[String], scriptFile: File, scriptArgs: case None => end compileAndRun - private def deleteFile(target: File): Unit = - if target.isDirectory then - for member <- target.listFiles.toList - do deleteFile(member) - target.delete() - end deleteFile - - private def detectMainClassAndMethod(outDir: Path, classpathEntries: Seq[Path], - scriptFile: File): (String, Method) = - - val classpathUrls = (classpathEntries :+ outDir).map { _.toUri.toURL } - - val cl = URLClassLoader(classpathUrls.toArray) - - def collectMainMethods(target: File, path: String): List[(String, Method)] = - val nameWithoutExtension = target.getName.takeWhile(_ != '.') - val targetPath = - if path.nonEmpty then s"${path}.${nameWithoutExtension}" - else nameWithoutExtension - - if target.isDirectory then - for - packageMember <- target.listFiles.toList - membersMainMethod <- collectMainMethods(packageMember, targetPath) - yield membersMainMethod - else if target.getName.endsWith(".class") then - val cls = cl.loadClass(targetPath) - try - val method = cls.getMethod("main", classOf[Array[String]]) - if Modifier.isStatic(method.getModifiers) then List((cls.getName, method)) else Nil - catch - case _: java.lang.NoSuchMethodException => Nil - else Nil - end collectMainMethods - - val candidates = for - file <- outDir.toFile.listFiles.toList - method <- collectMainMethods(file, "") - yield method - - candidates match - case Nil => - throw ScriptingException(s"No main methods detected in script ${scriptFile}") - case _ :: _ :: _ => - throw ScriptingException("A script must contain only one main method. " + - s"Detected the following main methods:\n${candidates.mkString("\n")}") - case m :: Nil => m - end match - end detectMainClassAndMethod - - def pathsep = sys.props("path.separator") - end ScriptingDriver case class ScriptingException(msg: String) extends RuntimeException(msg) diff --git a/compiler/src/dotty/tools/scripting/StringDriver.scala b/compiler/src/dotty/tools/scripting/StringDriver.scala new file mode 100755 index 000000000000..6ac0bce9766a --- /dev/null +++ b/compiler/src/dotty/tools/scripting/StringDriver.scala @@ -0,0 +1,45 @@ +package dotty.tools.scripting + +import java.nio.file.{ Files, Paths, Path } + +import dotty.tools.dotc.Driver +import dotty.tools.dotc.core.Contexts, Contexts.{ Context, ctx } +import dotty.tools.io.{ PlainDirectory, Directory, ClassPath } +import Util.* + +class StringDriver(compilerArgs: Array[String], scalaSource: String) extends Driver: + override def sourcesRequired: Boolean = false + + def compileAndRun(classpath: List[String] = Nil): Unit = + val outDir = Files.createTempDirectory("scala3-expression") + outDir.toFile.deleteOnExit() + + setup(compilerArgs, initCtx.fresh) match + case Some((toCompile, rootCtx)) => + given Context = rootCtx.fresh.setSetting(rootCtx.settings.outputDir, + new PlainDirectory(Directory(outDir))) + + val compiler = newCompiler + compiler.newRun.compileFromStrings(List(scalaSource)) + + val output = ctx.settings.outputDir.value + if ctx.reporter.hasErrors then + throw StringDriverException("Errors encountered during compilation") + + try + val classpath = s"${ctx.settings.classpath.value}${pathsep}${sys.props("java.class.path")}" + val classpathEntries: Seq[Path] = ClassPath.expandPath(classpath, expandStar=true).map { Paths.get(_) } + sys.props("java.class.path") = classpathEntries.map(_.toString).mkString(pathsep) + val (mainClass, mainMethod) = detectMainClassAndMethod(outDir, classpathEntries, scalaSource) + mainMethod.invoke(null, Array.empty[String]) + catch + case e: java.lang.reflect.InvocationTargetException => + throw e.getCause + finally + deleteFile(outDir.toFile) + case None => + end compileAndRun + +end StringDriver + +case class StringDriverException(msg: String) extends RuntimeException(msg) diff --git a/compiler/src/dotty/tools/scripting/Util.scala b/compiler/src/dotty/tools/scripting/Util.scala new file mode 100755 index 000000000000..9529eb9ad791 --- /dev/null +++ b/compiler/src/dotty/tools/scripting/Util.scala @@ -0,0 +1,60 @@ +package dotty.tools.scripting + +import java.nio.file.{ Path } +import java.io.File +import java.net.{ URLClassLoader } +import java.lang.reflect.{ Modifier, Method } + +object Util: + + def deleteFile(target: File): Unit = + if target.isDirectory then + for member <- target.listFiles.toList + do deleteFile(member) + target.delete() + end deleteFile + + def detectMainClassAndMethod(outDir: Path, classpathEntries: Seq[Path], srcFile: String): (String, Method) = + val classpathUrls = (classpathEntries :+ outDir).map { _.toUri.toURL } + val cl = URLClassLoader(classpathUrls.toArray) + + def collectMainMethods(target: File, path: String): List[(String, Method)] = + val nameWithoutExtension = target.getName.takeWhile(_ != '.') + val targetPath = + if path.nonEmpty then s"${path}.${nameWithoutExtension}" + else nameWithoutExtension + + if target.isDirectory then + for + packageMember <- target.listFiles.toList + membersMainMethod <- collectMainMethods(packageMember, targetPath) + yield membersMainMethod + else if target.getName.endsWith(".class") then + val cls = cl.loadClass(targetPath) + try + val method = cls.getMethod("main", classOf[Array[String]]) + if Modifier.isStatic(method.getModifiers) then List((cls.getName, method)) else Nil + catch + case _: java.lang.NoSuchMethodException => Nil + else Nil + end collectMainMethods + + val mains = for + file <- outDir.toFile.listFiles.toList + method <- collectMainMethods(file, "") + yield method + + mains match + case Nil => + throw StringDriverException(s"No main methods detected for [${srcFile}]") + case _ :: _ :: _ => + throw StringDriverException( + s"internal error: Detected the following main methods:\n${mains.mkString("\n")}") + case m :: Nil => m + end match + end detectMainClassAndMethod + + def pathsep = sys.props("path.separator") + +end Util + diff --git a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala index b366d625c367..f352f0c2fbf9 100644 --- a/compiler/test/dotty/tools/scripting/BashScriptsTests.scala +++ b/compiler/test/dotty/tools/scripting/BashScriptsTests.scala @@ -2,6 +2,7 @@ package dotty package tools package scripting +import java.nio.file.Paths import org.junit.{Test, AfterClass} import org.junit.Assert.assertEquals @@ -189,6 +190,30 @@ class BashScriptsTests: if valid then printf(s"\n===> success: classpath begins with %s, as reported by [%s]\n", workingDirectory, scriptFile.getName) assert(valid, s"script ${scriptFile.absPath} did not report valid java.class.path first entry") + /* + * verify that individual scripts can override -save with -nosave (needed to address #13760). + */ + @Test def sqlDateTest = + val scriptBase = "sqlDateError" + val scriptFile = testFiles.find(_.getName == s"$scriptBase.sc").get + val testJar = testFile(s"$scriptBase.jar") // jar should not be created when scriptFile runs + val tj = Paths.get(testJar).toFile + if tj.isFile then tj.delete() // discard residual debris from previous test + printf("===> verify '-save' is cancelled by '-nosave' in script hashbang.`\n") + val (validTest, exitCode, stdout, stderr) = bashCommand(s"SCALA_OPTS=-save ${scriptFile.absPath}") + printf("stdout: %s\n", stdout.mkString("\n","\n","")) + if verifyValid(validTest) then + // the script should print '1969-12-31' or '1970-01-01', depending on time zone + // stdout can be polluted with an ANSI color prefix, in some test environments + val valid = stdout.mkString("").matches(""".*\d{4}-\d{2}-\d{2}.*""") + if (!valid) then + stdout.foreach { printf("stdout[%s]\n", _) } + stderr.foreach { printf("stderr[%s]\n", _) } + if valid then printf(s"\n===> success: scripts can override -save via -nosave\n") + assert(valid, s"script ${scriptFile.absPath} reported unexpected value for java.sql.Date ${stdout.mkString("\n")}") + assert(!testJar.exists,s"unexpected, jar file [$testJar] was created") + + /* * verify -e println("yo!") works. */ diff --git a/compiler/test/dotty/tools/scripting/ExpressionTest.scala b/compiler/test/dotty/tools/scripting/ExpressionTest.scala new file mode 100755 index 000000000000..fd642a7744e0 --- /dev/null +++ b/compiler/test/dotty/tools/scripting/ExpressionTest.scala @@ -0,0 +1,49 @@ +package dotty +package tools +package scripting + +import java.nio.file.Paths +import org.junit.{Test, AfterClass} +import org.junit.Assert.assertEquals + +import vulpix.TestConfiguration + +import ScriptTestEnv.* + +/** + * +. test scala -e + */ +class ExpressionTest: + /* + * verify -e works. + */ + @Test def verifyCommandLineExpression = + printf("===> verify -e is properly handled by `dist/bin/scala`\n") + val expected = "9" + val expression = s"println(3*3)" + val result = getResult(expression) + assert(result.contains(expected), s"expression [$expression] did not send [$expected] to stdout") + + @Test def verifyImports: Unit = + val expressionLines = List( + "import java.nio.file.Paths", + """val cwd = Paths.get(""."")""", + """println(cwd.toFile.listFiles.toList.filter(_.isDirectory).size)""", + ) + val expression = expressionLines.mkString(";") + testExpression(expression){ result => + result.matches("[0-9]+") && result.toInt > 0 + } + + def getResult(expression: String): String = + val cmd = s"bin/scala -e $expression" + val (_, _, stdout, stderr) = bashCommand(s"""bin/scala -e '$expression'""") + printf("stdout: %s\n", stdout.mkString("|")) + printf("stderr: %s\n", stderr.mkString("\n","\n","")) + stdout.filter(_.nonEmpty).mkString("") + + def testExpression(expression: String)(check: (result: String) => Boolean) = { + val result = getResult(expression) + check(result) + } + From 2cb2554ee27a75b2096d862030d1b63c800305d9 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 14 Jan 2022 09:25:29 +0000 Subject: [PATCH 1025/1244] Split dotty.tests.filter by comma, to select multiple --- compiler/test/dotc/comptest.scala | 2 +- compiler/test/dotty/Properties.scala | 2 +- .../transform/PatmatExhaustivityTest.scala | 2 +- compiler/test/dotty/tools/utils.scala | 2 +- .../dotty/tools/vulpix/ParallelTesting.scala | 25 +++++++++---------- .../dotty/tools/vulpix/VulpixMetaTests.scala | 2 +- .../dotty/tools/vulpix/VulpixUnitTests.scala | 2 +- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/compiler/test/dotc/comptest.scala b/compiler/test/dotc/comptest.scala index bb4961ea2a88..bd0d800e641c 100644 --- a/compiler/test/dotc/comptest.scala +++ b/compiler/test/dotc/comptest.scala @@ -10,7 +10,7 @@ object comptest extends ParallelTesting { def numberOfSlaves = 5 def safeMode = false def isInteractive = true - def testFilter = None + def testFilter = Nil def updateCheckFiles: Boolean = false val posDir = "./tests/pos/" diff --git a/compiler/test/dotty/Properties.scala b/compiler/test/dotty/Properties.scala index fd0d8c7c1886..4ef2ad7a61c9 100644 --- a/compiler/test/dotty/Properties.scala +++ b/compiler/test/dotty/Properties.scala @@ -26,7 +26,7 @@ object Properties { /** Filter out tests not matching the regex supplied by "dotty.tests.filter" * define */ - val testsFilter: Option[String] = sys.props.get("dotty.tests.filter") + val testsFilter: List[String] = sys.props.get("dotty.tests.filter").fold(Nil)(_.split(',').toList) /** Tests should override the checkfiles with the current output */ val testsUpdateCheckfile: Boolean = diff --git a/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala b/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala index 6a9f0c74a56f..0c895d436238 100644 --- a/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala +++ b/compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala @@ -65,7 +65,7 @@ class PatmatExhaustivityTest { .filter(f => f.extension == "scala" || f.isDirectory) .filter { f => val path = if f.isDirectory then f.path + "/" else f.path - Properties.testsFilter.getOrElse("").split(',').exists(path.contains) + Properties.testsFilter.isEmpty || Properties.testsFilter.exists(path.contains) } .map(f => if f.isDirectory then compileDir(f.jpath) else compileFile(f.jpath)) diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala index a9792bf2f43c..f4cefbdc07fc 100644 --- a/compiler/test/dotty/tools/utils.scala +++ b/compiler/test/dotty/tools/utils.scala @@ -17,7 +17,7 @@ def scripts(path: String): Array[File] = { assert(dir.exists && dir.isDirectory, "Couldn't load scripts dir") dir.listFiles.filter { f => val path = if f.isDirectory then f.getPath + "/" else f.getPath - path.contains(Properties.testsFilter.getOrElse("")) + Properties.testsFilter.isEmpty || Properties.testsFilter.exists(path.contains) } } diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 28ed07a82ebb..b3f255bbb63e 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -45,11 +45,11 @@ trait ParallelTesting extends RunnerOrchestration { self => */ def isInteractive: Boolean - /** A string which is used to filter which tests to run, if `None` will run - * all tests. All absolute paths that contain the substring `testFilter` + /** A list of strings which is used to filter which tests to run, if `Nil` will run + * all tests. All absolute paths that contain any of the substrings in `testFilter` * will be run */ - def testFilter: Option[String] + def testFilter: List[String] /** Tests should override the checkfiles with the current output */ def updateCheckFiles: Boolean @@ -344,12 +344,12 @@ trait ParallelTesting extends RunnerOrchestration { self => /** All testSources left after filtering out */ private val filteredSources = - if (!testFilter.isDefined) testSources + if (testFilter.isEmpty) testSources else testSources.filter { case JointCompilationSource(_, files, _, _, _, _) => - files.exists(file => file.getPath.contains(testFilter.get)) + testFilter.exists(filter => files.exists(file => file.getPath.contains(filter))) case SeparateCompilationSource(_, dir, _, _) => - dir.getPath.contains(testFilter.get) + testFilter.exists(dir.getPath.contains) } /** Total amount of test sources being compiled by this test */ @@ -628,9 +628,9 @@ trait ParallelTesting extends RunnerOrchestration { self => else reportPassed() } else echo { - testFilter - .map(r => s"""No files matched "$r" in test""") - .getOrElse("No tests available under target - erroneous test?") + testFilter match + case _ :: _ => s"""No files matched "${testFilter.mkString(",")}" in test""" + case _ => "No tests available under target - erroneous test?" } this @@ -1316,10 +1316,9 @@ trait ParallelTesting extends RunnerOrchestration { self => val (dirs, files) = compilationTargets(sourceDir, fromTastyFilter) - val filteredFiles = testFilter match { - case Some(str) => files.filter(_.getPath.contains(str)) - case None => files - } + val filteredFiles = testFilter match + case _ :: _ => files.filter(f => testFilter.exists(f.getPath.contains)) + case _ => Nil class JointCompilationSourceFromTasty( name: String, diff --git a/compiler/test/dotty/tools/vulpix/VulpixMetaTests.scala b/compiler/test/dotty/tools/vulpix/VulpixMetaTests.scala index befb4701f371..75af0aa94893 100644 --- a/compiler/test/dotty/tools/vulpix/VulpixMetaTests.scala +++ b/compiler/test/dotty/tools/vulpix/VulpixMetaTests.scala @@ -28,7 +28,7 @@ object VulpixMetaTests extends ParallelTesting { def numberOfSlaves = 1 def safeMode = false // Don't fork a new VM after each run test def isInteractive = false // Don't beautify output for interactive use. - def testFilter = None // Run all the tests. + def testFilter = Nil // Run all the tests. def updateCheckFiles: Boolean = false @AfterClass diff --git a/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala b/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala index cdbd55af61d4..432bb64bc1cf 100644 --- a/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala +++ b/compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala @@ -104,7 +104,7 @@ object VulpixUnitTests extends ParallelTesting { def numberOfSlaves = 5 def safeMode = sys.env.get("SAFEMODE").isDefined def isInteractive = !sys.env.contains("DRONE") - def testFilter = None + def testFilter = Nil def updateCheckFiles: Boolean = false @AfterClass From 170582b93d5ab657eead6df7ad4f403cd97af425 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 14 Jan 2022 10:52:16 +0000 Subject: [PATCH 1026/1244] Format compiler crash stack traces This allows them to be recognised, e.g. from IntelliJ. --- compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index b3f255bbb63e..0b649943f494 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -275,7 +275,7 @@ trait ParallelTesting extends RunnerOrchestration { self => /** This callback is executed once the compilation of this test source finished */ private final def onComplete(testSource: TestSource, reportersOrCrash: Try[Seq[TestReporter]], logger: LoggedRunnable): Unit = reportersOrCrash match { - case TryFailure(exn) => onFailure(testSource, Nil, logger, Some(s"Fatal compiler crash when compiling: ${testSource.title}:\n${exn.getMessage}\n${exn.getStackTrace.mkString("\n")}")) + case TryFailure(exn) => onFailure(testSource, Nil, logger, Some(s"Fatal compiler crash when compiling: ${testSource.title}:\n${exn.getMessage}${exn.getStackTrace.map("\n\tat " + _).mkString}")) case TrySuccess(reporters) => maybeFailureMessage(testSource, reporters) match { case Some(msg) => onFailure(testSource, reporters, logger, Option(msg).filter(_.nonEmpty)) case None => onSuccess(testSource, reporters, logger) From 7d6e65b61234d18498f31407342227442967d517 Mon Sep 17 00:00:00 2001 From: Gagandeep Kalra Date: Thu, 20 Jan 2022 23:29:06 +0800 Subject: [PATCH 1027/1244] fixed byte code generation for expr types to include type parameters --- .../dotc/transform/GenericSignatures.scala | 2 ++ .../tools/backend/jvm/DottyBytecodeTests.scala | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala index 18b028d1a024..c18009784ba9 100644 --- a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala +++ b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala @@ -471,6 +471,8 @@ object GenericSignatures { foldOver(tp.typeParams.nonEmpty, parents) case AnnotatedType(tpe, _) => foldOver(x, tpe) + case ExprType(tpe) => + true case tp => foldOver(x, tp) } diff --git a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala index 0fa91c3b6879..9d6ff413f8a2 100644 --- a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala +++ b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala @@ -32,6 +32,22 @@ class TestBCode extends DottyBytecodeTest { } } + @Test def byNameParameters = { + val source = """ + |class Foo { + | def byNameParam(str: => String): Unit = {} + |} + """.stripMargin + + checkBCode(source) { dir => + val clsIn = dir.lookupName("Foo.class", directory = false).input + val clsNode = loadClassNode(clsIn) + val methodNode: MethodNode = getMethod(clsNode, "byNameParam") + + assert(methodNode.signature == "(Lscala/Function0;)V") + } + } + /** This test verifies that simple matches are transformed if possible * despite no annotation */ @@ -957,7 +973,7 @@ class TestBCode extends DottyBytecodeTest { @Test def invocationReceivers(): Unit = { - import Opcodes._ + import Opcodes.* checkBCode(List(invocationReceiversTestCode.definitions("Object"))) { dir => val c1 = loadClassNode(dir.lookupName("C1.class", directory = false).input) From a3f04b81009879b66600faab7e3abc9760baef72 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Thu, 20 Jan 2022 12:22:53 +0100 Subject: [PATCH 1028/1244] Fix vulnerable dependency --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index ef6781ee199f..e0adc8ae15e6 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1346,7 +1346,7 @@ object Build { }.taskValue, libraryDependencies ++= Dependencies.flexmarkDeps ++ Seq( "nl.big-o" % "liqp" % "0.8.2", - "org.jsoup" % "jsoup" % "1.13.1", // Needed to process .html files for static site + "org.jsoup" % "jsoup" % "1.14.3", // Needed to process .html files for static site Dependencies.`jackson-dataformat-yaml`, "com.novocode" % "junit-interface" % "0.11" % "test", From 114811f9e6add07a61f12e59b57b252c09407bef Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 14 Jan 2022 16:07:59 +0000 Subject: [PATCH 1029/1244] Avoid cyclic error in checkNoModuleClash --- compiler/src/dotty/tools/dotc/typer/Checking.scala | 6 +++--- tests/pos/i14152.min.scala | 6 ++++++ tests/pos/i14152.scala | 6 ++++++ 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 tests/pos/i14152.min.scala create mode 100644 tests/pos/i14152.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index 85eba072f7a8..ceb504bc5087 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -886,11 +886,11 @@ trait Checking { */ def checkNoModuleClash(sym: Symbol)(using Context): Unit = if sym.effectiveOwner.is(Package) - && sym.owner.info.member(sym.name.moduleClassName).symbol.isAbsent() + && sym.effectiveOwner.info.member(sym.name.moduleClassName).symbol.isAbsent() then - val conflicting = sym.owner.info.member(sym.name.toTypeName).symbol + val conflicting = sym.effectiveOwner.info.member(sym.name.toTypeName).symbol if conflicting.exists then - report.error(AlreadyDefined(sym.name, sym.owner, conflicting), sym.srcPos) + report.error(AlreadyDefined(sym.name, sym.effectiveOwner, conflicting), sym.srcPos) /** Check that `tp` is a class type. * Also, if `traitReq` is true, check that `tp` is a trait. diff --git a/tests/pos/i14152.min.scala b/tests/pos/i14152.min.scala new file mode 100644 index 000000000000..c2525843caa0 --- /dev/null +++ b/tests/pos/i14152.min.scala @@ -0,0 +1,6 @@ +val aa1 = { + object O1 extends AnyRef + Array(O1) +} + +val aa2: Array[_ <: AnyRef] = aa1 diff --git a/tests/pos/i14152.scala b/tests/pos/i14152.scala new file mode 100644 index 000000000000..364b11d9cbae --- /dev/null +++ b/tests/pos/i14152.scala @@ -0,0 +1,6 @@ +val aa1 = { + object O1 extends AnyRef + Array(Array(O1)) +} + +val aa2: Array[_ <: Array[_ <: AnyRef]] = aa1 From 643b1d14111171d1549d61380f33d4873cdd9205 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 17 Jan 2022 17:03:04 +0000 Subject: [PATCH 1030/1244] Extract effectiveOwner --- compiler/src/dotty/tools/dotc/typer/Checking.scala | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index ceb504bc5087..be38221ef167 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -885,12 +885,13 @@ trait Checking { * that is concurrently compiled in another source file. */ def checkNoModuleClash(sym: Symbol)(using Context): Unit = - if sym.effectiveOwner.is(Package) - && sym.effectiveOwner.info.member(sym.name.moduleClassName).symbol.isAbsent() + val effectiveOwner = sym.effectiveOwner + if effectiveOwner.is(Package) + && effectiveOwner.info.member(sym.name.moduleClassName).symbol.isAbsent() then - val conflicting = sym.effectiveOwner.info.member(sym.name.toTypeName).symbol + val conflicting = effectiveOwner.info.member(sym.name.toTypeName).symbol if conflicting.exists then - report.error(AlreadyDefined(sym.name, sym.effectiveOwner, conflicting), sym.srcPos) + report.error(AlreadyDefined(sym.name, effectiveOwner, conflicting), sym.srcPos) /** Check that `tp` is a class type. * Also, if `traitReq` is true, check that `tp` is a trait. From 4a24edd4bfd60d545f320e9be471875ee53b7cd5 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 17 Jan 2022 17:01:35 +0000 Subject: [PATCH 1031/1244] Fix type avoidance in nested Array case --- .../src/dotty/tools/dotc/core/Types.scala | 11 +++++--- tests/pos/i14152.min.scala | 6 ----- tests/pos/i14152.scala | 26 ++++++++++++++++++- 3 files changed, 32 insertions(+), 11 deletions(-) delete mode 100644 tests/pos/i14152.min.scala diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 6805c91168c4..49dd4e3a8ef4 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -5847,7 +5847,7 @@ object Types { tp.derivedAppliedType(tycon, args.map(rangeToBounds)) match case tp1: AppliedType if tp1.isUnreducibleWild => // don't infer a type that would trigger an error later in - // Checling.checkAppliedType; fall through to default handling instead + // Checking.checkAppliedType; fall through to default handling instead case tp1 => return tp1 end if @@ -5856,7 +5856,7 @@ object Types { // non-range arguments L1, ..., Ln and H1, ..., Hn such that // C[L1, ..., Ln] <: C[H1, ..., Hn] by taking the right limits of // ranges that appear in as co- or contravariant arguments. - // Fail for non-variant argument ranges. + // Fail for non-variant argument ranges (see use-site else branch below). // If successful, the L-arguments are in loBut, the H-arguments in hiBuf. // @return operation succeeded for all arguments. def distributeArgs(args: List[Type], tparams: List[ParamInfo]): Boolean = args match { @@ -5877,8 +5877,11 @@ object Types { if (distributeArgs(args, tp.tyconTypeParams)) range(tp.derivedAppliedType(tycon, loBuf.toList), tp.derivedAppliedType(tycon, hiBuf.toList)) - else range(defn.NothingType, defn.AnyType) - // TODO: can we give a better bound than `topType`? + else if tycon.isLambdaSub then + range(defn.NothingType, defn.AnyType) + else + // See lampepfl/dotty#14152 + range(defn.NothingType, tp.derivedAppliedType(tycon, args.map(rangeToBounds))) else tp.derivedAppliedType(tycon, args) } diff --git a/tests/pos/i14152.min.scala b/tests/pos/i14152.min.scala deleted file mode 100644 index c2525843caa0..000000000000 --- a/tests/pos/i14152.min.scala +++ /dev/null @@ -1,6 +0,0 @@ -val aa1 = { - object O1 extends AnyRef - Array(O1) -} - -val aa2: Array[_ <: AnyRef] = aa1 diff --git a/tests/pos/i14152.scala b/tests/pos/i14152.scala index 364b11d9cbae..2377d5ffeae3 100644 --- a/tests/pos/i14152.scala +++ b/tests/pos/i14152.scala @@ -1,6 +1,30 @@ +val a1 = { + object O1 extends AnyRef + Array(O1) +} +val a2: Array[_ <: AnyRef] = aa1 + val aa1 = { object O1 extends AnyRef Array(Array(O1)) } - val aa2: Array[_ <: Array[_ <: AnyRef]] = aa1 + +val aaa1 = { + object O1 extends AnyRef + Array(Array(Array(O1))) +} +val aaa2: Array[_ <: Array[_ <: Array[_ <: AnyRef]]] = aaa1 + + +// Let's make sure avoidance still does the right thing given abstract type constructors + +class Inv[T](x: T) + +def foo[F[_]](fn: [A] => Inv[A] => F[A]) = + object O1 extends AnyRef + val res0 = fn(new Inv(fn(new Inv[O1.type](O1)))) + val res1: F[F[O1.type]] = res0 + res1 // checked with -Xprint:typer that this widens to Any + // instead of the original F[F[O1.type]] + // or the incorrectly avoided F[? <: F[? <: Object]] From 9ac82267b80c558e697678ba31001261e1a55fbd Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 17 Jan 2022 21:21:57 +0000 Subject: [PATCH 1032/1244] Avoid weird Ranges of TypeBounds?? --- compiler/src/dotty/tools/dotc/core/Types.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 49dd4e3a8ef4..363a9e34230e 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -5877,7 +5877,7 @@ object Types { if (distributeArgs(args, tp.tyconTypeParams)) range(tp.derivedAppliedType(tycon, loBuf.toList), tp.derivedAppliedType(tycon, hiBuf.toList)) - else if tycon.isLambdaSub then + else if tycon.isLambdaSub || args.exists(isRangeOfNonTermTypes) then range(defn.NothingType, defn.AnyType) else // See lampepfl/dotty#14152 @@ -5885,6 +5885,10 @@ object Types { else tp.derivedAppliedType(tycon, args) } + private def isRangeOfNonTermTypes(tp: Type): Boolean = tp match + case Range(lo, hi) => !lo.isInstanceOf[TermType] || !hi.isInstanceOf[TermType] + case _ => false + override protected def derivedAndType(tp: AndType, tp1: Type, tp2: Type): Type = if (isRange(tp1) || isRange(tp2)) range(lower(tp1) & lower(tp2), upper(tp1) & upper(tp2)) else tp.derivedAndType(tp1, tp2) From 3ef2f2f01a60efb8a600a1318bd6630179c03294 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 14 Jan 2022 11:13:39 +0000 Subject: [PATCH 1033/1244] Improve typer traces 1. Drop traceIndented from isSubType, which calls recur so it was just doubling the lines 2. Replace newlines with spaces, in doTrace and traceIndented, as they're meant to be single lines. For example ErrorType and MatchType have toText that are multi-line and mess up the output. 3. Change ExplainingTypeComparer#addConstraint to use show like the other methods. --- .../dotty/tools/dotc/core/TypeComparer.scala | 17 +++--- .../dotty/tools/dotc/reporting/trace.scala | 2 +- tests/neg-custom-args/i11637.check | 60 +++++++------------ 3 files changed, 28 insertions(+), 51 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index 1d75c9ef0019..7083e457e577 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -210,7 +210,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling * types (as when we go from an abstract type to one of its bounds). In that case * one should use `isSubType(_, _, a)` where `a` defines the kind of approximation. * - * Note: Logicaly, `recur` could be nested in `isSubType`, which would avoid + * Note: Logically, `recur` could be nested in `isSubType`, which would avoid * the instance state consisting `approx` and `leftRoot`. But then the implemented * code would have two extra parameters for each of the many calls that go from * one sub-part of isSubType to another. @@ -2955,9 +2955,10 @@ class ExplainingTypeComparer(initctx: Context) extends TypeComparer(initctx) { if (skipped) op else { indent += 2 - b.append("\n").append(" " * indent).append("==> ").append(str) + val str1 = str.replace('\n', ' ') + b.append("\n").append(" " * indent).append("==> ").append(str1) val res = op - b.append("\n").append(" " * indent).append("<== ").append(str).append(" = ").append(show(res)) + b.append("\n").append(" " * indent).append("<== ").append(str1).append(" = ").append(show(res)) indent -= 2 res } @@ -2965,17 +2966,13 @@ class ExplainingTypeComparer(initctx: Context) extends TypeComparer(initctx) { private def frozenNotice: String = if frozenConstraint then " in frozen constraint" else "" - override def isSubType(tp1: Type, tp2: Type, approx: ApproxState): Boolean = + override def recur(tp1: Type, tp2: Type): Boolean = def moreInfo = if Config.verboseExplainSubtype || ctx.settings.verbose.value then s" ${tp1.getClass} ${tp2.getClass}" else "" + val approx = approxState traceIndented(s"${show(tp1)} <: ${show(tp2)}$moreInfo${approx.show}$frozenNotice") { - super.isSubType(tp1, tp2, approx) - } - - override def recur(tp1: Type, tp2: Type): Boolean = - traceIndented(s"${show(tp1)} <: ${show(tp2)} (recurring)$frozenNotice") { super.recur(tp1, tp2) } @@ -2995,7 +2992,7 @@ class ExplainingTypeComparer(initctx: Context) extends TypeComparer(initctx) { } override def addConstraint(param: TypeParamRef, bound: Type, fromBelow: Boolean)(using Context): Boolean = - traceIndented(i"add constraint $param ${if (fromBelow) ">:" else "<:"} $bound $frozenConstraint, constraint = ${ctx.typerState.constraint}") { + traceIndented(s"add constraint ${show(param)} ${if (fromBelow) ">:" else "<:"} ${show(bound)} $frozenNotice, constraint = ${show(ctx.typerState.constraint)}") { super.addConstraint(param, bound, fromBelow) } diff --git a/compiler/src/dotty/tools/dotc/reporting/trace.scala b/compiler/src/dotty/tools/dotc/reporting/trace.scala index 10179f9d3789..804188b20780 100644 --- a/compiler/src/dotty/tools/dotc/reporting/trace.scala +++ b/compiler/src/dotty/tools/dotc/reporting/trace.scala @@ -76,7 +76,7 @@ trait TraceSyntax: else // Avoid evaluating question multiple time, since each evaluation // may cause some extra logging output. - val q = question + val q = question.replace('\n', ' ') val leading = s"==> $q?" val trailing = (res: T) => s"<== $q = ${showOp(res)}" var finalized = false diff --git a/tests/neg-custom-args/i11637.check b/tests/neg-custom-args/i11637.check index 0f296927795e..eca2cf91b99f 100644 --- a/tests/neg-custom-args/i11637.check +++ b/tests/neg-custom-args/i11637.check @@ -13,26 +13,16 @@ conforms to but the comparison trace ended with `false`: ==> test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any - ==> test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any (recurring) - ==> type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] - ==> type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] (recurring) - ==> [T <: String] =>> Set[T] <: Iterable - ==> [T <: String] =>> Set[T] <: Iterable (recurring) - ==> type bounds [] <: type bounds [ <: String] - ==> type bounds [] <: type bounds [ <: String] (recurring) - ==> Any <: String - ==> Any <: String (recurring) - ==> Any <: String (recurring) - <== Any <: String (recurring) = false - <== Any <: String (recurring) = false - <== Any <: String = false - <== type bounds [] <: type bounds [ <: String] (recurring) = false - <== type bounds [] <: type bounds [ <: String] = false - <== [T <: String] =>> Set[T] <: Iterable (recurring) = false - <== [T <: String] =>> Set[T] <: Iterable = false - <== type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] (recurring) = false - <== type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] = false - <== test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any (recurring) = false + ==> type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] + ==> [T <: String] =>> Set[T] <: Iterable + ==> type bounds [] <: type bounds [ <: String] + ==> Any <: String + ==> Any <: String + <== Any <: String = false + <== Any <: String = false + <== type bounds [] <: type bounds [ <: String] = false + <== [T <: String] =>> Set[T] <: Iterable = false + <== type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] = false <== test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any = false The tests were made under the empty constraint @@ -52,26 +42,16 @@ conforms to but the comparison trace ended with `false`: ==> test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any - ==> test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any (recurring) - ==> type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] - ==> type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] (recurring) - ==> [T <: String] =>> Set[T] <: Iterable - ==> [T <: String] =>> Set[T] <: Iterable (recurring) - ==> type bounds [] <: type bounds [ <: String] - ==> type bounds [] <: type bounds [ <: String] (recurring) - ==> Any <: String - ==> Any <: String (recurring) - ==> Any <: String (recurring) - <== Any <: String (recurring) = false - <== Any <: String (recurring) = false - <== Any <: String = false - <== type bounds [] <: type bounds [ <: String] (recurring) = false - <== type bounds [] <: type bounds [ <: String] = false - <== [T <: String] =>> Set[T] <: Iterable (recurring) = false - <== [T <: String] =>> Set[T] <: Iterable = false - <== type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] (recurring) = false - <== type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] = false - <== test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any (recurring) = false + ==> type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] + ==> [T <: String] =>> Set[T] <: Iterable + ==> type bounds [] <: type bounds [ <: String] + ==> Any <: String + ==> Any <: String + <== Any <: String = false + <== Any <: String = false + <== type bounds [] <: type bounds [ <: String] = false + <== [T <: String] =>> Set[T] <: Iterable = false + <== type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] = false <== test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any = false The tests were made under the empty constraint From 529e05787e9a102ca60d63fc3df04c953f730d32 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 12 Jan 2022 07:19:16 -0800 Subject: [PATCH 1034/1244] Scala 2.13.8 (was 2.13.6) --- project/Build.scala | 4 ++-- tests/neg/i8752.check | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index e0adc8ae15e6..cb8706a56019 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -99,8 +99,8 @@ object Build { * scala-library. */ def stdlibVersion(implicit mode: Mode): String = mode match { - case NonBootstrapped => "2.13.6" - case Bootstrapped => "2.13.6" + case NonBootstrapped => "2.13.8" + case Bootstrapped => "2.13.8" } val dottyOrganization = "org.scala-lang" diff --git a/tests/neg/i8752.check b/tests/neg/i8752.check index 6d1cf47aa2fd..cf2feb0cc7c6 100644 --- a/tests/neg/i8752.check +++ b/tests/neg/i8752.check @@ -8,4 +8,4 @@ longer explanation available when compiling with `-explain` -- Error: tests/neg/i8752.scala:3:39 ----------------------------------------------------------------------------------- 3 |trait Arround1[C <:[X]=>>IterableOps[X,C,C[X]] ] // error // error | ^ - | Type argument C does not have the same kind as its bound [_] + | Type argument C does not have the same kind as its bound [_$$1] From d05f09376766df381843e788ca98d561eea3fd95 Mon Sep 17 00:00:00 2001 From: Kacper Korban Date: Sat, 13 Nov 2021 18:58:04 +0100 Subject: [PATCH 1035/1244] Don't lift try-catch statements that are already in local functions closes #13941 --- .../src/dotty/tools/dotc/transform/LiftTry.scala | 3 +++ tests/pos/i13941.scala | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 tests/pos/i13941.scala diff --git a/compiler/src/dotty/tools/dotc/transform/LiftTry.scala b/compiler/src/dotty/tools/dotc/transform/LiftTry.scala index e5e234b8fe8e..074ba7bc0516 100644 --- a/compiler/src/dotty/tools/dotc/transform/LiftTry.scala +++ b/compiler/src/dotty/tools/dotc/transform/LiftTry.scala @@ -44,6 +44,9 @@ class LiftTry extends MiniPhase with IdentityDenotTransformer { thisPhase => override def prepareForApply(tree: Apply)(using Context): Context = liftingCtx(true) + override def prepareForDefDef(tree: DefDef)(using Context): Context = + liftingCtx(false) + override def prepareForValDef(tree: ValDef)(using Context): Context = if !tree.symbol.exists || tree.symbol.isSelfSym diff --git a/tests/pos/i13941.scala b/tests/pos/i13941.scala new file mode 100644 index 000000000000..299470e455e3 --- /dev/null +++ b/tests/pos/i13941.scala @@ -0,0 +1,15 @@ +import scala.annotation.tailrec + +object A { + def b = Option("a").map { x => + @tailrec + def loop(): Int = { + try + 2 + catch + case _: Throwable => + loop() + } + x + } +} From e362e221bfa02174482f44cc4e061080eb1ebb01 Mon Sep 17 00:00:00 2001 From: Kacper Korban Date: Tue, 21 Dec 2021 12:42:42 +0100 Subject: [PATCH 1036/1244] Fix scalatest community-build --- community-build/community-projects/scalatest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest index 96650cfbf700..75f5a3be6632 160000 --- a/community-build/community-projects/scalatest +++ b/community-build/community-projects/scalatest @@ -1 +1 @@ -Subproject commit 96650cfbf7003c198e2759bdca4a9a37dac03cad +Subproject commit 75f5a3be66322f69ea624bbf5f166fbd28c5ff9e From cfe8654d521522e87f0803a3139ee2700bda1edb Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Wed, 28 Apr 2021 09:03:59 +0200 Subject: [PATCH 1037/1244] Fix #12260: Add underscore to match type syntax --- compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 11 +++++++++-- docs/docs/internals/syntax.md | 2 +- tests/pos/unify-wildcard-patterns.scala | 13 +++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 tests/pos/unify-wildcard-patterns.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index fc607e16dd74..589b02bba5f8 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -2615,12 +2615,19 @@ object Parsers { }) } - /** TypeCaseClause ::= ‘case’ InfixType ‘=>’ Type [semi] + /** TypeCaseClause ::= ‘case’ (InfixType | ‘_’) ‘=>’ Type [semi] */ def typeCaseClause(): CaseDef = atSpan(in.offset) { val pat = inSepRegion(InCase) { accept(CASE) - infixType() + in.token match { + case USCORE if in.lookahead.isArrow => + val start = in.skipToken() + typeBounds().withSpan(Span(start, in.lastOffset, start)) + + case _ => + infixType() + } } CaseDef(pat, EmptyTree, atSpan(accept(ARROW)) { val t = typ() diff --git a/docs/docs/internals/syntax.md b/docs/docs/internals/syntax.md index f8c1aa500490..c484c42864e5 100644 --- a/docs/docs/internals/syntax.md +++ b/docs/docs/internals/syntax.md @@ -291,7 +291,7 @@ CaseClauses ::= CaseClause { CaseClause } CaseClause ::= ‘case’ Pattern [Guard] ‘=>’ Block CaseDef(pat, guard?, block) // block starts at => ExprCaseClause ::= ‘case’ Pattern [Guard] ‘=>’ Expr TypeCaseClauses ::= TypeCaseClause { TypeCaseClause } -TypeCaseClause ::= ‘case’ InfixType ‘=>’ Type [semi] +TypeCaseClause ::= ‘case’ (InfixType | ‘_’) ‘=>’ Type [semi] Pattern ::= Pattern1 { ‘|’ Pattern1 } Alternative(pats) Pattern1 ::= Pattern2 [‘:’ RefinedType] Bind(name, Typed(Ident(wildcard), tpe)) diff --git a/tests/pos/unify-wildcard-patterns.scala b/tests/pos/unify-wildcard-patterns.scala new file mode 100644 index 000000000000..af88f4c80067 --- /dev/null +++ b/tests/pos/unify-wildcard-patterns.scala @@ -0,0 +1,13 @@ +// `case _ => expr` in a match expression should be equivalant to +// `case _: Any => expr`. Likewise, in a match type, `case _ => T` +// should be equivalant to `case Any => T`. + +object Test0 { + type M[X] = X match { case String => Int case Any => String } + def m[X](x: X): M[X] = x match { case _: String => 1 case _: Any => "s" } +} + +object Test2 { + type M[X] = X match { case String => Int case _ => String } + def m[X](x: X): M[X] = x match { case _: String => 1 case _: Any => "s" } +} From 3405682dd23c6cf57d04ee8a1d229103e638c1d4 Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Wed, 22 Sep 2021 11:25:06 +0200 Subject: [PATCH 1038/1244] Fix #9171: treat _ as _:Any in isMatchTypeShaped --- compiler/src/dotty/tools/dotc/core/Types.scala | 8 ++++++++ compiler/src/dotty/tools/dotc/typer/Typer.scala | 8 ++++++++ tests/pos/unify-wildcard-patterns.scala | 10 ++++++++++ 3 files changed, 26 insertions(+) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 363a9e34230e..97278e2d0fe5 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4877,6 +4877,14 @@ object Types { object MatchType { def apply(bound: Type, scrutinee: Type, cases: List[Type])(using Context): MatchType = unique(new CachedMatchType(bound, scrutinee, cases)) + + /** Extractor for `case _ =>` match type patterns */ + object WildcardPattern { + def unapply(tp: Type)(using Context): Option[Type] = tp match { + case HKTypeLambda(LambdaParam(tl1, 0) :: Nil, defn.MatchCase(TypeParamRef(tl2, 0), bodyTp)) => Some(bodyTp) + case _ => None + } + } } // ------ ClassInfo, Type Bounds -------------------------------------------------- diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 1c452ccb0542..d4c6f28ee6b0 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1559,6 +1559,13 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer val Typed(_, tpt) = tpd.unbind(tpd.unsplice(pat1)) instantiateMatchTypeProto(pat1, pt) match { case defn.MatchCase(patternTp, _) => tpt.tpe frozen_=:= patternTp + case MatchType.WildcardPattern(_) => tpt.tpe frozen_=:= defn.AnyType + case _ => false + } + case (id @ Ident(nme.WILDCARD), pt) => + pt match { + case defn.MatchCase(patternTp, _) => defn.AnyType frozen_=:= patternTp + case MatchType.WildcardPattern(_) => true case _ => false } case _ => false @@ -1670,6 +1677,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer def caseRest(pat: Tree)(using Context) = { val pt1 = instantiateMatchTypeProto(pat, pt) match { case defn.MatchCase(_, bodyPt) => bodyPt + case MatchType.WildcardPattern(bodyPt) => bodyPt case pt => pt } val pat1 = indexPattern(tree).transform(pat) diff --git a/tests/pos/unify-wildcard-patterns.scala b/tests/pos/unify-wildcard-patterns.scala index af88f4c80067..9f18cebae1f5 100644 --- a/tests/pos/unify-wildcard-patterns.scala +++ b/tests/pos/unify-wildcard-patterns.scala @@ -7,7 +7,17 @@ object Test0 { def m[X](x: X): M[X] = x match { case _: String => 1 case _: Any => "s" } } +object Test1 { + type M[X] = X match { case String => Int case Any => String } + def m[X](x: X): M[X] = x match { case _: String => 1 case _ => "s" } +} + object Test2 { type M[X] = X match { case String => Int case _ => String } def m[X](x: X): M[X] = x match { case _: String => 1 case _: Any => "s" } } + +object Test3 { + type M[X] = X match { case String => Int case _ => String } + def m[X](x: X): M[X] = x match { case _: String => 1 case _ => "s" } +} From 7ef5b51a1ebb4a5c51af8c94234122c8aad9096d Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Thu, 27 May 2021 14:55:45 +0200 Subject: [PATCH 1039/1244] Parse 'case _' as 'Ident(_)' --- compiler/src/dotty/tools/dotc/core/Types.scala | 8 -------- compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 3 +-- compiler/src/dotty/tools/dotc/typer/Typer.scala | 5 ++--- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 97278e2d0fe5..363a9e34230e 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -4877,14 +4877,6 @@ object Types { object MatchType { def apply(bound: Type, scrutinee: Type, cases: List[Type])(using Context): MatchType = unique(new CachedMatchType(bound, scrutinee, cases)) - - /** Extractor for `case _ =>` match type patterns */ - object WildcardPattern { - def unapply(tp: Type)(using Context): Option[Type] = tp match { - case HKTypeLambda(LambdaParam(tl1, 0) :: Nil, defn.MatchCase(TypeParamRef(tl2, 0), bodyTp)) => Some(bodyTp) - case _ => None - } - } } // ------ ClassInfo, Type Bounds -------------------------------------------------- diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 589b02bba5f8..b46355a0ee7a 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -2623,8 +2623,7 @@ object Parsers { in.token match { case USCORE if in.lookahead.isArrow => val start = in.skipToken() - typeBounds().withSpan(Span(start, in.lastOffset, start)) - + Ident(tpnme.WILDCARD).withSpan(Span(start, in.lastOffset, start)) case _ => infixType() } diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index d4c6f28ee6b0..4c0c10f7c026 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -498,6 +498,8 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer if ctx.mode.is(Mode.Pattern) then if name == nme.WILDCARD then return tree.withType(pt) + if name == tpnme.WILDCARD then + return tree.withType(defn.AnyType) if untpd.isVarPattern(tree) && name.isTermName then return typed(desugar.patternVar(tree), pt) else if ctx.mode.is(Mode.QuotedPattern) then @@ -1559,13 +1561,11 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer val Typed(_, tpt) = tpd.unbind(tpd.unsplice(pat1)) instantiateMatchTypeProto(pat1, pt) match { case defn.MatchCase(patternTp, _) => tpt.tpe frozen_=:= patternTp - case MatchType.WildcardPattern(_) => tpt.tpe frozen_=:= defn.AnyType case _ => false } case (id @ Ident(nme.WILDCARD), pt) => pt match { case defn.MatchCase(patternTp, _) => defn.AnyType frozen_=:= patternTp - case MatchType.WildcardPattern(_) => true case _ => false } case _ => false @@ -1677,7 +1677,6 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer def caseRest(pat: Tree)(using Context) = { val pt1 = instantiateMatchTypeProto(pat, pt) match { case defn.MatchCase(_, bodyPt) => bodyPt - case MatchType.WildcardPattern(bodyPt) => bodyPt case pt => pt } val pat1 = indexPattern(tree).transform(pat) From c809bcb8a3b04703a81b477c14a8572ffa0b79b3 Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Tue, 3 Aug 2021 13:40:16 +0200 Subject: [PATCH 1040/1244] Printing hack for `case _ =>` This is a hack to tell `case _ =>` and `case Any =>` apart while printing match type error messages. At this point in the compilation pipeline both `pat` types =:= Any, however because of the slight difference in representation we are able to restore the original syntax. Here is what `pat.toString` gives in each case: // case _ => (TypeRef(ThisType(TypeRef(NoPrefix,module class scala)),class Any)) // case Any => (TypeRef(TermRef(ThisType(TypeRef(NoPrefix,module class )),object scala),class Any)) The second case doesn't `eq defn.AnyType` because it starts from , and thus doesn't match the pattern added in this commit. --- compiler/src/dotty/tools/dotc/core/MatchTypeTrace.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/compiler/src/dotty/tools/dotc/core/MatchTypeTrace.scala b/compiler/src/dotty/tools/dotc/core/MatchTypeTrace.scala index 64a91dfb17e6..bc08dbc36eea 100644 --- a/compiler/src/dotty/tools/dotc/core/MatchTypeTrace.scala +++ b/compiler/src/dotty/tools/dotc/core/MatchTypeTrace.scala @@ -84,6 +84,7 @@ object MatchTypeTrace: private def caseText(tp: Type)(using Context): String = tp match case tp: HKTypeLambda => caseText(tp.resultType) + case defn.MatchCase(any, body) if any eq defn.AnyType => i"case _ => $body" case defn.MatchCase(pat, body) => i"case $pat => $body" case _ => i"case $tp" From a5e41a71264d29c0b3451a142f343746642e391b Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Fri, 30 Jul 2021 22:38:30 +0200 Subject: [PATCH 1041/1244] Fix #13223: Disalow ? in match types pats/bodies --- compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 4 ++-- tests/neg/12261.scala | 11 +++++++++++ tests/pos/9239.scala | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 tests/neg/12261.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index b46355a0ee7a..294490ee1be2 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -2625,11 +2625,11 @@ object Parsers { val start = in.skipToken() Ident(tpnme.WILDCARD).withSpan(Span(start, in.lastOffset, start)) case _ => - infixType() + rejectWildcardType(infixType()) } } CaseDef(pat, EmptyTree, atSpan(accept(ARROW)) { - val t = typ() + val t = rejectWildcardType(typ()) if in.token == SEMI then in.nextToken() newLinesOptWhenFollowedBy(CASE) t diff --git a/tests/neg/12261.scala b/tests/neg/12261.scala new file mode 100644 index 000000000000..9848e68fa160 --- /dev/null +++ b/tests/neg/12261.scala @@ -0,0 +1,11 @@ +type M0[X] = X match { + case ? => String // error: Unbound wildcard type +} + +type M1[X] = X match { + case Any => _ // error: Unbound wildcard type +} + +type M2[X] = X match { + case Any => ? // error: Unbound wildcard type +} diff --git a/tests/pos/9239.scala b/tests/pos/9239.scala index 8f3ddfbd1ced..c9c0ec268218 100644 --- a/tests/pos/9239.scala +++ b/tests/pos/9239.scala @@ -24,5 +24,5 @@ object ABug: N match case Zero => One case One => One - case ? => ![--[N]] × (N) + case _ => ![--[N]] × (N) case ? :: ? => ![--[N]] × (N) From 39c2195ac4bdef215053413702ca7704f4c350fb Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Sat, 31 Jul 2021 08:49:11 +0200 Subject: [PATCH 1042/1244] Also disalow unbound wildcard type in pattern expr --- compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 2 +- tests/neg/12261.scala | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 294490ee1be2..1972d88af79f 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -1829,7 +1829,7 @@ object Parsers { def typeDependingOn(location: Location): Tree = if location.inParens then typ() - else if location.inPattern then refinedType() + else if location.inPattern then rejectWildcardType(refinedType()) else infixType() /* ----------- EXPRESSIONS ------------------------------------------------ */ diff --git a/tests/neg/12261.scala b/tests/neg/12261.scala index 9848e68fa160..70120671a05b 100644 --- a/tests/neg/12261.scala +++ b/tests/neg/12261.scala @@ -9,3 +9,7 @@ type M1[X] = X match { type M2[X] = X match { case Any => ? // error: Unbound wildcard type } + +val a = "" match { case _: _ => () } // error: Unbound wildcard type + +val b = try { } catch { case _: _ => () } // error: Unbound wildcard type From a938020bf07772978f5bc225d0af25858a320e5b Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Tue, 3 Aug 2021 11:46:09 +0200 Subject: [PATCH 1043/1244] Update community build (scodec) --- community-build/community-projects/scodec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/scodec b/community-build/community-projects/scodec index 18047cac1feb..d59c0440b078 160000 --- a/community-build/community-projects/scodec +++ b/community-build/community-projects/scodec @@ -1 +1 @@ -Subproject commit 18047cac1febc840e03dee91a31183d64e632222 +Subproject commit d59c0440b078292dedff10b6743d6a086f468527 From 36d94f31a5a5cff1b5783d3c5e464b4cacef4faa Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sun, 23 Jan 2022 17:40:44 +0100 Subject: [PATCH 1044/1244] Avoid misleading error message The error message falsely referred to missing support for early definitions in the example, but none were present. Fixes #14326 --- .../src/dotty/tools/dotc/parsing/Parsers.scala | 18 +++++++++--------- tests/neg/parent-refinement.check | 4 ++++ tests/neg/parent-refinement.scala | 7 +++++++ 3 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 tests/neg/parent-refinement.check create mode 100644 tests/neg/parent-refinement.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 1972d88af79f..bbe2ea914a43 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -3758,11 +3758,11 @@ object Parsers { } else Nil possibleTemplateStart() - if (isEnum) { - val (self, stats) = withinEnum(templateBody()) + if isEnum then + val (self, stats) = withinEnum(templateBody(parents)) Template(constr, parents, derived, self, stats) - } - else templateBodyOpt(constr, parents, derived) + else + templateBodyOpt(constr, parents, derived) } /** TemplateOpt = [Template] @@ -3785,15 +3785,15 @@ object Parsers { def templateBodyOpt(constr: DefDef, parents: List[Tree], derived: List[Tree]): Template = val (self, stats) = if in.isNestedStart then - templateBody() + templateBody(parents) else checkNextNotIndented() (EmptyValDef, Nil) Template(constr, parents, derived, self, stats) - def templateBody(rewriteWithColon: Boolean = true): (ValDef, List[Tree]) = + def templateBody(parents: List[Tree], rewriteWithColon: Boolean = true): (ValDef, List[Tree]) = val r = inDefScopeBraces(templateStatSeq(), rewriteWithColon) - if in.token == WITH then + if in.token == WITH && parents.isEmpty then syntaxError(EarlyDefinitionsNotSupported()) in.nextToken() template(emptyConstructor) @@ -3802,7 +3802,7 @@ object Parsers { /** with Template, with EOL interpreted */ def withTemplate(constr: DefDef, parents: List[Tree]): Template = accept(WITH) - val (self, stats) = templateBody(rewriteWithColon = false) + val (self, stats) = templateBody(parents, rewriteWithColon = false) Template(constr, parents, Nil, self, stats) .withSpan(Span(constr.span.orElse(parents.head.span).start, in.lastOffset)) @@ -4045,7 +4045,7 @@ object Parsers { EmptyTree } - override def templateBody(rewriteWithColon: Boolean): (ValDef, List[Thicket]) = { + override def templateBody(parents: List[Tree], rewriteWithColon: Boolean): (ValDef, List[Thicket]) = { skipBraces() (EmptyValDef, List(EmptyTree)) } diff --git a/tests/neg/parent-refinement.check b/tests/neg/parent-refinement.check new file mode 100644 index 000000000000..550430bd35a7 --- /dev/null +++ b/tests/neg/parent-refinement.check @@ -0,0 +1,4 @@ +-- Error: tests/neg/parent-refinement.scala:5:2 ------------------------------------------------------------------------ +5 | with Ordered[Year] { // error + | ^^^^ + | end of toplevel definition expected but 'with' found diff --git a/tests/neg/parent-refinement.scala b/tests/neg/parent-refinement.scala new file mode 100644 index 000000000000..ca2b88a75fd8 --- /dev/null +++ b/tests/neg/parent-refinement.scala @@ -0,0 +1,7 @@ + +trait Id { type Value } +case class Year(value: Int) extends AnyVal + with Id { type Value = Int } + with Ordered[Year] { // error + +} \ No newline at end of file From e24a40ede00ce100ffb551caa828164221dd39f2 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Sat, 18 Dec 2021 05:27:11 +0000 Subject: [PATCH 1045/1244] Extract GADT constraints from wildcard type arguments --- .../tools/dotc/core/PatternTypeConstrainer.scala | 13 +++++++------ tests/pos/i13998.scala | 10 ++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 tests/pos/i13998.scala diff --git a/compiler/src/dotty/tools/dotc/core/PatternTypeConstrainer.scala b/compiler/src/dotty/tools/dotc/core/PatternTypeConstrainer.scala index 3fd5a2b9f208..f928ad785e2c 100644 --- a/compiler/src/dotty/tools/dotc/core/PatternTypeConstrainer.scala +++ b/compiler/src/dotty/tools/dotc/core/PatternTypeConstrainer.scala @@ -256,12 +256,13 @@ trait PatternTypeConstrainer { self: TypeComparer => val variance = param.paramVarianceSign if variance != 0 && !assumeInvariantRefinement then true else if argS.isInstanceOf[TypeBounds] || argP.isInstanceOf[TypeBounds] then - // Passing TypeBounds to isSubType on LHS or RHS does the - // incorrect thing and infers unsound constraints, while simply - // returning true is sound. However, I believe that it should - // still be possible to extract useful constraints here. - // TODO extract GADT information out of wildcard type arguments - true + // This line was added here as a quick fix for issue #13998, + // to extract GADT constraints from wildcard type arguments. + // The proper fix would involve inspecting the bounds right here and performing the + // correct subtyping checks, the ones that are already performed by `isSubType` below, + // for the same reasons for which we stopped using `SkolemType` here to begin with + // (commit 10fe5374dc2d). + isSubType(SkolemType(patternTp), scrutineeTp) else { var res = true if variance < 1 then res &&= isSubType(argS, argP) diff --git a/tests/pos/i13998.scala b/tests/pos/i13998.scala new file mode 100644 index 000000000000..474c6dca9e30 --- /dev/null +++ b/tests/pos/i13998.scala @@ -0,0 +1,10 @@ +case class Box[V](value: V) +object Box: + def apply[A](a: A): Box[A] = new Box[A](a) + def unapply[U](b: Box[U]): Box[U] = b + +class Test: + def value: Box[_ <: String] = Box("text") + + def test: String = value match + case Box(text) => text: String From b0e0385b071513a330bba16e0fb77dc38cfddbf3 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 24 Jan 2022 13:57:18 +0100 Subject: [PATCH 1046/1244] Fix test output The warning was removed in #12261 Fixes #14332 --- compiler/test-resources/repl/i13208.scala | 5 ----- 1 file changed, 5 deletions(-) diff --git a/compiler/test-resources/repl/i13208.scala b/compiler/test-resources/repl/i13208.scala index 6401d23bcfe4..ce4fcf0d9ed8 100644 --- a/compiler/test-resources/repl/i13208.scala +++ b/compiler/test-resources/repl/i13208.scala @@ -1,10 +1,5 @@ // scalac: -source:future -deprecation scala> type M[X] = X match { case Int => String case _ => Int } -1 warning found --- Deprecation Warning: -------------------------------------------------------- -1 | type M[X] = X match { case Int => String case _ => Int } - | ^ - | `_` is deprecated for wildcard arguments of types: use `?` instead scala> type N[X] = X match { case List[_] => Int } 1 warning found -- Deprecation Warning: -------------------------------------------------------- From 0f5ca2edc8325c2713ff682148c8fc701096f685 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sun, 5 Dec 2021 14:20:18 +0100 Subject: [PATCH 1047/1244] Don't retypecheck erroneous arguments when fixing function Don't retypecheck erroneous arguments when trying conversions or extensions on the function part. Generally, we should avoid typechecking untyped trees several times, this can quickly explode exponentially. Fixes #12941 --- .../dotty/tools/dotc/typer/Applications.scala | 3 +- .../dotty/tools/dotc/typer/ProtoTypes.scala | 13 +++++++-- .../deprecation/t3235-minimal-v2.check | 8 ++++++ .../deprecation/t3235-minimal-v2.scala | 6 ++++ .../deprecation/t3235-minimal-v3.scala | 5 ++++ .../deprecation/t3235-minimal.check | 4 +++ .../deprecation/t3235-minimal.scala | 3 -- tests/neg/i12941.scala | 28 +++++++++++++++++++ tests/neg/i903.check | 7 +++++ tests/neg/i903.scala | 4 +++ tests/neg/zipped.check | 11 ++++++++ tests/neg/zipped.scala | 10 +++++++ tests/pos/i903.scala | 8 ------ tests/pos/zipped.scala | 8 +++--- 14 files changed, 100 insertions(+), 18 deletions(-) create mode 100644 tests/neg-custom-args/deprecation/t3235-minimal-v2.check create mode 100644 tests/neg-custom-args/deprecation/t3235-minimal-v2.scala create mode 100644 tests/neg-custom-args/deprecation/t3235-minimal-v3.scala create mode 100644 tests/neg-custom-args/deprecation/t3235-minimal.check create mode 100644 tests/neg/i12941.scala create mode 100644 tests/neg/i903.check create mode 100644 tests/neg/i903.scala create mode 100644 tests/neg/zipped.check create mode 100644 tests/neg/zipped.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala index d8e9c413decb..180ff505e76c 100644 --- a/compiler/src/dotty/tools/dotc/typer/Applications.scala +++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala @@ -908,8 +908,9 @@ trait Applications extends Compatibility { * part. Return an optional value to indicate success. */ def tryWithImplicitOnQualifier(fun1: Tree, proto: FunProto)(using Context): Option[Tree] = - if (ctx.mode.is(Mode.SynthesizeExtMethodReceiver)) + if ctx.mode.is(Mode.SynthesizeExtMethodReceiver) || proto.hasErrorArg then // Suppress insertion of apply or implicit conversion on extension method receiver + // or if argument is erroneous by itself. None else tryInsertImplicitOnQualifier(fun1, proto, ctx.typerState.ownedVars) flatMap { fun2 => diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala index 76fcb77d8c30..d0fd943d918b 100644 --- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -8,7 +8,7 @@ import Contexts._, Types._, Denotations._, Names._, StdNames._, NameOps._, Symbo import NameKinds.DepParamName import Trees._ import Constants._ -import util.{Stats, SimpleIdentityMap} +import util.{Stats, SimpleIdentityMap, SimpleIdentitySet} import Decorators._ import Uniques._ import config.Printers.typr @@ -282,6 +282,9 @@ object ProtoTypes { /** A map in which typed arguments can be stored to be later integrated in `typedArgs`. */ var typedArg: SimpleIdentityMap[untpd.Tree, Tree] = SimpleIdentityMap.empty + /** The argument that produced errors during typing */ + var errorArgs: SimpleIdentitySet[untpd.Tree] = SimpleIdentitySet.empty + /** The tupled or untupled version of this prototype, if it has been computed */ var tupledDual: Type = NoType @@ -341,6 +344,9 @@ object ProtoTypes { case _ => false } + /** Did an argument produce an error when typing? */ + def hasErrorArg = !state.errorArgs.isEmpty + private def cacheTypedArg(arg: untpd.Tree, typerFn: untpd.Tree => Tree, force: Boolean)(using Context): Tree = { var targ = state.typedArg(arg) if (targ == null) @@ -357,8 +363,11 @@ object ProtoTypes { targ = arg.withType(WildcardType) case _ => targ = typerFn(arg) - if (!ctx.reporter.hasUnreportedErrors) + if ctx.reporter.hasUnreportedErrors then + state.errorArgs += arg + else state.typedArg = state.typedArg.updated(arg, targ) + state.errorArgs -= arg } targ } diff --git a/tests/neg-custom-args/deprecation/t3235-minimal-v2.check b/tests/neg-custom-args/deprecation/t3235-minimal-v2.check new file mode 100644 index 000000000000..87a85f661f58 --- /dev/null +++ b/tests/neg-custom-args/deprecation/t3235-minimal-v2.check @@ -0,0 +1,8 @@ +-- Error: tests/neg-custom-args/deprecation/t3235-minimal-v2.scala:3:16 ------------------------------------------------ +3 | assert(math.round(123456789) == 123456789) // error + | ^^^^^^^^^^ + |method round in package scala.math is deprecated since 2.11.0: This is an integer type; there is no reason to round it. Perhaps you meant to call this with a floating-point value? +-- Error: tests/neg-custom-args/deprecation/t3235-minimal-v2.scala:4:16 ------------------------------------------------ +4 | assert(math.round(1234567890123456789L) == 1234567890123456789L) // error + | ^^^^^^^^^^ + |method round in package scala.math is deprecated since 2.11.0: This is an integer type; there is no reason to round it. Perhaps you meant to call this with a floating-point value? diff --git a/tests/neg-custom-args/deprecation/t3235-minimal-v2.scala b/tests/neg-custom-args/deprecation/t3235-minimal-v2.scala new file mode 100644 index 000000000000..c56062076ee9 --- /dev/null +++ b/tests/neg-custom-args/deprecation/t3235-minimal-v2.scala @@ -0,0 +1,6 @@ +object Test { + def main(args: Array[String]): Unit = { + assert(math.round(123456789) == 123456789) // error + assert(math.round(1234567890123456789L) == 1234567890123456789L) // error + } +} diff --git a/tests/neg-custom-args/deprecation/t3235-minimal-v3.scala b/tests/neg-custom-args/deprecation/t3235-minimal-v3.scala new file mode 100644 index 000000000000..6af327811b5f --- /dev/null +++ b/tests/neg-custom-args/deprecation/t3235-minimal-v3.scala @@ -0,0 +1,5 @@ +object Test { + def main(args: Array[String]): Unit = { + assert(1234567890123456789L.round == 1234567890123456789L) // error + } +} diff --git a/tests/neg-custom-args/deprecation/t3235-minimal.check b/tests/neg-custom-args/deprecation/t3235-minimal.check new file mode 100644 index 000000000000..2a4dc60b898c --- /dev/null +++ b/tests/neg-custom-args/deprecation/t3235-minimal.check @@ -0,0 +1,4 @@ +-- Error: tests/neg-custom-args/deprecation/t3235-minimal.scala:3:21 --------------------------------------------------- +3 | assert(123456789.round == 123456789) // error + | ^^^^^^^^^^^^^^^ + |method round in class RichInt is deprecated since 2.11.0: this is an integer type; there is no reason to round it. Perhaps you meant to call this on a floating-point value? diff --git a/tests/neg-custom-args/deprecation/t3235-minimal.scala b/tests/neg-custom-args/deprecation/t3235-minimal.scala index 3aef0eea2dae..c09c56a329ca 100644 --- a/tests/neg-custom-args/deprecation/t3235-minimal.scala +++ b/tests/neg-custom-args/deprecation/t3235-minimal.scala @@ -1,8 +1,5 @@ object Test { def main(args: Array[String]): Unit = { assert(123456789.round == 123456789) // error - assert(math.round(123456789) == 123456789) // error - assert(1234567890123456789L.round == 1234567890123456789L) // error - assert(math.round(1234567890123456789L) == 1234567890123456789L) // error } } diff --git a/tests/neg/i12941.scala b/tests/neg/i12941.scala new file mode 100644 index 000000000000..0948cf7ce545 --- /dev/null +++ b/tests/neg/i12941.scala @@ -0,0 +1,28 @@ +object A: + def myFun(op: String ?=> Unit) = () + +@main def func: Unit = + A.myFun { + val res: String = summon[String] + println(ress) // error + } + +class I: + def runSth: Int = 1 + +abstract class A: + def myFun(op: I ?=> Unit) = + op(using I()) + 1 + +class B extends A + +def assertEquals(x: String, y: Int, z: Int): Unit = () + +@main def hello: Unit = + + B().myFun { + val res = summon[I].runSth + assertEquals("", 1, res, "asd") // error + println("Hello!") + } \ No newline at end of file diff --git a/tests/neg/i903.check b/tests/neg/i903.check new file mode 100644 index 000000000000..7e3b188dff85 --- /dev/null +++ b/tests/neg/i903.check @@ -0,0 +1,7 @@ +-- [E007] Type Mismatch Error: tests/neg/i903.scala:3:16 --------------------------------------------------------------- +3 | "".contains("", (_: Int)) // error + | ^^^^^^^^^^^^ + | Found: (String, Int) + | Required: CharSequence + +longer explanation available when compiling with `-explain` diff --git a/tests/neg/i903.scala b/tests/neg/i903.scala new file mode 100644 index 000000000000..03503ead463b --- /dev/null +++ b/tests/neg/i903.scala @@ -0,0 +1,4 @@ +object Test { + def test2 = + "".contains("", (_: Int)) // error +} diff --git a/tests/neg/zipped.check b/tests/neg/zipped.check new file mode 100644 index 000000000000..582d121cd9c3 --- /dev/null +++ b/tests/neg/zipped.check @@ -0,0 +1,11 @@ +-- [E007] Type Mismatch Error: tests/neg/zipped.scala:6:10 ------------------------------------------------------------- +6 | .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z }) // error + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | Found: ((Int, Int, Int)) => Int + | Required: (Int, Int, Int) => Int + +longer explanation available when compiling with `-explain` +-- [E086] Syntax Error: tests/neg/zipped.scala:9:12 -------------------------------------------------------------------- +9 | .map( x => x match { case (x, y, z) => x + y + z }) // error + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | Wrong number of parameters, expected: 3 diff --git a/tests/neg/zipped.scala b/tests/neg/zipped.scala new file mode 100644 index 000000000000..a3b3d3ddac05 --- /dev/null +++ b/tests/neg/zipped.scala @@ -0,0 +1,10 @@ +object Test { + val xs: List[Int] = ??? + + // Does not work anynore since auto(un)tupling does not work after conversions + xs.lazyZip(xs).lazyZip(xs) + .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z }) // error + + xs.lazyZip(xs).lazyZip(xs) + .map( x => x match { case (x, y, z) => x + y + z }) // error +} \ No newline at end of file diff --git a/tests/pos/i903.scala b/tests/pos/i903.scala index 5afb6e53010c..dec98dbf2705 100644 --- a/tests/pos/i903.scala +++ b/tests/pos/i903.scala @@ -15,12 +15,4 @@ object Test { // f.apply(0) // ^ } - - def test2 = { - val f = "".contains("", (_: Int)) // dotc: - f.apply(0) - // sandbox/eta.scala:18: error: apply is not a member of Boolean(f) - // f.apply(0) - // ^ - } } diff --git a/tests/pos/zipped.scala b/tests/pos/zipped.scala index 2453b880cbc3..0d394bb953a5 100644 --- a/tests/pos/zipped.scala +++ b/tests/pos/zipped.scala @@ -23,12 +23,12 @@ object Test { .map( (x: Int, y: Int, z: Int) => x + y + z ) // OK // 4. The single parameter map works through an inserted conversion - xs.lazyZip(xs).lazyZip(xs) - .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z }) // now also OK + //xs.lazyZip(xs).lazyZip(xs) + // .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z }) // now also OK // 5. If we leave out the parameter type, it now works as well. - xs.lazyZip(xs).lazyZip(xs) - .map( x => x match { case (x, y, z) => x + y + z }) // now also OK + //xs.lazyZip(xs).lazyZip(xs) + // .map( x => x match { case (x, y, z) => x + y + z }) // now also OK // This means that the following works in Dotty 3.0 as well as 3.x for ((x, y, z) <- xs.lazyZip(xs).lazyZip(xs)) yield x + y + z From 85852131c37bb620f2a1dc6b7f20410a17e7e4b5 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sun, 5 Dec 2021 16:16:40 +0100 Subject: [PATCH 1048/1244] Refine condition when to not typecheck again Only count errors that lead to an error type in some subtree as unrecoverable. --- compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala | 7 +++++-- .../deprecation/t3235-minimal-v2.check | 8 -------- .../deprecation/t3235-minimal-v2.scala | 6 ------ .../deprecation/t3235-minimal-v3.scala | 5 ----- .../neg-custom-args/deprecation/t3235-minimal.check | 12 ++++++++++++ .../neg-custom-args/deprecation/t3235-minimal.scala | 3 +++ 6 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 tests/neg-custom-args/deprecation/t3235-minimal-v2.check delete mode 100644 tests/neg-custom-args/deprecation/t3235-minimal-v2.scala delete mode 100644 tests/neg-custom-args/deprecation/t3235-minimal-v3.scala diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala index d0fd943d918b..2d9258f000af 100644 --- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -344,7 +344,10 @@ object ProtoTypes { case _ => false } - /** Did an argument produce an error when typing? */ + /** Did an argument produce an error when typing? This means: an error was reported + * and a tree got an error type. Errors of adaptation whree a tree has a good type + * but that type does not conform to the expected type are not counted. + */ def hasErrorArg = !state.errorArgs.isEmpty private def cacheTypedArg(arg: untpd.Tree, typerFn: untpd.Tree => Tree, force: Boolean)(using Context): Tree = { @@ -363,7 +366,7 @@ object ProtoTypes { targ = arg.withType(WildcardType) case _ => targ = typerFn(arg) - if ctx.reporter.hasUnreportedErrors then + if ctx.reporter.hasUnreportedErrors && targ.existsSubTree(_.tpe.isError) then state.errorArgs += arg else state.typedArg = state.typedArg.updated(arg, targ) diff --git a/tests/neg-custom-args/deprecation/t3235-minimal-v2.check b/tests/neg-custom-args/deprecation/t3235-minimal-v2.check deleted file mode 100644 index 87a85f661f58..000000000000 --- a/tests/neg-custom-args/deprecation/t3235-minimal-v2.check +++ /dev/null @@ -1,8 +0,0 @@ --- Error: tests/neg-custom-args/deprecation/t3235-minimal-v2.scala:3:16 ------------------------------------------------ -3 | assert(math.round(123456789) == 123456789) // error - | ^^^^^^^^^^ - |method round in package scala.math is deprecated since 2.11.0: This is an integer type; there is no reason to round it. Perhaps you meant to call this with a floating-point value? --- Error: tests/neg-custom-args/deprecation/t3235-minimal-v2.scala:4:16 ------------------------------------------------ -4 | assert(math.round(1234567890123456789L) == 1234567890123456789L) // error - | ^^^^^^^^^^ - |method round in package scala.math is deprecated since 2.11.0: This is an integer type; there is no reason to round it. Perhaps you meant to call this with a floating-point value? diff --git a/tests/neg-custom-args/deprecation/t3235-minimal-v2.scala b/tests/neg-custom-args/deprecation/t3235-minimal-v2.scala deleted file mode 100644 index c56062076ee9..000000000000 --- a/tests/neg-custom-args/deprecation/t3235-minimal-v2.scala +++ /dev/null @@ -1,6 +0,0 @@ -object Test { - def main(args: Array[String]): Unit = { - assert(math.round(123456789) == 123456789) // error - assert(math.round(1234567890123456789L) == 1234567890123456789L) // error - } -} diff --git a/tests/neg-custom-args/deprecation/t3235-minimal-v3.scala b/tests/neg-custom-args/deprecation/t3235-minimal-v3.scala deleted file mode 100644 index 6af327811b5f..000000000000 --- a/tests/neg-custom-args/deprecation/t3235-minimal-v3.scala +++ /dev/null @@ -1,5 +0,0 @@ -object Test { - def main(args: Array[String]): Unit = { - assert(1234567890123456789L.round == 1234567890123456789L) // error - } -} diff --git a/tests/neg-custom-args/deprecation/t3235-minimal.check b/tests/neg-custom-args/deprecation/t3235-minimal.check index 2a4dc60b898c..665caab69d8d 100644 --- a/tests/neg-custom-args/deprecation/t3235-minimal.check +++ b/tests/neg-custom-args/deprecation/t3235-minimal.check @@ -2,3 +2,15 @@ 3 | assert(123456789.round == 123456789) // error | ^^^^^^^^^^^^^^^ |method round in class RichInt is deprecated since 2.11.0: this is an integer type; there is no reason to round it. Perhaps you meant to call this on a floating-point value? +-- Error: tests/neg-custom-args/deprecation/t3235-minimal.scala:4:16 --------------------------------------------------- +4 | assert(math.round(123456789) == 123456789) // error + | ^^^^^^^^^^ + |method round in package scala.math is deprecated since 2.11.0: This is an integer type; there is no reason to round it. Perhaps you meant to call this with a floating-point value? +-- Error: tests/neg-custom-args/deprecation/t3235-minimal.scala:5:32 --------------------------------------------------- +5 | assert(1234567890123456789L.round == 1234567890123456789L) // error + | ^^^^^^^^^^^^^^^^^^^^^^^^^^ + |method round in class RichLong is deprecated since 2.11.0: this is an integer type; there is no reason to round it. Perhaps you meant to call this on a floating-point value? +-- Error: tests/neg-custom-args/deprecation/t3235-minimal.scala:6:16 --------------------------------------------------- +6 | assert(math.round(1234567890123456789L) == 1234567890123456789L) // error + | ^^^^^^^^^^ + |method round in package scala.math is deprecated since 2.11.0: This is an integer type; there is no reason to round it. Perhaps you meant to call this with a floating-point value? diff --git a/tests/neg-custom-args/deprecation/t3235-minimal.scala b/tests/neg-custom-args/deprecation/t3235-minimal.scala index c09c56a329ca..3aef0eea2dae 100644 --- a/tests/neg-custom-args/deprecation/t3235-minimal.scala +++ b/tests/neg-custom-args/deprecation/t3235-minimal.scala @@ -1,5 +1,8 @@ object Test { def main(args: Array[String]): Unit = { assert(123456789.round == 123456789) // error + assert(math.round(123456789) == 123456789) // error + assert(1234567890123456789L.round == 1234567890123456789L) // error + assert(math.round(1234567890123456789L) == 1234567890123456789L) // error } } From b224c4bf2c9fcff43591005fa09a49fd257e291c Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 6 Dec 2021 11:48:08 +0100 Subject: [PATCH 1049/1244] Further refine condition when not to typecheck again This should fix the failures in spire and specs2. --- .../dotty/tools/dotc/typer/ProtoTypes.scala | 23 +++++++++++++++++-- tests/pos/specs2-failure.scala | 20 ++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 tests/pos/specs2-failure.scala diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala index 2d9258f000af..1b0beae329c9 100644 --- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -350,6 +350,24 @@ object ProtoTypes { */ def hasErrorArg = !state.errorArgs.isEmpty + /** Does tree have embedded error trees that are not at the outside. + * A nested tree t1 is "at the outside" relative to a tree t2 if + * - t1 and t2 have the same span, or + * - t2 is a ascription (t22: T) and t1 is at the outside of t22 + * - t2 is a closure (...) => t22 and t1 is at the outside of t22 + */ + def hasInnerErrors(t: Tree): Boolean = t match + case Typed(expr, tpe) => hasInnerErrors(expr) + case closureDef(mdef) => hasInnerErrors(mdef.rhs) + case _ => + t.existsSubTree { t1 => + if t1.tpe.isError && t1.span.toSynthetic != t.span.toSynthetic then + typr.println(i"error subtree $t1 of $t with ${t1.tpe}, spans = ${t1.span}, ${t.span}") + true + else + false + } + private def cacheTypedArg(arg: untpd.Tree, typerFn: untpd.Tree => Tree, force: Boolean)(using Context): Tree = { var targ = state.typedArg(arg) if (targ == null) @@ -366,8 +384,9 @@ object ProtoTypes { targ = arg.withType(WildcardType) case _ => targ = typerFn(arg) - if ctx.reporter.hasUnreportedErrors && targ.existsSubTree(_.tpe.isError) then - state.errorArgs += arg + if ctx.reporter.hasUnreportedErrors then + if hasInnerErrors(targ) then + state.errorArgs += arg else state.typedArg = state.typedArg.updated(arg, targ) state.errorArgs -= arg diff --git a/tests/pos/specs2-failure.scala b/tests/pos/specs2-failure.scala new file mode 100644 index 000000000000..c705c8e283ce --- /dev/null +++ b/tests/pos/specs2-failure.scala @@ -0,0 +1,20 @@ +import util.matching.Regex +import util.matching.Regex.Match + +// Demonstrate what used to be a failure in specs2, before we refined +// the scheme when not to typecheck a function argument again. +object Test: + + extension (s: String) + + def replaceAll(pairs: (String, String)*): String = + pairs.foldLeft(s) { (res, cur) => + res.replaceAll(cur._1, cur._2) + } + + def replaceAll(exp: String, f: String => String): String = + new Regex(exp).replaceAllIn(s, (m: Match) => f(m.group(0).replace("\\", "\\\\"))) + + def replaceInsideTag(tag: String, p: (String, String)*): String = + s.replaceAll(tag, (s: String) => java.util.regex.Matcher.quoteReplacement(s.replaceAll(p*))) + From 991767213201f56fef929a453fddac83cd7d8227 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 6 Dec 2021 12:37:47 +0100 Subject: [PATCH 1050/1244] Disable protoquill Protquill had to be disabled since it exhibited deeply nested errors in a function argument that went away once an enclosing function was changed with a conversion or extension, and the full argument was completely typechecked. Retype checking large bodies of code like this was never inteneded and counts as a bug in the compiler. Unfortunately, this means that some type annotations will have to be added to protoquill to make it compiler again. --- .../test/scala/dotty/communitybuild/CommunityBuildTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index f3f0bf90188e..45b6b01cb0ff 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -75,7 +75,7 @@ class CommunityBuildTestC: // @Test def oslibWatch = projects.oslibWatch.run() @Test def playJson = projects.playJson.run() @Test def pprint = projects.pprint.run() - @Test def protoquill = projects.protoquill.run() + // @Test def protoquill = projects.protoquill.run() // needs to fix new type inference errors @Test def requests = projects.requests.run() @Test def scalacheck = projects.scalacheck.run() @Test def scalaCollectionCompat = projects.scalaCollectionCompat.run() From 88137559e0869caed63a7657d9fd12e3edfc0463 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 6 Dec 2021 14:47:53 +0100 Subject: [PATCH 1051/1244] Harden `hasInnerErrors` and fix tests --- compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala | 4 ++-- tests/neg/i903.check | 7 ------- tests/neg/i903.scala | 4 ---- tests/neg/zipped.check | 11 ----------- tests/neg/zipped.scala | 3 +-- tests/pos/i903.scala | 8 ++++++++ tests/pos/zipped.scala | 7 ++++--- 7 files changed, 15 insertions(+), 29 deletions(-) delete mode 100644 tests/neg/i903.check delete mode 100644 tests/neg/i903.scala delete mode 100644 tests/neg/zipped.check diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala index 1b0beae329c9..fcbcf179d97e 100644 --- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -361,8 +361,8 @@ object ProtoTypes { case closureDef(mdef) => hasInnerErrors(mdef.rhs) case _ => t.existsSubTree { t1 => - if t1.tpe.isError && t1.span.toSynthetic != t.span.toSynthetic then - typr.println(i"error subtree $t1 of $t with ${t1.tpe}, spans = ${t1.span}, ${t.span}") + if t1.typeOpt.isError && t1.span.toSynthetic != t.span.toSynthetic then + typr.println(i"error subtree $t1 of $t with ${t1.typeOpt}, spans = ${t1.span}, ${t.span}") true else false diff --git a/tests/neg/i903.check b/tests/neg/i903.check deleted file mode 100644 index 7e3b188dff85..000000000000 --- a/tests/neg/i903.check +++ /dev/null @@ -1,7 +0,0 @@ --- [E007] Type Mismatch Error: tests/neg/i903.scala:3:16 --------------------------------------------------------------- -3 | "".contains("", (_: Int)) // error - | ^^^^^^^^^^^^ - | Found: (String, Int) - | Required: CharSequence - -longer explanation available when compiling with `-explain` diff --git a/tests/neg/i903.scala b/tests/neg/i903.scala deleted file mode 100644 index 03503ead463b..000000000000 --- a/tests/neg/i903.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test { - def test2 = - "".contains("", (_: Int)) // error -} diff --git a/tests/neg/zipped.check b/tests/neg/zipped.check deleted file mode 100644 index 582d121cd9c3..000000000000 --- a/tests/neg/zipped.check +++ /dev/null @@ -1,11 +0,0 @@ --- [E007] Type Mismatch Error: tests/neg/zipped.scala:6:10 ------------------------------------------------------------- -6 | .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z }) // error - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | Found: ((Int, Int, Int)) => Int - | Required: (Int, Int, Int) => Int - -longer explanation available when compiling with `-explain` --- [E086] Syntax Error: tests/neg/zipped.scala:9:12 -------------------------------------------------------------------- -9 | .map( x => x match { case (x, y, z) => x + y + z }) // error - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | Wrong number of parameters, expected: 3 diff --git a/tests/neg/zipped.scala b/tests/neg/zipped.scala index a3b3d3ddac05..7f8909b605f3 100644 --- a/tests/neg/zipped.scala +++ b/tests/neg/zipped.scala @@ -1,9 +1,8 @@ object Test { val xs: List[Int] = ??? - // Does not work anynore since auto(un)tupling does not work after conversions xs.lazyZip(xs).lazyZip(xs) - .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z }) // error + .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z }) // ok xs.lazyZip(xs).lazyZip(xs) .map( x => x match { case (x, y, z) => x + y + z }) // error diff --git a/tests/pos/i903.scala b/tests/pos/i903.scala index dec98dbf2705..5afb6e53010c 100644 --- a/tests/pos/i903.scala +++ b/tests/pos/i903.scala @@ -15,4 +15,12 @@ object Test { // f.apply(0) // ^ } + + def test2 = { + val f = "".contains("", (_: Int)) // dotc: + f.apply(0) + // sandbox/eta.scala:18: error: apply is not a member of Boolean(f) + // f.apply(0) + // ^ + } } diff --git a/tests/pos/zipped.scala b/tests/pos/zipped.scala index 0d394bb953a5..a23fd62acbb0 100644 --- a/tests/pos/zipped.scala +++ b/tests/pos/zipped.scala @@ -23,10 +23,11 @@ object Test { .map( (x: Int, y: Int, z: Int) => x + y + z ) // OK // 4. The single parameter map works through an inserted conversion - //xs.lazyZip(xs).lazyZip(xs) - // .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z }) // now also OK + xs.lazyZip(xs).lazyZip(xs) + .map( (x: (Int, Int, Int)) => x match { case (x, y, z) => x + y + z }) // now also OK - // 5. If we leave out the parameter type, it now works as well. + // 5. But if that pone is deeper nested, it does not work since we don't retypecheck + // arguments deeply. //xs.lazyZip(xs).lazyZip(xs) // .map( x => x match { case (x, y, z) => x + y + z }) // now also OK From 13e4d05ec52463219ae0f5eb78c61ebe50e0e1ce Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sun, 23 Jan 2022 18:21:32 +0100 Subject: [PATCH 1052/1244] Revert "Disable protoquill" This reverts commit ea8d8b66fa39a9eef3f728298525eb22e899c1fd. --- .../test/scala/dotty/communitybuild/CommunityBuildTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 45b6b01cb0ff..f3f0bf90188e 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -75,7 +75,7 @@ class CommunityBuildTestC: // @Test def oslibWatch = projects.oslibWatch.run() @Test def playJson = projects.playJson.run() @Test def pprint = projects.pprint.run() - // @Test def protoquill = projects.protoquill.run() // needs to fix new type inference errors + @Test def protoquill = projects.protoquill.run() @Test def requests = projects.requests.run() @Test def scalacheck = projects.scalacheck.run() @Test def scalaCollectionCompat = projects.scalaCollectionCompat.run() From 71ea89fefdf54e927a85cdcd60fef12e1e94d99d Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 24 Jan 2022 11:24:17 +0100 Subject: [PATCH 1053/1244] Fix protoquill Cherry-pick changes from https://github.com/zio/zio-protoquill/commit/5ed25aac9440eb0fcca5d9cd828dc85728fee422 also present in https://github.com/zio/zio-quill/pull/2379. --- community-build/community-projects/protoquill | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/protoquill b/community-build/community-projects/protoquill index 41532f2b193e..5ed25aac9440 160000 --- a/community-build/community-projects/protoquill +++ b/community-build/community-projects/protoquill @@ -1 +1 @@ -Subproject commit 41532f2b193e00aec49dd2fa46247d6cb0a6b64d +Subproject commit 5ed25aac9440eb0fcca5d9cd828dc85728fee422 From 6855da3983cb78192cc2a61fb3ee268b62eff24d Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Mon, 17 Jan 2022 07:13:50 +0100 Subject: [PATCH 1054/1244] Treat synthetic apply of case class as new expression --- .../tools/dotc/transform/init/Semantic.scala | 22 +++++++-- .../other-new-features/safe-initialization.md | 8 ---- tests/init/neg/apply.scala | 47 +++++++++++++++++++ 3 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 tests/init/neg/apply.scala diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala index 88794c609805..053cd4e119d1 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala @@ -590,11 +590,20 @@ object Semantic { def call(meth: Symbol, args: List[ArgInfo], superType: Type, source: Tree, needResolve: Boolean = true): Contextual[Result] = log("call " + meth.show + ", args = " + args, printer, (_: Result).show) { def checkArgs = args.flatMap(_.promote) + def isSyntheticApply(meth: Symbol) = + meth.is(Flags.Synthetic) + && meth.owner.is(Flags.Module) + && meth.owner.companionClass.is(Flags.Case) + // fast track if the current object is already initialized if promoted.isCurrentObjectPromoted then Result(Hot, Nil) else value match { case Hot => - Result(Hot, checkArgs) + if isSyntheticApply(meth) then + val klass = meth.owner.companionClass.asClass + instantiate(klass, klass.primaryConstructor, args, source) + else + Result(Hot, checkArgs) case Cold => val error = CallCold(meth, source, trace.toVector) @@ -616,11 +625,14 @@ object Semantic { given Trace = trace1 val cls = target.owner.enclosingClass.asClass val ddef = target.defTree.asInstanceOf[DefDef] - val env2 = Env(ddef, args.map(_.value).widenArgs) // normal method call - withEnv(if isLocal then env else Env.empty) { - eval(ddef.rhs, ref, cls, cacheResult = true) ++ checkArgs - } + if isSyntheticApply(meth) then + val klass = meth.owner.companionClass.asClass + instantiate(klass, klass.primaryConstructor, args, source) + else + withEnv(if isLocal then env else Env.empty) { + eval(ddef.rhs, ref, cls, cacheResult = true) ++ checkArgs + } else if ref.canIgnoreMethodCall(target) then Result(Hot, Nil) else diff --git a/docs/docs/reference/other-new-features/safe-initialization.md b/docs/docs/reference/other-new-features/safe-initialization.md index e56c640dd26b..57c962c9f5e8 100644 --- a/docs/docs/reference/other-new-features/safe-initialization.md +++ b/docs/docs/reference/other-new-features/safe-initialization.md @@ -194,14 +194,6 @@ With the established principles and design goals, following rules are imposed: non-initialized object is not used, i.e. calling methods or accessing fields on the escaped object is not allowed. -3. Local definitions may only refer to transitively initialized objects. - - It means that in a local definition `val x: T = e`, the expression `e` may - only evaluate to transitively initialized objects. The same goes for local - lazy variables and methods. This rule is again motivated for simplicity in - reasoning about initialization: programmers may safely assume that all local - definitions only point to transitively initialized objects. - ## Modularity The analysis takes the primary constructor of concrete classes as entry points. diff --git a/tests/init/neg/apply.scala b/tests/init/neg/apply.scala new file mode 100644 index 000000000000..2847115cc73c --- /dev/null +++ b/tests/init/neg/apply.scala @@ -0,0 +1,47 @@ +case class A(b: B) + +object A: + def foo(b: B) = new A(b) + inline def bar(b: B) = new A(b) + +class B: + val a = A(this) + val a2 = A.foo(this) // error + val a3 = A.bar(this) + +// test receiver is ThisRef + +object O: + case class A(b: B) + + object A: + def foo(b: B) = new A(b) + inline def bar(b: B) = new A(b) + + class B: + val a = A(this) + val a2 = A.foo(this) // error + val a3 = A.bar(this) + + val b = new B +end O + + +// test receiver is Warm + +class M(n: N): + case class A(b: B) + + object A: + def foo(b: B) = new A(b) + inline def bar(b: B) = new A(b) + + class B: + val a = A(this) + val a2 = A.foo(this) // error + val a3 = A.bar(this) +end M + +class N: + val m = new M(this) + val b = new m.B From 9bc38a8655dab783694472e3818aebe50ef5667a Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Mon, 17 Jan 2022 07:41:33 +0100 Subject: [PATCH 1055/1244] Fix outer selection --- compiler/src/dotty/tools/dotc/transform/init/Semantic.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala index 053cd4e119d1..234cb02a21d8 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala @@ -1321,9 +1321,10 @@ object Semantic { */ def resolveOuterSelect(target: ClassSymbol, thisV: Value, hops: Int, source: Tree): Contextual[Value] = log("resolving outer " + target.show + ", this = " + thisV.show + ", hops = " + hops, printer, (_: Value).show) { // Is `target` reachable from `cls` with the given `hops`? - def reachable(cls: ClassSymbol, hops: Int): Boolean = + def reachable(cls: ClassSymbol, hops: Int): Boolean = log("reachable from " + cls + " -> " + target + " in " + hops, printer) { if hops == 0 then cls == target - else reachable(cls.lexicallyEnclosingClass.asClass, hops - 1) + else reachable(cls.owner.lexicallyEnclosingClass.asClass, hops - 1) + } thisV match case Hot => Hot From 23cb95009c546d716d79abfd9b720a334e95b2a0 Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Mon, 17 Jan 2022 07:46:00 +0100 Subject: [PATCH 1056/1244] Fix test: synthetic apply is now transparent --- tests/init/neg/cycle-structure.check | 22 ++++++++++++++-------- tests/init/neg/cycle-structure.scala | 8 ++++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/tests/init/neg/cycle-structure.check b/tests/init/neg/cycle-structure.check index b370b16f4279..79e38ee80bb4 100644 --- a/tests/init/neg/cycle-structure.check +++ b/tests/init/neg/cycle-structure.check @@ -1,8 +1,14 @@ --- Error: tests/init/neg/cycle-structure.scala:9:14 -------------------------------------------------------------------- -9 | val x = A(this) // error - | ^^^^ - | Cannot prove that the value is fully initialized. May only use initialized value as arguments. --- Error: tests/init/neg/cycle-structure.scala:3:14 -------------------------------------------------------------------- -3 | val x = B(this) // error - | ^^^^ - | Cannot prove that the value is fully initialized. May only use initialized value as arguments. +-- Error: tests/init/neg/cycle-structure.scala:2:15 -------------------------------------------------------------------- +2 | val x1 = b.x // error + | ^^^ + | Access field A.this.b.x on a value with an unknown initialization status. Calling trace: + | -> val x = A(this) [ cycle-structure.scala:9 ] + | -> case class A(b: B) { [ cycle-structure.scala:1 ] +-- Error: tests/init/neg/cycle-structure.scala:8:15 -------------------------------------------------------------------- +8 | val x1 = a.x // error + | ^^^ + | Access field B.this.a.x on a value with an unknown initialization status. Calling trace: + | -> val x = A(this) [ cycle-structure.scala:9 ] + | -> case class A(b: B) { [ cycle-structure.scala:1 ] + | -> val x = B(this) [ cycle-structure.scala:3 ] + | -> case class B(a: A) { [ cycle-structure.scala:7 ] diff --git a/tests/init/neg/cycle-structure.scala b/tests/init/neg/cycle-structure.scala index acf889a33c1d..937df774ee14 100644 --- a/tests/init/neg/cycle-structure.scala +++ b/tests/init/neg/cycle-structure.scala @@ -1,11 +1,11 @@ case class A(b: B) { - val x1 = b.x - val x = B(this) // error + val x1 = b.x // error + val x = B(this) val y = x.a } case class B(a: A) { - val x1 = a.x - val x = A(this) // error + val x1 = a.x // error + val x = A(this) val h = x.b } From c94d2d636636c3cdcd43f359371564896b7a53f1 Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Mon, 17 Jan 2022 08:05:13 +0100 Subject: [PATCH 1057/1244] Lazily use synthetic apply Otherwise, as the test tests/init/pos/local-warm5.scala shows, we may reach an outer that is cold. --- compiler/src/dotty/tools/dotc/transform/init/Semantic.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala index 234cb02a21d8..5ff037272370 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala @@ -625,13 +625,14 @@ object Semantic { given Trace = trace1 val cls = target.owner.enclosingClass.asClass val ddef = target.defTree.asInstanceOf[DefDef] + val argErrors = checkArgs // normal method call - if isSyntheticApply(meth) then + if argErrors.nonEmpty && isSyntheticApply(meth) then val klass = meth.owner.companionClass.asClass instantiate(klass, klass.primaryConstructor, args, source) else withEnv(if isLocal then env else Env.empty) { - eval(ddef.rhs, ref, cls, cacheResult = true) ++ checkArgs + eval(ddef.rhs, ref, cls, cacheResult = true) ++ argErrors } else if ref.canIgnoreMethodCall(target) then Result(Hot, Nil) From c12044b6f34d94efd9227357d5bf328660bbfa07 Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Fri, 21 Jan 2022 21:22:27 +0100 Subject: [PATCH 1058/1244] Fix outer for calling instantiate --- .../src/dotty/tools/dotc/transform/init/Semantic.scala | 4 +++- tests/init/neg/apply2.scala | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 tests/init/neg/apply2.scala diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala index 5ff037272370..333b1ce2be3e 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala @@ -629,7 +629,9 @@ object Semantic { // normal method call if argErrors.nonEmpty && isSyntheticApply(meth) then val klass = meth.owner.companionClass.asClass - instantiate(klass, klass.primaryConstructor, args, source) + val outerCls = klass.owner.lexicallyEnclosingClass.asClass + val outer = resolveOuterSelect(outerCls, ref, 1, source) + Semantic.instantiate(outer)(klass, klass.primaryConstructor, args, source) else withEnv(if isLocal then env else Env.empty) { eval(ddef.rhs, ref, cls, cacheResult = true) ++ argErrors diff --git a/tests/init/neg/apply2.scala b/tests/init/neg/apply2.scala new file mode 100644 index 000000000000..6a42cc9a3acc --- /dev/null +++ b/tests/init/neg/apply2.scala @@ -0,0 +1,10 @@ +object O: + case class A(b: B): + println(n) + + class B: + val a = A(this) + + val b = new B + val n = 10 // error +end O From 3436ec70d2ede8d94941bc3f7fc95504584b20e7 Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Fri, 21 Jan 2022 21:42:14 +0100 Subject: [PATCH 1059/1244] Add assertion to make sure selection makes sense --- compiler/src/dotty/tools/dotc/transform/init/Semantic.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala index 333b1ce2be3e..d1e9404986a7 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala @@ -559,6 +559,7 @@ object Semantic { if obj.hasField(target) then Result(obj.field(target), Nil) else if ref.isInstanceOf[Warm] then + assert(obj.klass.isSubClass(target.owner)) if target.is(Flags.ParamAccessor) then // possible for trait parameters // see tests/init/neg/trait2.scala From 06d7e875f02a16e7ea97b88a5517454db010c86b Mon Sep 17 00:00:00 2001 From: Fengyun Liu Date: Mon, 24 Jan 2022 21:06:56 +0100 Subject: [PATCH 1060/1244] Use extension method syntax --- compiler/src/dotty/tools/dotc/transform/init/Semantic.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala index d1e9404986a7..fba7a6d531b1 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala @@ -632,7 +632,7 @@ object Semantic { val klass = meth.owner.companionClass.asClass val outerCls = klass.owner.lexicallyEnclosingClass.asClass val outer = resolveOuterSelect(outerCls, ref, 1, source) - Semantic.instantiate(outer)(klass, klass.primaryConstructor, args, source) + outer.instantiate(klass, klass.primaryConstructor, args, source) else withEnv(if isLocal then env else Env.empty) { eval(ddef.rhs, ref, cls, cacheResult = true) ++ argErrors From 0d347884949f982a78aa5906bf27b1ff1da9ffc1 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Tue, 18 Jan 2022 10:38:21 -0800 Subject: [PATCH 1061/1244] REPL class loader is context class loader --- compiler/src/dotty/tools/repl/ReplDriver.scala | 12 ++++++++---- .../dotty/tools/runner/ScalaClassLoader.scala | 17 +++++++++++------ .../dotty/tools/repl/ReplCompilerTests.scala | 4 ++++ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala index eda69b7c1ed7..5eef023c1fc2 100644 --- a/compiler/src/dotty/tools/repl/ReplDriver.scala +++ b/compiler/src/dotty/tools/repl/ReplDriver.scala @@ -29,6 +29,7 @@ import dotty.tools.dotc.util.{SourceFile, SourcePosition} import dotty.tools.dotc.{CompilationUnit, Driver} import dotty.tools.dotc.config.CompilerCommand import dotty.tools.io._ +import dotty.tools.runner.ScalaClassLoader.* import org.jline.reader._ import scala.annotation.tailrec @@ -62,7 +63,7 @@ case class State(objectIndex: Int, /** Main REPL instance, orchestrating input, compilation and presentation */ class ReplDriver(settings: Array[String], out: PrintStream = Console.out, - classLoader: Option[ClassLoader] = None) extends Driver { + classLoader: Option[ClassLoader] = None) extends Driver: /** Overridden to `false` in order to not have to give sources on the * commandline @@ -161,15 +162,17 @@ class ReplDriver(settings: Array[String], else loop(interpret(res)(state)) } - try withRedirectedOutput { loop(initialState) } + try runBody { loop(initialState) } finally terminal.close() } - final def run(input: String)(implicit state: State): State = withRedirectedOutput { + final def run(input: String)(implicit state: State): State = runBody { val parsed = ParseResult(input)(state) interpret(parsed) } + private def runBody(body: => State): State = rendering.classLoader()(using rootCtx).asContext(withRedirectedOutput(body)) + // TODO: i5069 final def bind(name: String, value: Any)(implicit state: State): State = state @@ -455,4 +458,5 @@ class ReplDriver(settings: Array[String], private def printDiagnostic(dia: Diagnostic)(implicit state: State) = dia.level match case interfaces.Diagnostic.INFO => out.println(dia.msg) // print REPL's special info diagnostics directly to out case _ => ReplConsoleReporter.doReport(dia)(using state.context) -} + +end ReplDriver diff --git a/compiler/src/dotty/tools/runner/ScalaClassLoader.scala b/compiler/src/dotty/tools/runner/ScalaClassLoader.scala index 5273a1b42752..af9e54f3506d 100644 --- a/compiler/src/dotty/tools/runner/ScalaClassLoader.scala +++ b/compiler/src/dotty/tools/runner/ScalaClassLoader.scala @@ -14,12 +14,8 @@ import scala.annotation.tailrec import scala.util.control.Exception.catching final class RichClassLoader(private val self: ClassLoader) extends AnyVal { - /** Executing an action with this classloader as context classloader */ - private def asContext[T](action: => T): T = { - val saved = Thread.currentThread.getContextClassLoader - try { ScalaClassLoader.setContext(self) ; action } - finally ScalaClassLoader.setContext(saved) - } + /** Execute an action with this classloader as context classloader. */ + private def asContext[T](action: => T): T = ScalaClassLoader.asContext(self)(action) /** Load and link a class with this classloader */ def tryToLoadClass[T <: AnyRef](path: String): Option[Class[T]] = tryClass(path, initialize = false) @@ -74,4 +70,13 @@ object ScalaClassLoader { MethodHandles.lookup().findStatic(classOf[ClassLoader], "getPlatformClassLoader", MethodType.methodType(classOf[ClassLoader])).invoke().asInstanceOf[ClassLoader] catch case _: Throwable => null else null + + extension (classLoader: ClassLoader) + /** Execute an action with this classloader as context classloader. */ + def asContext[T](action: => T): T = + val saved = Thread.currentThread.getContextClassLoader + try + setContext(classLoader) + action + finally setContext(saved) } diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala index 406826ad67b1..0539fcf13e32 100644 --- a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala +++ b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala @@ -241,6 +241,10 @@ class ReplCompilerTests extends ReplTest { ... 28 elided */ } + @Test def `i14281 context class loader must be REPL class loader` = fromInitialState { implicit state => + run("class C ; assert(classOf[C].getClassLoader eq Thread.currentThread.getContextClassLoader)") + assertEquals(List("// defined class C"), lines()) + } } object ReplCompilerTests { From 3aeeba3034841c75cb9803c5442c3623425c2595 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Tue, 18 Jan 2022 12:12:47 -0800 Subject: [PATCH 1062/1244] Prefer context functions for ReplTests --- compiler/test/dotty/tools/repl/DocTests.scala | 102 ++++++----------- .../dotty/tools/repl/JavaDefinedTests.scala | 4 +- .../test/dotty/tools/repl/LoadTests.scala | 6 +- .../dotty/tools/repl/ReplCompilerTests.scala | 105 ++++++++---------- compiler/test/dotty/tools/repl/ReplTest.scala | 8 +- .../dotty/tools/repl/TabcompleteTests.scala | 59 +++++----- .../test/dotty/tools/repl/TypeTests.scala | 11 +- 7 files changed, 122 insertions(+), 173 deletions(-) diff --git a/compiler/test/dotty/tools/repl/DocTests.scala b/compiler/test/dotty/tools/repl/DocTests.scala index 67f203c9b52b..ea900e866119 100644 --- a/compiler/test/dotty/tools/repl/DocTests.scala +++ b/compiler/test/dotty/tools/repl/DocTests.scala @@ -6,78 +6,44 @@ import org.junit.Assert.assertEquals class DocTests extends ReplTest { - @Test def docOfDef = - eval("/** doc */ def foo = 0").andThen { implicit s => - assertEquals("doc", doc("foo")) - } + @Test def docOfDef = eval("/** doc */ def foo = 0") andThen assertEquals("doc", doc("foo")) - @Test def docOfVal = - eval("/** doc */ val foo = 0").andThen { implicit s => - assertEquals("doc", doc("foo")) - } + @Test def docOfVal = eval("/** doc */ val foo = 0") andThen assertEquals("doc", doc("foo")) - @Test def docOfObject = - eval("/** doc */ object Foo").andThen { implicit s => - assertEquals("doc", doc("Foo")) - } + @Test def docOfObject = eval("/** doc */ object Foo") andThen assertEquals("doc", doc("Foo")) - @Test def docOfClass = - eval("/** doc */ class Foo").andThen { implicit s => - assertEquals("doc", doc("new Foo")) - } + @Test def docOfClass = eval("/** doc */ class Foo") andThen assertEquals("doc", doc("new Foo")) - @Test def docOfTrait = - eval("/** doc */ trait Foo").andThen { implicit s => - assertEquals("doc", doc("new Foo")) - } -/* - @Test def docOfExtension1 = - eval("/** doc */ extension (x: Int) def foo = 0").andThen { implicit s => - assertEquals("doc", doc("extension_foo")) - } + @Test def docOfTrait = eval("/** doc */ trait Foo") andThen assertEquals("doc", doc("new Foo")) - @Test def docOfExtension2 = - eval("extension (x: Int) /** doc */ def foo = 0").andThen { implicit s => - assertEquals("doc", doc("extension_foo")) - } + /*@Test*/ def docOfExtension1 = + eval("/** doc */ extension (x: Int) def foo = 0") andThen assertEquals("doc", doc("extension_foo")) - @Test def docOfExtension3 = - eval("/** doc0 */ extension (x: Int) { /** doc1 */ def foo = 0; /** doc2 */ def bar = 0; def baz = 0 }").andThen { implicit s => + /*@Test*/ def docOfExtension2 = + eval("extension (x: Int) /** doc */ def foo = 0") andThen assertEquals("doc", doc("extension_foo")) + + /*@Test*/ def docOfExtension3 = + eval("/** doc0 */ extension (x: Int) { /** doc1 */ def foo = 0; /** doc2 */ def bar = 0; def baz = 0 }") andThen { assertEquals("doc1", doc("extension_foo")) assertEquals("doc2", doc("extension_bar")) assertEquals("doc0", doc("extension_baz")) } -*/ - @Test def docOfDefInObject = - eval("object O { /** doc */ def foo = 0 }").andThen { implicit s => - assertEquals("doc", doc("O.foo")) - } - @Test def docOfValInObject = - eval("object O { /** doc */ val foo = 0 }").andThen { implicit s => - assertEquals("doc", doc("O.foo")) - } + @Test def docOfDefInObject = eval("object O { /** doc */ def foo = 0 }") andThen assertEquals("doc", doc("O.foo")) - @Test def docOfObjectInObject = - eval("object O { /** doc */ object Foo }").andThen { implicit s => - assertEquals("doc", doc("O.Foo")) - } + @Test def docOfValInObject = eval("object O { /** doc */ val foo = 0 }") andThen assertEquals("doc", doc("O.foo")) - @Test def docOfClassInObject = - eval("object O { /** doc */ class Foo }").andThen { implicit s => - assertEquals("doc", doc("new O.Foo")) - } + @Test def docOfObjectInObject = eval("object O { /** doc */ object Foo }") andThen assertEquals("doc", doc("O.Foo")) - @Test def docOfTraitInObject = - eval("object O { /** doc */ trait Foo }").andThen { implicit s => - assertEquals("doc", doc("new O.Foo")) - } + @Test def docOfClassInObject = eval("object O { /** doc */ class Foo }") andThen assertEquals("doc", doc("new O.Foo")) + + @Test def docOfTraitInObject = eval("object O { /** doc */ trait Foo }") andThen assertEquals("doc", doc("new O.Foo")) @Test def docOfDefInClass = eval( """class C { /** doc */ def foo = 0 } |val c = new C - """.stripMargin).andThen { implicit s => + """.stripMargin) andThen { assertEquals("doc", doc("c.foo")) } @@ -85,7 +51,7 @@ class DocTests extends ReplTest { eval( """class C { /** doc */ val foo = 0 } |val c = new C - """.stripMargin).andThen { implicit s => + """.stripMargin) andThen { assertEquals("doc", doc("c.foo")) } @@ -93,7 +59,7 @@ class DocTests extends ReplTest { eval( """class C { /** doc */ object Foo } |val c = new C - """.stripMargin).andThen { implicit s => + """.stripMargin) andThen { assertEquals("doc", doc("c.Foo")) } @@ -101,7 +67,7 @@ class DocTests extends ReplTest { eval( """class C { /** doc */ class Foo } |val c = new C - """.stripMargin).andThen { implicit s => + """.stripMargin) andThen { assertEquals("doc", doc("new c.Foo")) } @@ -109,7 +75,7 @@ class DocTests extends ReplTest { eval( """class C { /** doc */ trait Foo } |val c = new C - """.stripMargin).andThen { implicit s => + """.stripMargin) andThen { assertEquals("doc", doc("new c.Foo")) } @@ -119,7 +85,7 @@ class DocTests extends ReplTest { | /** doc0 */ def foo(x: Int) = x | /** doc1 */ def foo(x: String) = x |} - """.stripMargin).andThen { implicit s => + """.stripMargin) andThen { assertEquals("doc0", doc("O.foo(_: Int)")) assertEquals("doc1", doc("O.foo(_: String)")) } @@ -128,7 +94,7 @@ class DocTests extends ReplTest { eval( """class C { /** doc */ def foo = 0 } |object O extends C - """.stripMargin).andThen { implicit s => + """.stripMargin) andThen { assertEquals("doc", doc("O.foo")) } @@ -142,7 +108,7 @@ class DocTests extends ReplTest { | override def foo(x: Int): Int = x | /** overridden doc */ override def foo(x: String): String = x |} - """.stripMargin).andThen { implicit s => + """.stripMargin) andThen { assertEquals("doc0", doc("O.foo(_: Int)")) assertEquals("overridden doc", doc("O.foo(_: String)")) } @@ -158,38 +124,34 @@ class DocTests extends ReplTest { | override def bar: Int = 0 | } |} - """.stripMargin).andThen { implicit s => + """.stripMargin) andThen { assertEquals("companion", doc("O.foo")) assertEquals("doc0", doc("O.foo.bar")) } @Test def docIsCooked = eval( - """/** - | * An object + """/** An object | * @define Variable some-value | */ |object Foo { | /** Expansion: $Variable */ | def hello = "world" |} - """.stripMargin).andThen { implicit s => + """.stripMargin) andThen { assertEquals("Expansion: some-value", doc("Foo.hello")) } - @Test def docOfEmpty = - fromInitialState { implicit s => + @Test def docOfEmpty = initially { run(":doc") assertEquals(":doc ", storedOutput().trim) } - private def eval(code: String): State = - fromInitialState { implicit s => run(code) } + private def eval(code: String): State = initially(run(code)) - private def doc(expr: String)(implicit s: State): String = { + private def doc(expr: String)(using State): String = { storedOutput() run(s":doc $expr") storedOutput().trim } - } diff --git a/compiler/test/dotty/tools/repl/JavaDefinedTests.scala b/compiler/test/dotty/tools/repl/JavaDefinedTests.scala index d3c86364fc60..561111cf7eb1 100644 --- a/compiler/test/dotty/tools/repl/JavaDefinedTests.scala +++ b/compiler/test/dotty/tools/repl/JavaDefinedTests.scala @@ -4,12 +4,12 @@ import org.junit.Assert._ import org.junit.Test class JavaDefinedTests extends ReplTest { - @Test def typeOfJavaDefinedString = fromInitialState { implicit s => + @Test def typeOfJavaDefinedString = initially { run("String") assertTrue(storedOutput().contains("Java defined class String is not a value")) } - @Test def typeOfJavaDefinedClass = fromInitialState { implicit s => + @Test def typeOfJavaDefinedClass = initially { run("Class") assertTrue(storedOutput().contains("Java defined class Class is not a value")) } diff --git a/compiler/test/dotty/tools/repl/LoadTests.scala b/compiler/test/dotty/tools/repl/LoadTests.scala index 8dc077c05552..c4f1f9f0781d 100644 --- a/compiler/test/dotty/tools/repl/LoadTests.scala +++ b/compiler/test/dotty/tools/repl/LoadTests.scala @@ -46,15 +46,13 @@ class LoadTests extends ReplTest { ) def loadTest(file: String, defs: String, runCode: String, output: String) = - eval(s":load ${writeFile(file)}").andThen { implicit s => + eval(s":load ${writeFile(file)}") andThen { assertMultiLineEquals(defs, storedOutput()) run(runCode) assertMultiLineEquals(output, storedOutput()) } - private def eval(code: String): State = - fromInitialState { implicit s => run(code) } - + private def eval(code: String): State = initially(run(code)) } object LoadTests { diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala index 0539fcf13e32..3c70f838caa3 100644 --- a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala +++ b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala @@ -6,42 +6,40 @@ import org.junit.Assert.{assertTrue => assert, _} import org.junit.{Ignore, Test} import dotty.tools.dotc.core.Contexts.Context -class ReplCompilerTests extends ReplTest { +class ReplCompilerTests extends ReplTest: import ReplCompilerTests._ private def lines() = storedOutput().trim.linesIterator.toList - @Test def compileSingle = fromInitialState { implicit state => + @Test def compileSingle = initially { run("def foo: 1 = 1") assertEquals("def foo: 1", storedOutput().trim) } @Test def compileTwo = - fromInitialState { implicit state => + initially { run("def foo: 1 = 1") - } - .andThen { implicit state => + } andThen { val s2 = run("def foo(i: Int): i.type = i") assertEquals(2, s2.objectIndex) } @Test def inspectWrapper = - fromInitialState { implicit state => + initially { run("def foo = 1") - - }.andThen { implicit state => + } andThen { storedOutput() // discard output run("val x = rs$line$1.foo") assertEquals("val x: Int = 1", storedOutput().trim) } - @Test def testVar = fromInitialState { implicit state => + @Test def testVar = initially { run("var x = 5") assertEquals("var x: Int = 5", storedOutput().trim) } - @Test def testRes = fromInitialState { implicit state => + @Test def testRes = initially { run { """|def foo = 1 + 1 |val x = 5 + 5 @@ -62,11 +60,10 @@ class ReplCompilerTests extends ReplTest { } @Test def testImportMutable = - fromInitialState { implicit state => + initially { run("import scala.collection.mutable") - } - .andThen { implicit state => - assertEquals(1, state.imports.size) + } andThen { + assertEquals(1, summon[State].imports.size) run("""mutable.Map("one" -> 1)""") assertEquals( "val res0: scala.collection.mutable.Map[String, Int] = HashMap(one -> 1)", @@ -75,22 +72,21 @@ class ReplCompilerTests extends ReplTest { } @Test def rebindVariable = - fromInitialState { implicit s => + initially { val state = run("var x = 5") assertEquals("var x: Int = 5", storedOutput().trim) state - } - .andThen { implicit s => + } andThen { run("x = 10") assertEquals("x: Int = 10", storedOutput().trim) } - @Test def defaultParameter = fromInitialState { implicit state => + @Test def defaultParameter = initially { run("def foo(a: Int = 1): 1 = 1") assertEquals("def foo(a: Int): 1", storedOutput().trim) } - @Test def i8677 = fromInitialState { implicit state => + @Test def i8677 = initially { run { """|sealed trait T1 |case class X() extends T1 @@ -111,38 +107,38 @@ class ReplCompilerTests extends ReplTest { // FIXME: Tests are not run in isolation, the classloader is corrupted after the first exception @Ignore @Test def i3305: Unit = { - fromInitialState { implicit s => + initially { run("null.toString") assert(storedOutput().startsWith("java.lang.NullPointerException")) } - fromInitialState { implicit s => + initially { run("def foo: Int = 1 + foo; foo") assert(storedOutput().startsWith("def foo: Int\njava.lang.StackOverflowError")) } - fromInitialState { implicit s => + initially { run("""throw new IllegalArgumentException("Hello")""") assert(storedOutput().startsWith("java.lang.IllegalArgumentException: Hello")) } - fromInitialState { implicit s => + initially { run("val (x, y) = null") assert(storedOutput().startsWith("scala.MatchError: null")) } } - @Test def i2789: Unit = fromInitialState { implicit state => + @Test def i2789: Unit = initially { run("(x: Int) => println(x)") assert(storedOutput().startsWith("val res0: Int => Unit =")) } - @Test def byNameParam: Unit = fromInitialState { implicit state => + @Test def byNameParam: Unit = initially { run("def f(g: => Int): Int = g") assert(storedOutput().startsWith("def f(g: => Int): Int")) } - @Test def i4051 = fromInitialState { implicit state => + @Test def i4051 = initially { val source = """val x: PartialFunction[Int, Int] = { case x => x } |val y = Map(("A", 1), ("B", 2), ("X", 3)).collect { case (k, v) => v }.toList""".stripMargin @@ -157,8 +153,9 @@ class ReplCompilerTests extends ReplTest { } @Test def i5897 = - fromInitialState { implicit state => run("given Int = 10") } - .andThen { implicit state => + initially { + run("given Int = 10") + } andThen { assertEquals( "lazy val given_Int: Int", storedOutput().trim @@ -171,7 +168,7 @@ class ReplCompilerTests extends ReplTest { } @Test def i6200 = - fromInitialState { implicit state => + initially { run(""" |trait Ord[T] { | def compare(x: T, y: T): Int @@ -183,8 +180,8 @@ class ReplCompilerTests extends ReplTest { | def compare(x: Int, y: Int) = | if (x < y) -1 else if (x > y) +1 else 0 |} - """.stripMargin) } - .andThen { implicit state => + """.stripMargin) + } andThen { assertMultiLineEquals( """// defined trait Ord |// defined object IntOrd""".stripMargin, @@ -194,43 +191,41 @@ class ReplCompilerTests extends ReplTest { assert(storedOutput().startsWith("val res0: IntOrd.type =")) } - @Test def i7934: Unit = fromInitialState { state => - given Context = state.context + @Test def i7934: Unit = contextually { assertFalse(ParseResult.isIncomplete("_ + 1")) // was: assertThrows[NullPointerException] } - @Test def `i9374 accept collective extensions`: Unit = fromInitialState { state => - given Context = state.context + @Test def `i9374 accept collective extensions`: Unit = contextually { assert(ParseResult.isIncomplete("extension (x: String)")) assert(ParseResult.isIncomplete("extension (x: String) {")) } - @Test def testSingletonPrint = fromInitialState { implicit state => + @Test def testSingletonPrint = initially { run("""val a = "hello"; val x: a.type = a""") assertMultiLineEquals("val a: String = hello\nval x: a.type = hello", storedOutput().trim) } - @Test def i6574 = fromInitialState { implicit state => + @Test def i6574 = initially { run("val a: 1 | 0 = 1") assertEquals("val a: 1 | 0 = 1", storedOutput().trim) } - @Test def `i10214 must show classic MatchError` = fromInitialState { implicit state => + @Test def `i10214 must show classic MatchError` = initially { run("val 1 = 2") assertEquals("scala.MatchError: 2 (of class java.lang.Integer)", storedOutput().linesIterator.next()) } @Test def `i10214 must show useful regex MatchError` = - fromInitialState { implicit state => + initially { run("""val r = raw"\d+".r""") - } andThen { implicit state => + } andThen { run("""val r() = "abc"""") assertEquals("scala.MatchError: abc (of class java.lang.String)", storedOutput().linesIterator.drop(1).next()) } - @Test def `i10214 must show MatchError on literal type` = fromInitialState { implicit state => + @Test def `i10214 must show MatchError on literal type` = initially { run("val (x: 1) = 2") assertEquals("scala.MatchError: 2 (of class java.lang.Integer)", storedOutput().linesIterator.next()) } - @Test def `i12920 must truncate stack trace to user code` = fromInitialState { implicit state => + @Test def `i12920 must truncate stack trace to user code` = initially { run("???") val all = lines() assertEquals(3, all.length) @@ -241,49 +236,47 @@ class ReplCompilerTests extends ReplTest { ... 28 elided */ } - @Test def `i14281 context class loader must be REPL class loader` = fromInitialState { implicit state => + @Test def `i14281 context class loader must be REPL class loader` = initially { run("class C ; assert(classOf[C].getClassLoader eq Thread.currentThread.getContextClassLoader)") assertEquals(List("// defined class C"), lines()) } -} -object ReplCompilerTests { +object ReplCompilerTests: private val pattern = Pattern.compile("\\r[\\n]?|\\n"); // Ensure 'expected' and 'actual' contain the same line separator(s). - def assertMultiLineEquals(expected: String, actual: String): Unit = { + def assertMultiLineEquals(expected: String, actual: String): Unit = val expected0 = pattern.matcher(expected).replaceAll(System.lineSeparator) val actual0 = pattern.matcher(actual).replaceAll(System.lineSeparator) assertEquals(expected0, actual0) - } -} +end ReplCompilerTests -class ReplXPrintTyperTests extends ReplTest(ReplTest.defaultOptions :+ "-Xprint:typer") { - @Test def i9111 = fromInitialState { implicit state => +class ReplXPrintTyperTests extends ReplTest(ReplTest.defaultOptions :+ "-Xprint:typer"): + @Test def i9111 = initially { run("""|enum E { | case A |}""".stripMargin) assert(storedOutput().trim().endsWith("// defined class E")) } - @Test def i10883 = fromInitialState { implicit state => + @Test def i10883 = initially { run("val a = 42") assert(storedOutput().trim().endsWith("val a: Int = 42")) } -} +end ReplXPrintTyperTests -class ReplVerboseTests extends ReplTest(ReplTest.defaultOptions :+ "-verbose") { - @Test def i9111 = fromInitialState { implicit state => +class ReplVerboseTests extends ReplTest(ReplTest.defaultOptions :+ "-verbose"): + @Test def i9111 = initially { run("""|enum E { | case A |}""".stripMargin) assert(storedOutput().trim().endsWith("// defined class E")) } - @Test def i10883 = fromInitialState { implicit state => + @Test def i10883 = initially { run("val a = 42") assert(storedOutput().trim().endsWith("val a: Int = 42")) } -} +end ReplVerboseTests diff --git a/compiler/test/dotty/tools/repl/ReplTest.scala b/compiler/test/dotty/tools/repl/ReplTest.scala index 5bb6298a937b..55f8afa26260 100644 --- a/compiler/test/dotty/tools/repl/ReplTest.scala +++ b/compiler/test/dotty/tools/repl/ReplTest.scala @@ -12,6 +12,7 @@ import scala.io.Source import scala.util.Using import scala.collection.mutable.ArrayBuffer +import dotty.tools.dotc.core.Contexts.Context import dotty.tools.dotc.reporting.MessageRendering import org.junit.{After, Before} import org.junit.Assert._ @@ -33,11 +34,12 @@ extends ReplDriver(options, new PrintStream(out, true, StandardCharsets.UTF_8.na @After def cleanup: Unit = storedOutput() - def fromInitialState[A](op: State => A): A = - op(initialState) + def initially[A](op: State ?=> A): A = op(using initialState) + + def contextually[A](op: Context ?=> A): A = op(using initialState.context) extension [A](state: State) - def andThen(op: State => A): A = op(state) + infix def andThen(op: State ?=> A): A = op(using state) def testFile(f: JFile): Unit = testScript(f.toString, readLines(f), Some(f)) diff --git a/compiler/test/dotty/tools/repl/TabcompleteTests.scala b/compiler/test/dotty/tools/repl/TabcompleteTests.scala index 932ab7058899..ab581d664629 100644 --- a/compiler/test/dotty/tools/repl/TabcompleteTests.scala +++ b/compiler/test/dotty/tools/repl/TabcompleteTests.scala @@ -10,22 +10,22 @@ class TabcompleteTests extends ReplTest { private def tabComplete(src: String)(implicit state: State): List[String] = completions(src.length, src, state).map(_.value).sorted - @Test def tabCompleteList = fromInitialState { implicit s => + @Test def tabCompleteList = initially { val comp = tabComplete("List.r") assertEquals(List("range"), comp.distinct) } - @Test def tabCompleteListInstance = fromInitialState { implicit s => + @Test def tabCompleteListInstance = initially { val comp = tabComplete("(null: List[Int]).sli") assertEquals(List("slice", "sliding"), comp.distinct) } - @Test def tabCompleteModule = fromInitialState{ implicit s => + @Test def tabCompleteModule = initially { val comp = tabComplete("scala.Pred") assertEquals(List("Predef"), comp) } - @Test def tabCompleteInClass = fromInitialState { implicit s => + @Test def tabCompleteInClass = initially { val comp = tabComplete("class Foo { def bar: List[Int] = List.ap") assertEquals(List("apply"), comp) } @@ -34,77 +34,70 @@ class TabcompleteTests extends ReplTest { val src1 = "class Foo { def bar(xs: List[Int]) = xs.map" val src2 = "class Foo { def bar(xs: List[Int]) = xs.mapC" - fromInitialState { implicit state => - val comp = tabComplete(src1) - assertEquals(List("map", "mapConserve"), comp) - state - } - .andThen { implicit state => - val comp = tabComplete(src2) - assertEquals(List("mapConserve"), comp) + initially { + val comp1 = tabComplete(src1) + assertEquals(List("map", "mapConserve"), comp1) + val comp2 = tabComplete(src2) + assertEquals(List("mapConserve"), comp2) } } - @Test def i3309 = fromInitialState { implicit s => + @Test def i3309 = initially { // We make sure we do not crash List("\"", ")", "'", "¨", "£", ":", ",", ";", "@", "}", "[", "]", ".") .foreach(tabComplete(_)) } @Test def completeFromPreviousState = - fromInitialState { implicit state => + initially { val src = "class Foo { def comp3 = 3; def comp1 = 1; def comp2 = 2 }" run(src) - } - .andThen { implicit state => + } andThen { val expected = List("comp1", "comp2", "comp3") assertEquals(expected, tabComplete("(new Foo).comp")) } @Test def completeFromPreviousState2 = - fromInitialState { implicit state => + initially { val src = "def hello = 1" run(src) - } - .andThen { implicit state => + } andThen { val expected = List("hello") assertEquals(expected, tabComplete("hel")) } @Test def tabCompleteFromPreviousImport = - fromInitialState { implicit state => + initially { val src = "import java.io.FileDescriptor" run(src) - } - .andThen { implicit state => + } andThen { val expected = List("FileDescriptor") assertEquals(expected, tabComplete("val foo: FileDesc")) } @Test def tabCompleteRenamedImport = - fromInitialState { implicit state => + initially { val src = "import java.io.{FileDescriptor => Renamed}" run(src) - } - .andThen { implicit state => + } andThen { val expected = List("Renamed") assertEquals(expected, tabComplete("val foo: Rena")) } - @Test def tabClosureComplete = fromInitialState { implicit s => + @Test def tabClosureComplete = initially { assertEquals(List("map", "mapConserve"), tabComplete("Nil.map")) assertEquals(List("map", "mapConserve"), tabComplete("(x: Int => Int) => Nil.map")) assertEquals(List("apply"), tabComplete("(x: Int => Int) => x.ap")) } - @Test def importScala = fromInitialState { implicit s => + @Test def importScala = initially { val comp = tabComplete("import scala.") // check that there are no special symbols leaked: , , ... assertEquals(Some("<:<"), comp.find(_.startsWith("<"))) assert(!comp.contains("package")) } - @Test def `null` = fromInitialState { implicit s => + @Test def `null` = initially { val comp = tabComplete("null.") assertEquals( List("!=", "##", "==", "asInstanceOf", "eq", "equals", "getClass", "hashCode", @@ -112,7 +105,7 @@ class TabcompleteTests extends ReplTest { comp.distinct.sorted) } - @Test def anyRef = fromInitialState { implicit s => + @Test def anyRef = initially { val comp = tabComplete("(null: AnyRef).") assertEquals( List("!=", "##", "->", "==", "asInstanceOf", "ensuring", "eq", "equals", "formatted", @@ -120,20 +113,20 @@ class TabcompleteTests extends ReplTest { comp.distinct.sorted) } - @Test def `???` = fromInitialState { implicit s => + @Test def `???` = initially { val comp = tabComplete("???.") assertEquals(Nil, comp) } - @Test def moduleCompletion = fromInitialState { implicit s => + @Test def moduleCompletion = initially { assertEquals(List("Predef"), tabComplete("object Foo { type T = Pre")) } - @Test def i6415 = fromInitialState { implicit s => + @Test def i6415 = initially { assertEquals(List("Predef"), tabComplete("object Foo { opaque type T = Pre")) } - @Test def i12600 = fromInitialState { implicit s => + @Test def i12600 = initially { assertEquals(List("select", "show", "simplified", "substituteTypes"), tabComplete("import quoted.* ; def fooImpl(using Quotes): Expr[Int] = { import quotes.reflect.* ; TypeRepr.of[Int].s")) } diff --git a/compiler/test/dotty/tools/repl/TypeTests.scala b/compiler/test/dotty/tools/repl/TypeTests.scala index abc66ba2c0ab..6a8c38867ff0 100644 --- a/compiler/test/dotty/tools/repl/TypeTests.scala +++ b/compiler/test/dotty/tools/repl/TypeTests.scala @@ -4,25 +4,26 @@ import org.junit.Assert._ import org.junit.Test class TypeTests extends ReplTest { - @Test def typeOf1 = fromInitialState { implicit s => + @Test def typeOf1 = initially { run(":type 1") assertEquals("Int", storedOutput().trim) } - @Test def typeOfBlock = fromInitialState { implicit s => + @Test def typeOfBlock = initially { run(":type { /** omg omg omg */ 1 + 5; 1 }") assertEquals("Int", storedOutput().trim) } @Test def typeOfX = - fromInitialState { implicit s => run("val x = 5") } - .andThen { implicit s => + initially { + run("val x = 5") + } andThen { storedOutput() // discard output run(":type x") assertEquals("Int", storedOutput().trim) } - @Test def typeOfEmpty = fromInitialState { implicit s => + @Test def typeOfEmpty = initially { run(":type") assertEquals(":type ", storedOutput().trim) } From 5d14ab7bdb1ea0645aa9cc8b11a940109562f85c Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Sat, 22 Jan 2022 16:05:05 +0900 Subject: [PATCH 1063/1244] Update Scala CLA url --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3b622e9f57c8..19af50ebd49f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ These guidelines are meant to be a living document that should be changed and ad This is the process for committing code to the Scala project. There are of course exceptions to these rules, for example minor changes to comments and documentation, fixing a broken build etc. -1. Make sure you have signed the [Scala CLA](http://typesafe.com/contribute/cla/scala), if not, sign it. +1. Make sure you have signed the [Scala CLA](https://www.lightbend.com/contribute/cla/scala), if not, sign it. 2. Before starting to work on a feature or a fix, it's good practice to ensure that: 1. There is a ticket for your work in the project's [issue tracker](https://github.com/lampepfl/dotty/issues); 2. The ticket has been discussed and prioritized by the team. From 622310ba1ed09101f932cf53325ff40279b3bc8a Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Tue, 25 Jan 2022 14:34:00 +0100 Subject: [PATCH 1064/1244] Update issue templates Update issue templates to automatically classify new issues as needing triage. --- .github/ISSUE_TEMPLATE/bug.md | 2 +- .github/ISSUE_TEMPLATE/crash.md | 2 +- .github/ISSUE_TEMPLATE/other-issue.md | 5 +++-- .github/ISSUE_TEMPLATE/syntax-highlight.md | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index e7c8bcc40527..6e53805900c4 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -2,7 +2,7 @@ name: "\U0001F41B Bug report" about: Report a bug about the Dotty Compiler title: '' -labels: itype:bug +labels: itype:bug, stat:needs triage assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md index 390a57273260..5a4cfe3f5e15 100644 --- a/.github/ISSUE_TEMPLATE/crash.md +++ b/.github/ISSUE_TEMPLATE/crash.md @@ -2,7 +2,7 @@ name: "\U0001F4A5 Crash report" about: Report a Dotty compiler crash title: '' -labels: itype:bug, itype:crash +labels: itype:bug, itype:crash, stat:needs triage assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/other-issue.md b/.github/ISSUE_TEMPLATE/other-issue.md index cfa8618c542a..07a9fe77846a 100644 --- a/.github/ISSUE_TEMPLATE/other-issue.md +++ b/.github/ISSUE_TEMPLATE/other-issue.md @@ -1,9 +1,10 @@ --- -name: "Other issue" +name: Other issue about: Report an issue about the Dotty Compiler (not bug or crash) title: '' -labels: +labels: stat:needs triage assignees: '' + --- ## Compiler version diff --git a/.github/ISSUE_TEMPLATE/syntax-highlight.md b/.github/ISSUE_TEMPLATE/syntax-highlight.md index 722c8ed5fa73..ffb8fbd32c46 100644 --- a/.github/ISSUE_TEMPLATE/syntax-highlight.md +++ b/.github/ISSUE_TEMPLATE/syntax-highlight.md @@ -1,6 +1,6 @@ --- name: Syntax highlighting -about: '' +about: Please create a syntax highlighting issue in a respective repo title: '' labels: '' assignees: '' @@ -10,4 +10,4 @@ assignees: '' Please create a syntax highlighting issue here * VS Code / GitHub: https://github.com/scala/vscode-scala-syntax/issues * IntelliJ: https://youtrack.jetbrains.com/issues/SCL?q=tag:%20%7BScala%203%7D%20tag:%20%7BSyntax%20Highlighting%7D -* highlight.js: https://github.com/highlightjs/highlight.js/issues \ No newline at end of file +* highlight.js: https://github.com/highlightjs/highlight.js/issues From 54082876b21d5d7bc1b64f713c167159bef986d8 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 24 Jan 2022 18:06:04 +0100 Subject: [PATCH 1065/1244] Output other compiler errors Fixes #14303 --- .../dotty/tools/vulpix/ParallelTesting.scala | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 0b649943f494..b0ba9b2c041d 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -505,19 +505,28 @@ trait ParallelTesting extends RunnerOrchestration { self => } private def parseErrors(errorsText: String, compilerVersion: String) = - val errorPattern = """.*Error: (.*\.scala):(\d+):(\d+).*""".r - errorsText.linesIterator.toSeq.collect { - case errorPattern(filePath, line, column) => - val lineNum = line.toInt - val columnNum = column.toInt - val abstractFile = AbstractFile.getFile(filePath) - val sourceFile = SourceFile(abstractFile, Codec.UTF8) - val offset = sourceFile.lineToOffset(lineNum - 1) + columnNum - 1 - val span = Spans.Span(offset) - val sourcePos = SourcePosition(sourceFile, span) - - Diagnostic.Error(s"Compilation of $filePath with Scala $compilerVersion failed at line: $line, column: $column. Full error output:\n\n$errorsText\n", sourcePos) - } + val errorPattern = """^.*Error: (.*\.scala):(\d+):(\d+).*""".r + val summaryPattern = """\d+ (?:warning|error)s? found""".r + val indent = " " + var diagnostics = List.empty[Diagnostic.Error] + for line <- errorsText.linesIterator do + line match + case error @ errorPattern(filePath, line, column) => + val lineNum = line.toInt + val columnNum = column.toInt + val abstractFile = AbstractFile.getFile(filePath) + val sourceFile = SourceFile(abstractFile, Codec.UTF8) + val offset = sourceFile.lineToOffset(lineNum - 1) + columnNum - 1 + val span = Spans.Span(offset) + val sourcePos = SourcePosition(sourceFile, span) + diagnostics ::= Diagnostic.Error(s"Compilation of $filePath with Scala $compilerVersion failed at line: $line, column: $column. Full error output:\n\n$indent$error\n", sourcePos) + case summaryPattern() => // Ignored + case errorLine => + diagnostics match + case head :: tail => + diagnostics = Diagnostic.Error(s"${head.msg.rawMessage}$indent$errorLine\n", head.pos) :: tail + case Nil => + diagnostics.reverse protected def compileWithOtherCompiler(compiler: String, files: Array[JFile], flags: TestFlags, targetDir: JFile): TestReporter = val compilerDir = getCompiler(compiler).toString @@ -531,9 +540,9 @@ trait ParallelTesting extends RunnerOrchestration { self => val flags1 = flags.copy(defaultClassPath = substituteClasspath(flags.defaultClassPath)) .withClasspath(targetDir.getPath) .and("-d", targetDir.getPath) + .and("-pagewidth", "80") - val dummyStream = new PrintStream(new ByteArrayOutputStream()) - val reporter = TestReporter.reporter(dummyStream, ERROR) + val reporter = TestReporter.reporter(System.out, ERROR) val command = Array(compilerDir + "/bin/scalac") ++ flags1.all ++ files.map(_.getPath) val process = Runtime.getRuntime.exec(command) From 176ecf5cf54c6eafaff928343ce4d8452ba711c4 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 25 Jan 2022 09:57:24 +0100 Subject: [PATCH 1066/1244] Make errors from other compilers simpler to read --- .../dotty/tools/vulpix/ParallelTesting.scala | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index b0ba9b2c041d..a07c8cf97455 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -504,11 +504,19 @@ trait ParallelTesting extends RunnerOrchestration { self => reporter } - private def parseErrors(errorsText: String, compilerVersion: String) = + private def parseErrors(errorsText: String, compilerVersion: String, pageWidth: Int) = val errorPattern = """^.*Error: (.*\.scala):(\d+):(\d+).*""".r val summaryPattern = """\d+ (?:warning|error)s? found""".r val indent = " " var diagnostics = List.empty[Diagnostic.Error] + def barLine(start: Boolean) = s"$indent${if start then "╭" else "╰"}${"┄" * pageWidth}${if start then "╮" else "╯"}\n" + def errorLine(line: String) = s"$indent┆${String.format(s"%-${pageWidth}s", stripAnsi(line))}┆\n" + def stripAnsi(str: String): String = str.replaceAll("\u001b\\[\\d+m", "") + def addToLast(str: String): Unit = + diagnostics match + case head :: tail => + diagnostics = Diagnostic.Error(s"${head.msg.rawMessage}$str", head.pos) :: tail + case Nil => for line <- errorsText.linesIterator do line match case error @ errorPattern(filePath, line, column) => @@ -519,13 +527,11 @@ trait ParallelTesting extends RunnerOrchestration { self => val offset = sourceFile.lineToOffset(lineNum - 1) + columnNum - 1 val span = Spans.Span(offset) val sourcePos = SourcePosition(sourceFile, span) - diagnostics ::= Diagnostic.Error(s"Compilation of $filePath with Scala $compilerVersion failed at line: $line, column: $column. Full error output:\n\n$indent$error\n", sourcePos) + addToLast(barLine(start = false)) + diagnostics ::= Diagnostic.Error(s"Compilation of $filePath with Scala $compilerVersion failed at line: $line, column: $column.\nFull error output:\n${barLine(start = true)}${errorLine(error)}", sourcePos) case summaryPattern() => // Ignored - case errorLine => - diagnostics match - case head :: tail => - diagnostics = Diagnostic.Error(s"${head.msg.rawMessage}$indent$errorLine\n", head.pos) :: tail - case Nil => + case line => addToLast(errorLine(line)) + addToLast(barLine(start = false)) diagnostics.reverse protected def compileWithOtherCompiler(compiler: String, files: Array[JFile], flags: TestFlags, targetDir: JFile): TestReporter = @@ -537,10 +543,11 @@ trait ParallelTesting extends RunnerOrchestration { self => else o }.mkString(JFile.pathSeparator) + val pageWidth = 80 val flags1 = flags.copy(defaultClassPath = substituteClasspath(flags.defaultClassPath)) .withClasspath(targetDir.getPath) .and("-d", targetDir.getPath) - .and("-pagewidth", "80") + .and("-pagewidth", pageWidth.toString) val reporter = TestReporter.reporter(System.out, ERROR) @@ -548,7 +555,7 @@ trait ParallelTesting extends RunnerOrchestration { self => val process = Runtime.getRuntime.exec(command) val errorsText = Source.fromInputStream(process.getErrorStream).mkString if process.waitFor() != 0 then - val diagnostics = parseErrors(errorsText, compiler) + val diagnostics = parseErrors(errorsText, compiler, pageWidth) diagnostics.foreach { diag => val context = (new ContextBase).initialCtx reporter.report(diag)(using context) From 447ff08668108a279c4eddeaf613cd498cd38a4a Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 25 Jan 2022 11:39:49 +0100 Subject: [PATCH 1067/1244] Do not report warnings --- compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index a07c8cf97455..948a1a3b16e7 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -506,6 +506,7 @@ trait ParallelTesting extends RunnerOrchestration { self => private def parseErrors(errorsText: String, compilerVersion: String, pageWidth: Int) = val errorPattern = """^.*Error: (.*\.scala):(\d+):(\d+).*""".r + val warnPattern = """^.*Warning: (.*\.scala):(\d+):(\d+).*""".r val summaryPattern = """\d+ (?:warning|error)s? found""".r val indent = " " var diagnostics = List.empty[Diagnostic.Error] @@ -517,9 +518,13 @@ trait ParallelTesting extends RunnerOrchestration { self => case head :: tail => diagnostics = Diagnostic.Error(s"${head.msg.rawMessage}$str", head.pos) :: tail case Nil => + var inError = false for line <- errorsText.linesIterator do line match + case error @ warnPattern(filePath, line, column) => + inError = false case error @ errorPattern(filePath, line, column) => + inError = true val lineNum = line.toInt val columnNum = column.toInt val abstractFile = AbstractFile.getFile(filePath) @@ -530,7 +535,8 @@ trait ParallelTesting extends RunnerOrchestration { self => addToLast(barLine(start = false)) diagnostics ::= Diagnostic.Error(s"Compilation of $filePath with Scala $compilerVersion failed at line: $line, column: $column.\nFull error output:\n${barLine(start = true)}${errorLine(error)}", sourcePos) case summaryPattern() => // Ignored - case line => addToLast(errorLine(line)) + case line if inError => addToLast(errorLine(line)) + case _ => addToLast(barLine(start = false)) diagnostics.reverse From 3607de083501dccfa48304bf7f72c0cb663a2829 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 25 Jan 2022 11:51:07 +0100 Subject: [PATCH 1068/1244] Do not harcode other compile -pagewidth --- compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 2 +- compiler/test/dotty/tools/vulpix/TestConfiguration.scala | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 948a1a3b16e7..f6d8d418576f 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -549,7 +549,7 @@ trait ParallelTesting extends RunnerOrchestration { self => else o }.mkString(JFile.pathSeparator) - val pageWidth = 80 + val pageWidth = TestConfiguration.pageWidth - 20 val flags1 = flags.copy(defaultClassPath = substituteClasspath(flags.defaultClassPath)) .withClasspath(targetDir.getPath) .and("-d", targetDir.getPath) diff --git a/compiler/test/dotty/tools/vulpix/TestConfiguration.scala b/compiler/test/dotty/tools/vulpix/TestConfiguration.scala index caa7bc911633..b43dcbdd6046 100644 --- a/compiler/test/dotty/tools/vulpix/TestConfiguration.scala +++ b/compiler/test/dotty/tools/vulpix/TestConfiguration.scala @@ -6,8 +6,10 @@ import java.io.File object TestConfiguration { + val pageWidth = 120 + val noCheckOptions = Array( - "-pagewidth", "120", + "-pagewidth", pageWidth.toString, "-color:never", "-Xtarget", defaultTarget ) From f4758db082c21cc548a2fecb9c15ed78ec6ed2fb Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 25 Jan 2022 12:01:56 +0100 Subject: [PATCH 1069/1244] Properly report errors Based on `compileFromTasty` reporter --- compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 3 ++- tests/neg/i14303/A_1_c3.0.0.scala | 5 +++++ tests/neg/i14303/B_2.scala | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 tests/neg/i14303/A_1_c3.0.0.scala create mode 100644 tests/neg/i14303/B_2.scala diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index f6d8d418576f..242228290805 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -555,7 +555,8 @@ trait ParallelTesting extends RunnerOrchestration { self => .and("-d", targetDir.getPath) .and("-pagewidth", pageWidth.toString) - val reporter = TestReporter.reporter(System.out, ERROR) + val reporter = TestReporter.reporter(realStdout, logLevel = + if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR) val command = Array(compilerDir + "/bin/scalac") ++ flags1.all ++ files.map(_.getPath) val process = Runtime.getRuntime.exec(command) diff --git a/tests/neg/i14303/A_1_c3.0.0.scala b/tests/neg/i14303/A_1_c3.0.0.scala new file mode 100644 index 000000000000..4e1d7cc57472 --- /dev/null +++ b/tests/neg/i14303/A_1_c3.0.0.scala @@ -0,0 +1,5 @@ +def a: Int = { + 3 + 4 +} +def f: Int = match // error // error diff --git a/tests/neg/i14303/B_2.scala b/tests/neg/i14303/B_2.scala new file mode 100644 index 000000000000..39441cd7c630 --- /dev/null +++ b/tests/neg/i14303/B_2.scala @@ -0,0 +1 @@ +def test() = f // error \ No newline at end of file From b45a4212376a865b294e80618f0c7da5ceab8491 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 25 Jan 2022 13:10:25 +0100 Subject: [PATCH 1070/1244] Show broken source file errors --- compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 242228290805..2f32e4eff341 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -27,7 +27,7 @@ import dotc.interfaces.Diagnostic.ERROR import dotc.reporting.{Reporter, TestReporter} import dotc.reporting.Diagnostic import dotc.config.Config -import dotc.util.{DiffUtil, SourceFile, SourcePosition, Spans} +import dotc.util.{DiffUtil, SourceFile, SourcePosition, Spans, NoSourcePosition} import io.AbstractFile import dotty.tools.vulpix.TestConfiguration.defaultOptions @@ -506,6 +506,7 @@ trait ParallelTesting extends RunnerOrchestration { self => private def parseErrors(errorsText: String, compilerVersion: String, pageWidth: Int) = val errorPattern = """^.*Error: (.*\.scala):(\d+):(\d+).*""".r + val brokenClassPattern = """^class file (.*) is broken.*""".r val warnPattern = """^.*Warning: (.*\.scala):(\d+):(\d+).*""".r val summaryPattern = """\d+ (?:warning|error)s? found""".r val indent = " " @@ -534,6 +535,9 @@ trait ParallelTesting extends RunnerOrchestration { self => val sourcePos = SourcePosition(sourceFile, span) addToLast(barLine(start = false)) diagnostics ::= Diagnostic.Error(s"Compilation of $filePath with Scala $compilerVersion failed at line: $line, column: $column.\nFull error output:\n${barLine(start = true)}${errorLine(error)}", sourcePos) + case error @ brokenClassPattern(filePath) => + inError = true + diagnostics ::= Diagnostic.Error(s"$error\nFull error output:\n${barLine(start = true)}${errorLine(error)}", NoSourcePosition) case summaryPattern() => // Ignored case line if inError => addToLast(errorLine(line)) case _ => From 2a92e120709ac47c79bf268704bf2cc9c76b5bb1 Mon Sep 17 00:00:00 2001 From: Xavientois Date: Tue, 1 Feb 2022 20:49:01 -0500 Subject: [PATCH 1071/1244] Change error message text from "fully-initialized" to "fully initialized" - Remove hyphen from error message (as mentioned [here](https://github.com/lampepfl/dotty/pull/14292#issuecomment-1016141196)) Signed the CLA - @Xavientois Review by @liufengyun --- compiler/src/dotty/tools/dotc/transform/init/Errors.scala | 2 +- tests/init/neg/closureLeak.check | 2 +- tests/init/neg/enum-desugared.check | 4 ++-- tests/init/neg/enum.check | 2 +- tests/init/neg/inherit-non-hot.check | 2 +- tests/init/neg/promotion-loop.check | 2 +- tests/init/neg/t3273.check | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/init/Errors.scala b/compiler/src/dotty/tools/dotc/transform/init/Errors.scala index 0aebf5b1afa0..9f3e0d1fcc47 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Errors.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Errors.scala @@ -98,7 +98,7 @@ object Errors { def show(using Context): String = { var index = 0 - "Cannot prove that the value is fully-initialized. " + msg + ".\n" + stacktrace + + "Cannot prove that the value is fully initialized. " + msg + ".\n" + stacktrace + "\nThe unsafe promotion may cause the following problem:\n" + errors.head.show + errors.head.stacktrace } diff --git a/tests/init/neg/closureLeak.check b/tests/init/neg/closureLeak.check index 8ed6fa79f45b..a3da10ebbcc4 100644 --- a/tests/init/neg/closureLeak.check +++ b/tests/init/neg/closureLeak.check @@ -1,7 +1,7 @@ -- Error: tests/init/neg/closureLeak.scala:11:14 ----------------------------------------------------------------------- 11 | l.foreach(a => a.addX(this)) // error | ^^^^^^^^^^^^^^^^^ - | Cannot prove that the value is fully-initialized. May only use initialized value as arguments. + | Cannot prove that the value is fully initialized. May only use initialized value as arguments. | | The unsafe promotion may cause the following problem: | Cannot prove that the value is fully initialized. May only use initialized value as arguments. diff --git a/tests/init/neg/enum-desugared.check b/tests/init/neg/enum-desugared.check index 567b8104c154..6417b8c5cea7 100644 --- a/tests/init/neg/enum-desugared.check +++ b/tests/init/neg/enum-desugared.check @@ -1,7 +1,7 @@ -- Error: tests/init/neg/enum-desugared.scala:17:15 -------------------------------------------------------------------- 17 | Array(this.LazyErrorId, this.NoExplanationID) // error // error | ^^^^^^^^^^^^^^^^ - | Cannot prove that the value is fully-initialized. May only use initialized value as method arguments. + | Cannot prove that the value is fully initialized. May only use initialized value as method arguments. | | The unsafe promotion may cause the following problem: | Calling the external method method name may cause initialization errors. Calling trace: @@ -10,7 +10,7 @@ -- Error: tests/init/neg/enum-desugared.scala:17:33 -------------------------------------------------------------------- 17 | Array(this.LazyErrorId, this.NoExplanationID) // error // error | ^^^^^^^^^^^^^^^^^^^^ - | Cannot prove that the value is fully-initialized. May only use initialized value as method arguments. + | Cannot prove that the value is fully initialized. May only use initialized value as method arguments. | | The unsafe promotion may cause the following problem: | Calling the external method method ordinal may cause initialization errors. Calling trace: diff --git a/tests/init/neg/enum.check b/tests/init/neg/enum.check index 06e797624646..eb48920b47ea 100644 --- a/tests/init/neg/enum.check +++ b/tests/init/neg/enum.check @@ -1,7 +1,7 @@ -- Error: tests/init/neg/enum.scala:4:8 -------------------------------------------------------------------------------- 4 | NoExplanationID // error | ^ - | Cannot prove that the value is fully-initialized. May only use initialized value as method arguments. + | Cannot prove that the value is fully initialized. May only use initialized value as method arguments. | | The unsafe promotion may cause the following problem: | Calling the external method method name may cause initialization errors. Calling trace: diff --git a/tests/init/neg/inherit-non-hot.check b/tests/init/neg/inherit-non-hot.check index f6f45edfc9a6..af95b2a7284b 100644 --- a/tests/init/neg/inherit-non-hot.check +++ b/tests/init/neg/inherit-non-hot.check @@ -1,7 +1,7 @@ -- Error: tests/init/neg/inherit-non-hot.scala:6:34 -------------------------------------------------------------------- 6 | if b == null then b = new B(this) // error | ^^^^^^^^^^^ - | Cannot prove that the value is fully-initialized. May only assign fully initialized value. + | Cannot prove that the value is fully initialized. May only assign fully initialized value. | Calling trace: | -> val c = new C [ inherit-non-hot.scala:19 ] | -> class C extends A { [ inherit-non-hot.scala:15 ] diff --git a/tests/init/neg/promotion-loop.check b/tests/init/neg/promotion-loop.check index e0c9ba597163..a8efbfac6692 100644 --- a/tests/init/neg/promotion-loop.check +++ b/tests/init/neg/promotion-loop.check @@ -1,7 +1,7 @@ -- Error: tests/init/neg/promotion-loop.scala:16:10 -------------------------------------------------------------------- 16 | println(b) // error | ^ - | Cannot prove that the value is fully-initialized. May only use initialized value as arguments. + | Cannot prove that the value is fully initialized. May only use initialized value as arguments. | | The unsafe promotion may cause the following problem: | Cannot prove that the value is fully initialized. May only use initialized value as arguments. diff --git a/tests/init/neg/t3273.check b/tests/init/neg/t3273.check index 0dee113feeb2..3b9c5d280a5f 100644 --- a/tests/init/neg/t3273.check +++ b/tests/init/neg/t3273.check @@ -1,7 +1,7 @@ -- Error: tests/init/neg/t3273.scala:4:42 ------------------------------------------------------------------------------ 4 | val num1: LazyList[Int] = 1 #:: num1.map(_ + 1) // error | ^^^^^^^^^^^^^^^ - | Cannot prove that the value is fully-initialized. May only use initialized value as arguments. + | Cannot prove that the value is fully initialized. May only use initialized value as arguments. | | The unsafe promotion may cause the following problem: | Access non-initialized value num1. Calling trace: @@ -9,7 +9,7 @@ -- Error: tests/init/neg/t3273.scala:5:61 ------------------------------------------------------------------------------ 5 | val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList) // error | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | Cannot prove that the value is fully-initialized. May only use initialized value as arguments. + | Cannot prove that the value is fully initialized. May only use initialized value as arguments. | | The unsafe promotion may cause the following problem: | Access non-initialized value num2. Calling trace: From 101893f79d7fee12d552f0daf15f7c272d06bc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= Date: Thu, 20 Jan 2022 10:31:46 +0100 Subject: [PATCH 1072/1244] Fix windows CI; use coursier as tests dependency; conditionally enable forward compat community build in PRs --- .github/workflows/ci.yaml | 6 +++ .../dotty/tools/vulpix/ParallelTesting.scala | 51 ++++++++----------- project/Build.scala | 3 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ad26d9881243..405225011cdd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -327,6 +327,12 @@ jobs: - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache - ${{ github.workspace }}/../../cache/general:/root/.cache if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty' + || ( + github.event_name == 'pull_request' + && !contains(github.event.pull_request.body, '[skip ci]') + && !contains(github.event.pull_request.body, '[skip community_build]') + && contains(github.event.pull_request.body, '[test_forward_compat]') + ) || ( github.event_name == 'workflow_dispatch' && github.repository == 'lampepfl/dotty' diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index 2f32e4eff341..b94844f92d55 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -545,25 +545,36 @@ trait ParallelTesting extends RunnerOrchestration { self => diagnostics.reverse protected def compileWithOtherCompiler(compiler: String, files: Array[JFile], flags: TestFlags, targetDir: JFile): TestReporter = - val compilerDir = getCompiler(compiler).toString + def artifactClasspath(organizationName: String, moduleName: String) = + import coursier._ + val dep = Dependency( + Module( + Organization(organizationName), + ModuleName(moduleName), + attributes = Map.empty + ), + version = compiler + ) + Fetch() + .addDependencies(dep) + .run() + .mkString(JFile.pathSeparator) - def substituteClasspath(old: String): String = - old.split(JFile.pathSeparator).map { o => - if JFile(o) == JFile(Properties.dottyLibrary) then s"$compilerDir/lib/scala3-library_3-$compiler.jar" - else o - }.mkString(JFile.pathSeparator) + val stdlibClasspath = artifactClasspath("org.scala-lang", "scala3-library_3") + val scalacClasspath = artifactClasspath("org.scala-lang", "scala3-compiler_3") val pageWidth = TestConfiguration.pageWidth - 20 - val flags1 = flags.copy(defaultClassPath = substituteClasspath(flags.defaultClassPath)) + val flags1 = flags.copy(defaultClassPath = stdlibClasspath) .withClasspath(targetDir.getPath) .and("-d", targetDir.getPath) .and("-pagewidth", pageWidth.toString) - val reporter = TestReporter.reporter(realStdout, logLevel = - if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR) - - val command = Array(compilerDir + "/bin/scalac") ++ flags1.all ++ files.map(_.getPath) + val scalacCommand = Array("java", "-cp", scalacClasspath, "dotty.tools.dotc.Main") + val command = scalacCommand ++ flags1.all ++ files.map(_.getAbsolutePath) val process = Runtime.getRuntime.exec(command) + + val reporter = TestReporter.reporter(realStdout, logLevel = + if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR) val errorsText = Source.fromInputStream(process.getErrorStream).mkString if process.waitFor() != 0 then val diagnostics = parseErrors(errorsText, compiler, pageWidth) @@ -1445,22 +1456,4 @@ object ParallelTesting { def isTastyFile(f: JFile): Boolean = f.getName.endsWith(".tasty") - def getCompiler(version: String): JFile = - val dir = cache.resolve(s"scala3-${version}").toFile - synchronized { - if dir.exists then - dir - else - import scala.sys.process._ - val archivePath = cache.resolve(s"scala3-$version.tar.gz") - val compilerDownloadUrl = s"https://github.com/lampepfl/dotty/releases/download/$version/scala3-$version.tar.gz" - (URL(compilerDownloadUrl) #>> archivePath.toFile #&& s"tar -xf $archivePath -C $cache").!! - archivePath.toFile.delete() - dir - } - - private lazy val cache = - val dir = Properties.testCache.resolve("compilers") - dir.toFile.mkdirs() - dir } diff --git a/project/Build.scala b/project/Build.scala index cb8706a56019..07bbf72e3785 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -516,7 +516,8 @@ object Build { Dependencies.oldCompilerInterface, // we stick to the old version to avoid deprecation warnings "org.jline" % "jline-reader" % "3.19.0", // used by the REPL "org.jline" % "jline-terminal" % "3.19.0", - "org.jline" % "jline-terminal-jna" % "3.19.0" // needed for Windows + "org.jline" % "jline-terminal-jna" % "3.19.0", // needed for Windows + ("io.get-coursier" %% "coursier" % "2.0.16" % Test).cross(CrossVersion.for3Use2_13), ), // For convenience, change the baseDirectory when running the compiler From e285014cb001196c183ff93baa0bb7e16a01dec9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 21 Jan 2022 11:19:04 -0800 Subject: [PATCH 1073/1244] suppress warning when compiling sbt bridge --- sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java b/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java index 4a170af85c88..be5e176abeef 100644 --- a/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java +++ b/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java @@ -11,6 +11,10 @@ import xsbti.Position; import xsbti.Severity; +// sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java:14:1: dotty$tools$dotc$reporting$UniqueMessagePositions$$positions() in dotty.tools.dotc.reporting.AbstractReporter implements dotty$tools$dotc$reporting$UniqueMessagePositions$$positions() in dotty.tools.dotc.reporting.UniqueMessagePositions +// return type requires unchecked conversion from scala.collection.mutable.HashMap to scala.collection.mutable.HashMap,dotty.tools.dotc.reporting.Diagnostic> +@SuppressWarnings("unchecked") + final public class DelegatingReporter extends AbstractReporter { private xsbti.Reporter delegate; From 30dd3944337bea7fcbcf1f0cd9c1989e6ee87887 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Tue, 25 Jan 2022 14:40:24 +0000 Subject: [PATCH 1074/1244] Decrease DelegatingReporter suppression zone --- .../dotc/reporting/UniqueMessagePositions.scala | 2 +- .../src/dotty/tools/xsbt/DelegatingReporter.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala b/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala index e4312f46f779..d745d8d20081 100644 --- a/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala +++ b/compiler/src/dotty/tools/dotc/reporting/UniqueMessagePositions.scala @@ -10,7 +10,7 @@ import core.Contexts._ * are suppressed, unless they are of increasing severity. */ trait UniqueMessagePositions extends Reporter { - private val positions = new mutable.HashMap[(SourceFile, Int), Diagnostic] + private val positions = new mutable.HashMap[(SourceFile, Integer), Diagnostic] /** Logs a position and returns true if it was already logged. * @note Two positions are considered identical for logging if they have the same point. diff --git a/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java b/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java index be5e176abeef..6bf161fafebf 100644 --- a/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java +++ b/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java @@ -3,18 +3,18 @@ */ package dotty.tools.xsbt; +import scala.Tuple2; +import scala.collection.mutable.HashMap; + import dotty.tools.dotc.core.Contexts.Context; import dotty.tools.dotc.reporting.AbstractReporter; import dotty.tools.dotc.reporting.Diagnostic; import dotty.tools.dotc.reporting.Message; +import dotty.tools.dotc.util.SourceFile; import dotty.tools.dotc.util.SourcePosition; import xsbti.Position; import xsbti.Severity; -// sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java:14:1: dotty$tools$dotc$reporting$UniqueMessagePositions$$positions() in dotty.tools.dotc.reporting.AbstractReporter implements dotty$tools$dotc$reporting$UniqueMessagePositions$$positions() in dotty.tools.dotc.reporting.UniqueMessagePositions -// return type requires unchecked conversion from scala.collection.mutable.HashMap to scala.collection.mutable.HashMap,dotty.tools.dotc.reporting.Diagnostic> -@SuppressWarnings("unchecked") - final public class DelegatingReporter extends AbstractReporter { private xsbti.Reporter delegate; @@ -66,4 +66,11 @@ private static Position positionOf(SourcePosition pos) { return PositionBridge.noPosition; } } + + @SuppressWarnings("unchecked") + // [warn] sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java:18:1: dotty$tools$dotc$reporting$UniqueMessagePositions$$positions() in dotty.tools.dotc.reporting.AbstractReporter implements dotty$tools$dotc$reporting$UniqueMessagePositions$$positions() in dotty.tools.dotc.reporting.UniqueMessagePositions + // [warn] return type requires unchecked conversion from scala.collection.mutable.HashMap to scala.collection.mutable.HashMap,dotty.tools.dotc.reporting.Diagnostic> + public HashMap, Diagnostic> dotty$tools$dotc$reporting$UniqueMessagePositions$$positions() { + return (HashMap, Diagnostic>) super.dotty$tools$dotc$reporting$UniqueMessagePositions$$positions(); + } } From de3294bbe961e7cfd481844f7609550df465185b Mon Sep 17 00:00:00 2001 From: Xavientois Date: Tue, 18 Jan 2022 13:16:26 -0500 Subject: [PATCH 1075/1244] Update wording of uninitialized value error to be grammatically correct. - Instead of "May only use initialized value as arguments." it now says "Only initialized values may be used as arguments." Review by @liufengyun --- compiler/src/dotty/tools/dotc/transform/init/Semantic.scala | 2 +- tests/init/neg/closureLeak.check | 6 +++--- tests/init/neg/default-this.check | 4 ++-- tests/init/neg/promotion-loop.check | 4 ++-- tests/init/neg/t3273.check | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala index fba7a6d531b1..417da68a3380 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala @@ -1042,7 +1042,7 @@ object Semantic { /** Utility definition used for better error-reporting of argument errors */ case class ArgInfo(value: Value, source: Tree) { - def promote: Contextual[List[Error]] = value.promote("May only use initialized value as arguments", source) + def promote: Contextual[List[Error]] = value.promote("Only initialized values may be used as arguments", source) } /** Evaluate an expression with the given value for `this` in a given class `klass` diff --git a/tests/init/neg/closureLeak.check b/tests/init/neg/closureLeak.check index a3da10ebbcc4..cd75987b8f76 100644 --- a/tests/init/neg/closureLeak.check +++ b/tests/init/neg/closureLeak.check @@ -1,7 +1,7 @@ -- Error: tests/init/neg/closureLeak.scala:11:14 ----------------------------------------------------------------------- 11 | l.foreach(a => a.addX(this)) // error | ^^^^^^^^^^^^^^^^^ - | Cannot prove that the value is fully initialized. May only use initialized value as arguments. + | Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments. | - | The unsafe promotion may cause the following problem: - | Cannot prove that the value is fully initialized. May only use initialized value as arguments. + | The unsafe promotion may cause the following problem: + | Cannot prove that the value is fully initialized. Only initialized values may be used as arguments. diff --git a/tests/init/neg/default-this.check b/tests/init/neg/default-this.check index de8ab00ecdc6..b9a74db0dc95 100644 --- a/tests/init/neg/default-this.check +++ b/tests/init/neg/default-this.check @@ -1,5 +1,5 @@ -- Error: tests/init/neg/default-this.scala:9:8 ------------------------------------------------------------------------ 9 | compare() // error | ^^^^^^^ - | Cannot prove that the value is fully initialized. May only use initialized value as arguments. Calling trace: - | -> val result = updateThenCompare(5) [ default-this.scala:11 ] + |Cannot prove that the value is fully initialized. Only initialized values may be used as arguments. Calling trace: + | -> val result = updateThenCompare(5) [ default-this.scala:11 ] diff --git a/tests/init/neg/promotion-loop.check b/tests/init/neg/promotion-loop.check index a8efbfac6692..4ed16ee3ea37 100644 --- a/tests/init/neg/promotion-loop.check +++ b/tests/init/neg/promotion-loop.check @@ -1,7 +1,7 @@ -- Error: tests/init/neg/promotion-loop.scala:16:10 -------------------------------------------------------------------- 16 | println(b) // error | ^ - | Cannot prove that the value is fully initialized. May only use initialized value as arguments. + | Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments. | | The unsafe promotion may cause the following problem: - | Cannot prove that the value is fully initialized. May only use initialized value as arguments. + | Cannot prove that the value is fully initialized. Only initialized values may be used as arguments. diff --git a/tests/init/neg/t3273.check b/tests/init/neg/t3273.check index 3b9c5d280a5f..ca8b7f4dc9ad 100644 --- a/tests/init/neg/t3273.check +++ b/tests/init/neg/t3273.check @@ -1,7 +1,7 @@ -- Error: tests/init/neg/t3273.scala:4:42 ------------------------------------------------------------------------------ 4 | val num1: LazyList[Int] = 1 #:: num1.map(_ + 1) // error | ^^^^^^^^^^^^^^^ - | Cannot prove that the value is fully initialized. May only use initialized value as arguments. + | Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments. | | The unsafe promotion may cause the following problem: | Access non-initialized value num1. Calling trace: @@ -9,7 +9,7 @@ -- Error: tests/init/neg/t3273.scala:5:61 ------------------------------------------------------------------------------ 5 | val num2: LazyList[Int] = 1 #:: num2.iterator.map(_ + 1).to(LazyList) // error | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | Cannot prove that the value is fully initialized. May only use initialized value as arguments. + | Cannot prove that the value is fully-initialized. Only initialized values may be used as arguments. | | The unsafe promotion may cause the following problem: | Access non-initialized value num2. Calling trace: From 904a16ff1b949d7d9a56eb28efed553eb2bb4d18 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 14 Jan 2022 10:17:04 +0000 Subject: [PATCH 1076/1244] tests: Allow "//scalac: args" --- compiler/test/dotty/tools/utils.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala index f4cefbdc07fc..4a9256ec1207 100644 --- a/compiler/test/dotty/tools/utils.scala +++ b/compiler/test/dotty/tools/utils.scala @@ -58,7 +58,8 @@ def toolArgsParse(lines: List[String]): List[String] = { val endc = "*" + "/" // be forgiving of /* scalac: ... */ def stripped(s: String) = s.substring(s.indexOf(tag) + tag.length).stripSuffix(endc) val args = lines.to(LazyList).take(10).filter { s => - s.contains("// " + tag) + s.contains("//" + tag) + || s.contains("// " + tag) || s.contains("/* " + tag) || s.contains(" * " + tag) // but avoid picking up comments like "% scalac ./a.scala" and "$ scalac a.scala" From 06d8e1a093d07d99b8d31d1239952e0ab981d2c8 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 14 Jan 2022 10:17:23 +0000 Subject: [PATCH 1077/1244] tests: Read tool args in test files --- compiler/test/dotty/tools/utils.scala | 5 +++-- .../test/dotty/tools/vulpix/ParallelTesting.scala | 15 +++++++++++---- tests/neg/literals.scala | 2 +- tests/run/1938-2.scala | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala index 4a9256ec1207..c70dbf3456cb 100644 --- a/compiler/test/dotty/tools/utils.scala +++ b/compiler/test/dotty/tools/utils.scala @@ -2,6 +2,7 @@ package dotty package tools import java.io.File +import java.nio.charset.Charset import java.nio.charset.StandardCharsets.UTF_8 import java.nio.file.{Files, Path => JPath} @@ -45,8 +46,8 @@ def assertThrows[T <: Throwable: ClassTag](p: T => Boolean)(body: => Any): Unit case NonFatal(other) => throw AssertionError(s"Wrong exception: expected ${implicitly[ClassTag[T]]} but was ${other.getClass.getName}").tap(_.addSuppressed(other)) end assertThrows -def toolArgsFor(files: List[JPath]): List[String] = - files.flatMap(path => toolArgsParse(Files.lines(path, UTF_8).limit(10).toScala(List))) +def toolArgsFor(files: List[JPath], charset: Charset = UTF_8): List[String] = + files.flatMap(path => toolArgsParse(Files.lines(path, charset).limit(10).toScala(List))) // Inspect the first 10 of the given lines for compiler options of the form // `// scalac: args`, `/* scalac: args`, ` * scalac: args`. diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index b94844f92d55..a497eed7072e 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -7,7 +7,7 @@ import java.lang.System.{lineSeparator => EOL} import java.net.URL import java.nio.file.StandardCopyOption.REPLACE_EXISTING import java.nio.file.{Files, NoSuchFileException, Path, Paths} -import java.nio.charset.StandardCharsets +import java.nio.charset.{Charset, StandardCharsets} import java.text.SimpleDateFormat import java.util.{HashMap, Timer, TimerTask} import java.util.concurrent.{TimeUnit, TimeoutException, Executors => JExecutors} @@ -445,15 +445,17 @@ trait ParallelTesting extends RunnerOrchestration { self => throw e protected def compile(files0: Array[JFile], flags0: TestFlags, suppressErrors: Boolean, targetDir: JFile): TestReporter = { - val flags = flags0.and("-d", targetDir.getPath) - .withClasspath(targetDir.getPath) - def flattenFiles(f: JFile): Array[JFile] = if (f.isDirectory) f.listFiles.flatMap(flattenFiles) else Array(f) val files: Array[JFile] = files0.flatMap(flattenFiles) + val flags = flags0 + .and(toolArgsFor(files.toList.map(_.toPath), getCharsetFromEncodingOpt(flags0)): _*) + .and("-d", targetDir.getPath) + .withClasspath(targetDir.getPath) + def compileWithJavac(fs: Array[String]) = if (fs.nonEmpty) { val fullArgs = Array( "javac", @@ -1442,6 +1444,11 @@ trait ParallelTesting extends RunnerOrchestration { self => // Create a CompilationTest and let the user decide whether to execute a pos or a neg test new CompilationTest(targets) } + + private def getCharsetFromEncodingOpt(flags: TestFlags) = + flags.options.sliding(2).collectFirst { + case Array("-encoding", encoding) => Charset.forName(encoding) + }.getOrElse(StandardCharsets.UTF_8) } object ParallelTesting { diff --git a/tests/neg/literals.scala b/tests/neg/literals.scala index 4b847a74df66..8e062c19351b 100644 --- a/tests/neg/literals.scala +++ b/tests/neg/literals.scala @@ -2,7 +2,7 @@ trait RejectedLiterals { def missingHex: Int = { 0x } // error: invalid literal number } /* -// scalac: -Ywarn-octal-literal -Xfatal-warnings -deprecation +// nsc: -Ywarn-octal-literal -Xfatal-warnings -deprecation trait RejectedLiterals { def missingHex: Int = { 0x } // line 4: was: not reported, taken as zero diff --git a/tests/run/1938-2.scala b/tests/run/1938-2.scala index 32e4c4518b96..143a94705455 100644 --- a/tests/run/1938-2.scala +++ b/tests/run/1938-2.scala @@ -1,6 +1,6 @@ object ProdNonEmpty { def _1: Int = 0 - def _2: String = "???" // Slight variation with scalac: this test passes + def _2: String = "???" // Slight variation with nsc: this test passes // with ??? here. I think dotty behavior is fine // according to the spec given that methods involved // in pattern matching should be pure. From e62006698010d62d70382f9a6cfddd004ece3b02 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 20 Jan 2022 11:18:46 +0100 Subject: [PATCH 1078/1244] Add forward compat tests for macros --- .../forwardCompat-3.0/Macro_1_c3.0.0.scala | 20 +++++++++++++++++++ .../pos-macros/forwardCompat-3.0/Test_2.scala | 15 ++++++++++++++ .../forwardCompat-3.1/Macro_1_c3.1.0.scala | 20 +++++++++++++++++++ .../pos-macros/forwardCompat-3.1/Test_2.scala | 15 ++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 tests/pos-macros/forwardCompat-3.0/Macro_1_c3.0.0.scala create mode 100644 tests/pos-macros/forwardCompat-3.0/Test_2.scala create mode 100644 tests/pos-macros/forwardCompat-3.1/Macro_1_c3.1.0.scala create mode 100644 tests/pos-macros/forwardCompat-3.1/Test_2.scala diff --git a/tests/pos-macros/forwardCompat-3.0/Macro_1_c3.0.0.scala b/tests/pos-macros/forwardCompat-3.0/Macro_1_c3.0.0.scala new file mode 100644 index 000000000000..fb06e93f91c0 --- /dev/null +++ b/tests/pos-macros/forwardCompat-3.0/Macro_1_c3.0.0.scala @@ -0,0 +1,20 @@ +import scala.quoted.* + +object Macros: + + inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) } + + private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] = + unrolledPowerCode(x, n.valueOrError) + + private def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] = + if n == 0 then '{ 1.0 } // tests simple quotes without splices + else if n % 2 == 1 then '{ $x * ${ unrolledPowerCode(x, n - 1) } } // tests simple splices + else '{ val y = $x * $x; ${ unrolledPowerCode('y, n / 2) } } // tests splice with term capture + + + inline def let[T, U](x: T)(inline body: T => U): U = ${ letCode('x, 'body) } + + private def letCode[T: Type, U: Type](x: Expr[T], body: Expr[T => U])(using Quotes): Expr[U] = + // tests use of Type + '{ val y: T = $x; $body(y): U } diff --git a/tests/pos-macros/forwardCompat-3.0/Test_2.scala b/tests/pos-macros/forwardCompat-3.0/Test_2.scala new file mode 100644 index 000000000000..8c0a8004b9cf --- /dev/null +++ b/tests/pos-macros/forwardCompat-3.0/Test_2.scala @@ -0,0 +1,15 @@ +import Macros.* + +def powerTest(x: Double): Unit = + power(x, 0) + power(x, 1) + power(x, 5) + power(x, 10) + +def letTest: Unit = + let(0) { _ + 1 } + let(0) { _.toString } + let((4, 'a')) { _.swap } + let(new Foo) { _.hashCode } + +class Foo diff --git a/tests/pos-macros/forwardCompat-3.1/Macro_1_c3.1.0.scala b/tests/pos-macros/forwardCompat-3.1/Macro_1_c3.1.0.scala new file mode 100644 index 000000000000..fb06e93f91c0 --- /dev/null +++ b/tests/pos-macros/forwardCompat-3.1/Macro_1_c3.1.0.scala @@ -0,0 +1,20 @@ +import scala.quoted.* + +object Macros: + + inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) } + + private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] = + unrolledPowerCode(x, n.valueOrError) + + private def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] = + if n == 0 then '{ 1.0 } // tests simple quotes without splices + else if n % 2 == 1 then '{ $x * ${ unrolledPowerCode(x, n - 1) } } // tests simple splices + else '{ val y = $x * $x; ${ unrolledPowerCode('y, n / 2) } } // tests splice with term capture + + + inline def let[T, U](x: T)(inline body: T => U): U = ${ letCode('x, 'body) } + + private def letCode[T: Type, U: Type](x: Expr[T], body: Expr[T => U])(using Quotes): Expr[U] = + // tests use of Type + '{ val y: T = $x; $body(y): U } diff --git a/tests/pos-macros/forwardCompat-3.1/Test_2.scala b/tests/pos-macros/forwardCompat-3.1/Test_2.scala new file mode 100644 index 000000000000..8c0a8004b9cf --- /dev/null +++ b/tests/pos-macros/forwardCompat-3.1/Test_2.scala @@ -0,0 +1,15 @@ +import Macros.* + +def powerTest(x: Double): Unit = + power(x, 0) + power(x, 1) + power(x, 5) + power(x, 10) + +def letTest: Unit = + let(0) { _ + 1 } + let(0) { _.toString } + let((4, 'a')) { _.swap } + let(new Foo) { _.hashCode } + +class Foo From de12bde599d6674797dfe18eef835c80b71d639b Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 20 Jan 2022 11:59:21 +0100 Subject: [PATCH 1079/1244] Add backwards compat tests for macros --- .../backwardCompat-3.0/Macro_1_r3.0.scala | 20 +++++++++++++++++++ .../backwardCompat-3.0/Test_2_c3.0.0.scala | 15 ++++++++++++++ .../backwardCompat-3.1/Macro_1_r3.1.scala | 20 +++++++++++++++++++ .../backwardCompat-3.1/Test_2_c3.1.0.scala | 15 ++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 tests/pos-macros/backwardCompat-3.0/Macro_1_r3.0.scala create mode 100644 tests/pos-macros/backwardCompat-3.0/Test_2_c3.0.0.scala create mode 100644 tests/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala create mode 100644 tests/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala diff --git a/tests/pos-macros/backwardCompat-3.0/Macro_1_r3.0.scala b/tests/pos-macros/backwardCompat-3.0/Macro_1_r3.0.scala new file mode 100644 index 000000000000..fb06e93f91c0 --- /dev/null +++ b/tests/pos-macros/backwardCompat-3.0/Macro_1_r3.0.scala @@ -0,0 +1,20 @@ +import scala.quoted.* + +object Macros: + + inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) } + + private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] = + unrolledPowerCode(x, n.valueOrError) + + private def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] = + if n == 0 then '{ 1.0 } // tests simple quotes without splices + else if n % 2 == 1 then '{ $x * ${ unrolledPowerCode(x, n - 1) } } // tests simple splices + else '{ val y = $x * $x; ${ unrolledPowerCode('y, n / 2) } } // tests splice with term capture + + + inline def let[T, U](x: T)(inline body: T => U): U = ${ letCode('x, 'body) } + + private def letCode[T: Type, U: Type](x: Expr[T], body: Expr[T => U])(using Quotes): Expr[U] = + // tests use of Type + '{ val y: T = $x; $body(y): U } diff --git a/tests/pos-macros/backwardCompat-3.0/Test_2_c3.0.0.scala b/tests/pos-macros/backwardCompat-3.0/Test_2_c3.0.0.scala new file mode 100644 index 000000000000..8c0a8004b9cf --- /dev/null +++ b/tests/pos-macros/backwardCompat-3.0/Test_2_c3.0.0.scala @@ -0,0 +1,15 @@ +import Macros.* + +def powerTest(x: Double): Unit = + power(x, 0) + power(x, 1) + power(x, 5) + power(x, 10) + +def letTest: Unit = + let(0) { _ + 1 } + let(0) { _.toString } + let((4, 'a')) { _.swap } + let(new Foo) { _.hashCode } + +class Foo diff --git a/tests/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala b/tests/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala new file mode 100644 index 000000000000..fb06e93f91c0 --- /dev/null +++ b/tests/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala @@ -0,0 +1,20 @@ +import scala.quoted.* + +object Macros: + + inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) } + + private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] = + unrolledPowerCode(x, n.valueOrError) + + private def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] = + if n == 0 then '{ 1.0 } // tests simple quotes without splices + else if n % 2 == 1 then '{ $x * ${ unrolledPowerCode(x, n - 1) } } // tests simple splices + else '{ val y = $x * $x; ${ unrolledPowerCode('y, n / 2) } } // tests splice with term capture + + + inline def let[T, U](x: T)(inline body: T => U): U = ${ letCode('x, 'body) } + + private def letCode[T: Type, U: Type](x: Expr[T], body: Expr[T => U])(using Quotes): Expr[U] = + // tests use of Type + '{ val y: T = $x; $body(y): U } diff --git a/tests/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala b/tests/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala new file mode 100644 index 000000000000..8c0a8004b9cf --- /dev/null +++ b/tests/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala @@ -0,0 +1,15 @@ +import Macros.* + +def powerTest(x: Double): Unit = + power(x, 0) + power(x, 1) + power(x, 5) + power(x, 10) + +def letTest: Unit = + let(0) { _ + 1 } + let(0) { _.toString } + let((4, 'a')) { _.swap } + let(new Foo) { _.hashCode } + +class Foo From 2cdbb55a7ff187461946071d9f51ae07387a07ca Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 20 Jan 2022 13:06:28 +0100 Subject: [PATCH 1080/1244] Add version of compat test that compiles on current version --- tests/pos-macros/baseCompat/Macro_1.scala | 20 ++++++++++++++++++++ tests/pos-macros/baseCompat/Test_2.scala | 15 +++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 tests/pos-macros/baseCompat/Macro_1.scala create mode 100644 tests/pos-macros/baseCompat/Test_2.scala diff --git a/tests/pos-macros/baseCompat/Macro_1.scala b/tests/pos-macros/baseCompat/Macro_1.scala new file mode 100644 index 000000000000..fb06e93f91c0 --- /dev/null +++ b/tests/pos-macros/baseCompat/Macro_1.scala @@ -0,0 +1,20 @@ +import scala.quoted.* + +object Macros: + + inline def power(x: Double, inline n: Int) = ${ powerCode('x, 'n) } + + private def powerCode(x: Expr[Double], n: Expr[Int])(using Quotes): Expr[Double] = + unrolledPowerCode(x, n.valueOrError) + + private def unrolledPowerCode(x: Expr[Double], n: Int)(using Quotes): Expr[Double] = + if n == 0 then '{ 1.0 } // tests simple quotes without splices + else if n % 2 == 1 then '{ $x * ${ unrolledPowerCode(x, n - 1) } } // tests simple splices + else '{ val y = $x * $x; ${ unrolledPowerCode('y, n / 2) } } // tests splice with term capture + + + inline def let[T, U](x: T)(inline body: T => U): U = ${ letCode('x, 'body) } + + private def letCode[T: Type, U: Type](x: Expr[T], body: Expr[T => U])(using Quotes): Expr[U] = + // tests use of Type + '{ val y: T = $x; $body(y): U } diff --git a/tests/pos-macros/baseCompat/Test_2.scala b/tests/pos-macros/baseCompat/Test_2.scala new file mode 100644 index 000000000000..8c0a8004b9cf --- /dev/null +++ b/tests/pos-macros/baseCompat/Test_2.scala @@ -0,0 +1,15 @@ +import Macros.* + +def powerTest(x: Double): Unit = + power(x, 0) + power(x, 1) + power(x, 5) + power(x, 10) + +def letTest: Unit = + let(0) { _ + 1 } + let(0) { _.toString } + let((4, 'a')) { _.swap } + let(new Foo) { _.hashCode } + +class Foo From e96511491ea4efd730feeddc390a7ba4325f2335 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 20 Jan 2022 14:10:52 +0100 Subject: [PATCH 1081/1244] Disable tests/pos-macros/backwardCompat-3.1 Because of #14306 --- .../pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala | 0 .../pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala | 0 tests/disabled/pos-macros/backwardCompat-3.1/why.md | 1 + tests/pos/mytest/A_1_r3.1.scala | 1 + tests/pos/mytest/B_2_c3.1.0.scala | 1 + 5 files changed, 3 insertions(+) rename tests/{ => disabled}/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala (100%) rename tests/{ => disabled}/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala (100%) create mode 100644 tests/disabled/pos-macros/backwardCompat-3.1/why.md create mode 100644 tests/pos/mytest/A_1_r3.1.scala create mode 100644 tests/pos/mytest/B_2_c3.1.0.scala diff --git a/tests/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala b/tests/disabled/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala similarity index 100% rename from tests/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala rename to tests/disabled/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala diff --git a/tests/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala b/tests/disabled/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala similarity index 100% rename from tests/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala rename to tests/disabled/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala diff --git a/tests/disabled/pos-macros/backwardCompat-3.1/why.md b/tests/disabled/pos-macros/backwardCompat-3.1/why.md new file mode 100644 index 000000000000..f281f9c08662 --- /dev/null +++ b/tests/disabled/pos-macros/backwardCompat-3.1/why.md @@ -0,0 +1 @@ +Disabled until https://github.com/lampepfl/dotty/issues/14306 is fixed diff --git a/tests/pos/mytest/A_1_r3.1.scala b/tests/pos/mytest/A_1_r3.1.scala new file mode 100644 index 000000000000..c389887ee5aa --- /dev/null +++ b/tests/pos/mytest/A_1_r3.1.scala @@ -0,0 +1 @@ +class Foo diff --git a/tests/pos/mytest/B_2_c3.1.0.scala b/tests/pos/mytest/B_2_c3.1.0.scala new file mode 100644 index 000000000000..458d393cfa09 --- /dev/null +++ b/tests/pos/mytest/B_2_c3.1.0.scala @@ -0,0 +1 @@ +class Bar extends Foo From 4334dcaf8ffe12edbe0a1319392cce50425c8121 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 21 Jan 2022 08:36:11 +0100 Subject: [PATCH 1082/1244] Remove #14306 test --- tests/pos/mytest/A_1_r3.1.scala | 1 - tests/pos/mytest/B_2_c3.1.0.scala | 1 - 2 files changed, 2 deletions(-) delete mode 100644 tests/pos/mytest/A_1_r3.1.scala delete mode 100644 tests/pos/mytest/B_2_c3.1.0.scala diff --git a/tests/pos/mytest/A_1_r3.1.scala b/tests/pos/mytest/A_1_r3.1.scala deleted file mode 100644 index c389887ee5aa..000000000000 --- a/tests/pos/mytest/A_1_r3.1.scala +++ /dev/null @@ -1 +0,0 @@ -class Foo diff --git a/tests/pos/mytest/B_2_c3.1.0.scala b/tests/pos/mytest/B_2_c3.1.0.scala deleted file mode 100644 index 458d393cfa09..000000000000 --- a/tests/pos/mytest/B_2_c3.1.0.scala +++ /dev/null @@ -1 +0,0 @@ -class Bar extends Foo From b4ee5842aa05cd092a058e0d9803dceac1d2a1c8 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Wed, 26 Jan 2022 11:48:17 +0100 Subject: [PATCH 1083/1244] Reverse test naming backward/forward --- .../{backwardCompat-3.1 => forwardCompat-3.1}/Macro_1_r3.1.scala | 0 .../{backwardCompat-3.1 => forwardCompat-3.1}/Test_2_c3.1.0.scala | 0 .../pos-macros/{backwardCompat-3.1 => forwardCompat-3.1}/why.md | 0 .../Macro_1_c3.0.0.scala | 0 .../{forwardCompat-3.0 => backwardCompat-3.0}/Test_2.scala | 0 .../Macro_1_c3.1.0.scala | 0 .../{forwardCompat-3.1 => backwardCompat-3.1}/Test_2.scala | 0 .../{backwardCompat-3.0 => forwardCompat-3.0}/Macro_1_r3.0.scala | 0 .../{backwardCompat-3.0 => forwardCompat-3.0}/Test_2_c3.0.0.scala | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename tests/disabled/pos-macros/{backwardCompat-3.1 => forwardCompat-3.1}/Macro_1_r3.1.scala (100%) rename tests/disabled/pos-macros/{backwardCompat-3.1 => forwardCompat-3.1}/Test_2_c3.1.0.scala (100%) rename tests/disabled/pos-macros/{backwardCompat-3.1 => forwardCompat-3.1}/why.md (100%) rename tests/pos-macros/{forwardCompat-3.0 => backwardCompat-3.0}/Macro_1_c3.0.0.scala (100%) rename tests/pos-macros/{forwardCompat-3.0 => backwardCompat-3.0}/Test_2.scala (100%) rename tests/pos-macros/{forwardCompat-3.1 => backwardCompat-3.1}/Macro_1_c3.1.0.scala (100%) rename tests/pos-macros/{forwardCompat-3.1 => backwardCompat-3.1}/Test_2.scala (100%) rename tests/pos-macros/{backwardCompat-3.0 => forwardCompat-3.0}/Macro_1_r3.0.scala (100%) rename tests/pos-macros/{backwardCompat-3.0 => forwardCompat-3.0}/Test_2_c3.0.0.scala (100%) diff --git a/tests/disabled/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala b/tests/disabled/pos-macros/forwardCompat-3.1/Macro_1_r3.1.scala similarity index 100% rename from tests/disabled/pos-macros/backwardCompat-3.1/Macro_1_r3.1.scala rename to tests/disabled/pos-macros/forwardCompat-3.1/Macro_1_r3.1.scala diff --git a/tests/disabled/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala b/tests/disabled/pos-macros/forwardCompat-3.1/Test_2_c3.1.0.scala similarity index 100% rename from tests/disabled/pos-macros/backwardCompat-3.1/Test_2_c3.1.0.scala rename to tests/disabled/pos-macros/forwardCompat-3.1/Test_2_c3.1.0.scala diff --git a/tests/disabled/pos-macros/backwardCompat-3.1/why.md b/tests/disabled/pos-macros/forwardCompat-3.1/why.md similarity index 100% rename from tests/disabled/pos-macros/backwardCompat-3.1/why.md rename to tests/disabled/pos-macros/forwardCompat-3.1/why.md diff --git a/tests/pos-macros/forwardCompat-3.0/Macro_1_c3.0.0.scala b/tests/pos-macros/backwardCompat-3.0/Macro_1_c3.0.0.scala similarity index 100% rename from tests/pos-macros/forwardCompat-3.0/Macro_1_c3.0.0.scala rename to tests/pos-macros/backwardCompat-3.0/Macro_1_c3.0.0.scala diff --git a/tests/pos-macros/forwardCompat-3.0/Test_2.scala b/tests/pos-macros/backwardCompat-3.0/Test_2.scala similarity index 100% rename from tests/pos-macros/forwardCompat-3.0/Test_2.scala rename to tests/pos-macros/backwardCompat-3.0/Test_2.scala diff --git a/tests/pos-macros/forwardCompat-3.1/Macro_1_c3.1.0.scala b/tests/pos-macros/backwardCompat-3.1/Macro_1_c3.1.0.scala similarity index 100% rename from tests/pos-macros/forwardCompat-3.1/Macro_1_c3.1.0.scala rename to tests/pos-macros/backwardCompat-3.1/Macro_1_c3.1.0.scala diff --git a/tests/pos-macros/forwardCompat-3.1/Test_2.scala b/tests/pos-macros/backwardCompat-3.1/Test_2.scala similarity index 100% rename from tests/pos-macros/forwardCompat-3.1/Test_2.scala rename to tests/pos-macros/backwardCompat-3.1/Test_2.scala diff --git a/tests/pos-macros/backwardCompat-3.0/Macro_1_r3.0.scala b/tests/pos-macros/forwardCompat-3.0/Macro_1_r3.0.scala similarity index 100% rename from tests/pos-macros/backwardCompat-3.0/Macro_1_r3.0.scala rename to tests/pos-macros/forwardCompat-3.0/Macro_1_r3.0.scala diff --git a/tests/pos-macros/backwardCompat-3.0/Test_2_c3.0.0.scala b/tests/pos-macros/forwardCompat-3.0/Test_2_c3.0.0.scala similarity index 100% rename from tests/pos-macros/backwardCompat-3.0/Test_2_c3.0.0.scala rename to tests/pos-macros/forwardCompat-3.0/Test_2_c3.0.0.scala From bb225d694c2a0e3e2c031f3cfdeabb54de671f08 Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Wed, 26 Jan 2022 11:33:27 +0100 Subject: [PATCH 1084/1244] Fix #13855: Add regression test --- tests/pos/13855.scala | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tests/pos/13855.scala diff --git a/tests/pos/13855.scala b/tests/pos/13855.scala new file mode 100644 index 000000000000..7c093ed98409 --- /dev/null +++ b/tests/pos/13855.scala @@ -0,0 +1,13 @@ +type A[X] = X match + case Int => Int + case _ => B[X] + +def a[X](x: X): A[X] = x match + case v: Int => v + case _ => b(x) + +type B[X] = X match + case String => String + +def b[X](x: X): B[X] = x match + case v: String => v From 0fe4dedb6f02d8d5d2526deb7845a396bbc3db9e Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Tue, 25 Jan 2022 15:44:30 +0100 Subject: [PATCH 1085/1244] Avoid unnecessary under-constrained implicit searches In some situations we only call `constrainResult` for its side-effects and ignore its result, but `constrainResult` calls `necessarilyCompatible` which will call `viewExists` as a last-try. Since `viewExists` doesn't have side-effects we might as well skip it, and it turns out that using `NoViewsAllowed.constrainResult` does exactly that. This leads to a significant speed-up (from ~8s to sub-second with a hot compiler) with the test case from #14333 (most likely this is because at the point where we call `constrainResult` we haven't accumulated any constraint from the arguments of the application, so implicit search is free to go on a wild goose chase). I also removed obsolete comments in this method. Fixes #14333. --- .../dotty/tools/dotc/typer/Applications.scala | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala index 180ff505e76c..6592afe03da5 100644 --- a/compiler/src/dotty/tools/dotc/typer/Applications.scala +++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala @@ -433,15 +433,18 @@ trait Applications extends Compatibility { protected def init(): Unit = methType match { case methType: MethodType => - // apply the result type constraint, unless method type is dependent val resultApprox = resultTypeApprox(methType) - if (!constrainResult(methRef.symbol, resultApprox, resultType)) - if (ctx.typerState.isCommittable) - // defer the problem until after the application; - // it might be healed by an implicit conversion - () - else - fail(TypeMismatch(methType.resultType, resultType, None)) + val sym = methRef.symbol + if ctx.typerState.isCommittable then + // Here we call `resultType` only to accumulate constraints (even if + // it fails, we might be able to heal the expression to conform to the + // result type) so don't check for views since `viewExists` doesn't + // have any side-effect and would only slow the compiler down (cf #14333). + NoViewsAllowed.constrainResult(sym, resultApprox, resultType) + else if !constrainResult(sym, resultApprox, resultType) then + // Here we actually record that this alternative failed so that + // overloading resolution might prune it. + fail(TypeMismatch(methType.resultType, resultType, None)) // match all arguments with corresponding formal parameters matchArgs(orderedArgs, methType.paramInfos, 0) From bf76b9679f40ebae3f48db25f43e47c040202714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Fri, 21 Jan 2022 10:49:26 +0100 Subject: [PATCH 1086/1244] Fix #14240: Fix off-by-1 when emitting Scala.js IR Positions. scalac positions are 1-based, while IR positions are 0-based. There is therefore a `- 1` in the nsc plugin, that was ported over to dotc without questioning. It turns out that dotc uses 0-based positions as well (as documented in `SourceFile`), and so we should not make any adaptation there. --- .../dotty/tools/backend/sjs/JSPositions.scala | 6 +-- sbt-test/scalajs/basic/build.sbt | 45 +++++++++++++++++++ sbt-test/scalajs/basic/test | 1 + 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/backend/sjs/JSPositions.scala b/compiler/src/dotty/tools/backend/sjs/JSPositions.scala index 84b6304d60eb..454b5b5c3a5c 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSPositions.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSPositions.scala @@ -39,11 +39,11 @@ class JSPositions()(using Context) { private def sourceAndSpan2irPos(source: SourceFile, span: Span): ir.Position = { if (!span.exists) ir.Position.NoPosition else { - // dotty positions are 1-based but IR positions are 0-based + // dotty positions and IR positions are both 0-based val irSource = span2irPosCache.toIRSource(source) val point = span.point - val line = source.offsetToLine(point) - 1 - val column = source.column(point) - 1 + val line = source.offsetToLine(point) + val column = source.column(point) ir.Position(irSource, line, column) } } diff --git a/sbt-test/scalajs/basic/build.sbt b/sbt-test/scalajs/basic/build.sbt index 92c44049aeef..431f46f40fe0 100644 --- a/sbt-test/scalajs/basic/build.sbt +++ b/sbt-test/scalajs/basic/build.sbt @@ -1,3 +1,5 @@ +lazy val testIRPositions = taskKey[Unit]("test IR positions (#14240)") + enablePlugins(ScalaJSPlugin) scalaVersion := sys.props("plugin.scalaVersion") @@ -6,3 +8,46 @@ scalaVersion := sys.props("plugin.scalaVersion") libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13) scalaJSUseMainModuleInitializer := true + +// #14240 Make sure that generated IR positions are 0-based +testIRPositions := { + import scala.concurrent.{Future, _} + import scala.concurrent.ExecutionContext.Implicits.global + import scala.concurrent.duration._ + import scala.util.{Failure, Success} + + import org.scalajs.ir.Names._ + import org.scalajs.ir.Position + import org.scalajs.ir.Trees._ + import org.scalajs.linker.interface.unstable.IRFileImpl + + val ir = (Compile / scalaJSIR).value + val classNameToTest = ClassName("test.Main$") + + val classDefFuture = { + // This logic is copied from the implementation of `scalajsp` in sbt-scalajs + Future.traverse(ir.data) { irFile => + val ir = IRFileImpl.fromIRFile(irFile) + ir.entryPointsInfo.map { i => + if (i.className == classNameToTest) Success(Some(ir)) + else Success(None) + }.recover { case t => Failure(t) } + }.flatMap { irs => + irs.collectFirst { + case Success(Some(f)) => f.tree + }.getOrElse { + val t = new MessageOnlyException(s"class ${classNameToTest.nameString} not found on classpath") + irs.collect { case Failure(st) => t.addSuppressed(st) } + throw t + } + } + } + val classDef = Await.result(classDefFuture, Duration.Inf) + + def testPos(pos: Position, expectedLine: Int, expectedColumn: Int): Unit = { + if (!pos.source.getPath.endsWith("/Main.scala") || pos.line != expectedLine || pos.column != expectedColumn) + throw new MessageOnlyException(s"Expected Main.scala@$expectedLine:$expectedColumn but got $pos") + } + + testPos(classDef.pos, 5, 7) +} diff --git a/sbt-test/scalajs/basic/test b/sbt-test/scalajs/basic/test index 62ea636c177f..60e897d4bee8 100644 --- a/sbt-test/scalajs/basic/test +++ b/sbt-test/scalajs/basic/test @@ -1 +1,2 @@ > run +> testIRPositions From 7c21ea93e824351afeada355e4b00346fc7c414d Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 19 Jan 2022 09:12:57 +0100 Subject: [PATCH 1087/1244] Move elim repeated earlier This is a test --- compiler/src/dotty/tools/dotc/Compiler.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala index 14664af30c9e..d62c6b9fb4d0 100644 --- a/compiler/src/dotty/tools/dotc/Compiler.scala +++ b/compiler/src/dotty/tools/dotc/Compiler.scala @@ -67,10 +67,10 @@ class Compiler { new CheckLoopingImplicits, // Check that implicit defs do not call themselves in an infinite loop new BetaReduce, // Reduce closure applications new InlineVals, // Check right hand-sides of an `inline val`s - new ExpandSAMs) :: // Expand single abstract method closures to anonymous classes + new ExpandSAMs, // Expand single abstract method closures to anonymous classes + new ElimRepeated) :: // Rewrite vararg parameters and arguments List(new init.Checker) :: // Check initialization of objects - List(new ElimRepeated, // Rewrite vararg parameters and arguments - new ProtectedAccessors, // Add accessors for protected members + List(new ProtectedAccessors, // Add accessors for protected members new ExtensionMethods, // Expand methods of value classes with extension methods new UncacheGivenAliases, // Avoid caching RHS of simple parameterless given aliases new ByNameClosures, // Expand arguments to by-name parameters to closures From 73e06893d0f42163dd53b1c9b5cb8e6203311b37 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 19 Jan 2022 20:38:30 +0100 Subject: [PATCH 1088/1244] Update analyzer plugin --- sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala b/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala index 3d4b952644bd..170b57e35781 100644 --- a/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala +++ b/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala @@ -31,7 +31,7 @@ class InitChecker extends PluginPhase { val phaseName = "symbolTreeChecker" override val runsAfter = Set(SetDefTree.name) - override val runsBefore = Set(ElimRepeated.name) + override val runsBefore = Set(ProtectedAccessors.name) private def checkDef(tree: Tree)(implicit ctx: Context): Tree = { if (tree.symbol.defTree.isEmpty) From d4c876597ef9e71477474f611bc3f63157b119ec Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 19 Jan 2022 22:14:16 +0100 Subject: [PATCH 1089/1244] Fix import in analyzer plugin --- sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala b/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala index 170b57e35781..c1fab5c13f42 100644 --- a/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala +++ b/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala @@ -14,7 +14,7 @@ import Decorators._ import Symbols.Symbol import Constants.Constant import Types._ -import transform.ElimRepeated +import transform.ProtectedAccessors class InitPlugin extends StandardPlugin { import tpd._ From 583b712a8f5e6a9773c3d158e9038693a87aa946 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 20 Jan 2022 12:36:44 +0100 Subject: [PATCH 1090/1244] Trial: New ElimByName phase --- compiler/src/dotty/tools/dotc/Compiler.scala | 1 + .../dotty/tools/dotc/core/Definitions.scala | 20 +++ .../src/dotty/tools/dotc/core/Phases.scala | 4 + .../src/dotty/tools/dotc/core/StdNames.scala | 1 + .../dotty/tools/dotc/core/TypeComparer.scala | 8 +- .../dotc/transform/ElimByNameParams.scala | 135 ++++++++++++++++++ 6 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 compiler/src/dotty/tools/dotc/transform/ElimByNameParams.scala diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala index d62c6b9fb4d0..d416186f6359 100644 --- a/compiler/src/dotty/tools/dotc/Compiler.scala +++ b/compiler/src/dotty/tools/dotc/Compiler.scala @@ -69,6 +69,7 @@ class Compiler { new InlineVals, // Check right hand-sides of an `inline val`s new ExpandSAMs, // Expand single abstract method closures to anonymous classes new ElimRepeated) :: // Rewrite vararg parameters and arguments + List(new ElimByNameParams) :: List(new init.Checker) :: // Check initialization of objects List(new ProtectedAccessors, // Add accessors for protected members new ExtensionMethods, // Expand methods of value classes with extension methods diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 2e9c81332200..634394ef48a7 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -1082,6 +1082,24 @@ class Definitions { } } + object ByNameFunction: + def apply(tp: Type)(using Context): Type = + defn.ContextFunction0.typeRef.appliedTo(tp :: Nil) + def unapply(tp: Type)(using Context): Option[Type] = tp match + case tp @ AppliedType(tycon, arg :: Nil) if defn.isByNameFunctionClass(tycon.typeSymbol) => + Some(arg) + case tp @ AnnotatedType(parent, _) => + unapply(parent) + case _ => + None + + final def isByNameFunctionClass(sym: Symbol): Boolean = + sym eq ContextFunction0 + + def isByNameFunction(tp: Type)(using Context): Boolean = tp match + case ByNameFunction(_) => true + case _ => false + final def isCompiletime_S(sym: Symbol)(using Context): Boolean = sym.name == tpnme.S && sym.owner == CompiletimeOpsIntModuleClass @@ -1295,10 +1313,12 @@ class Definitions { ).symbol.asClass @tu lazy val Function0_apply: Symbol = Function0.requiredMethod(nme.apply) + @tu lazy val ContextFunction0_apply: Symbol = ContextFunction0.requiredMethod(nme.apply) @tu lazy val Function0: Symbol = FunctionClass(0) @tu lazy val Function1: Symbol = FunctionClass(1) @tu lazy val Function2: Symbol = FunctionClass(2) + @tu lazy val ContextFunction0: Symbol = FunctionClass(0, isContextual = true) def FunctionType(n: Int, isContextual: Boolean = false, isErased: Boolean = false)(using Context): TypeRef = FunctionClass(n, isContextual && !ctx.erasedTypes, isErased).typeRef diff --git a/compiler/src/dotty/tools/dotc/core/Phases.scala b/compiler/src/dotty/tools/dotc/core/Phases.scala index b1268d7034a9..7b893ee707c7 100644 --- a/compiler/src/dotty/tools/dotc/core/Phases.scala +++ b/compiler/src/dotty/tools/dotc/core/Phases.scala @@ -207,6 +207,7 @@ object Phases { private var myRefChecksPhase: Phase = _ private var myPatmatPhase: Phase = _ private var myElimRepeatedPhase: Phase = _ + private var myElimByNamePhase: Phase = _ private var myExtensionMethodsPhase: Phase = _ private var myExplicitOuterPhase: Phase = _ private var myGettersPhase: Phase = _ @@ -229,6 +230,7 @@ object Phases { final def refchecksPhase: Phase = myRefChecksPhase final def patmatPhase: Phase = myPatmatPhase final def elimRepeatedPhase: Phase = myElimRepeatedPhase + final def elimByNamePhase: Phase = myElimByNamePhase final def extensionMethodsPhase: Phase = myExtensionMethodsPhase final def explicitOuterPhase: Phase = myExplicitOuterPhase final def gettersPhase: Phase = myGettersPhase @@ -253,6 +255,7 @@ object Phases { myCollectNullableFieldsPhase = phaseOfClass(classOf[CollectNullableFields]) myRefChecksPhase = phaseOfClass(classOf[RefChecks]) myElimRepeatedPhase = phaseOfClass(classOf[ElimRepeated]) + myElimByNamePhase = phaseOfClass(classOf[ElimByNameParams]) myExtensionMethodsPhase = phaseOfClass(classOf[ExtensionMethods]) myErasurePhase = phaseOfClass(classOf[Erasure]) myElimErasedValueTypePhase = phaseOfClass(classOf[ElimErasedValueType]) @@ -427,6 +430,7 @@ object Phases { def firstTransformPhase(using Context): Phase = ctx.base.firstTransformPhase def refchecksPhase(using Context): Phase = ctx.base.refchecksPhase def elimRepeatedPhase(using Context): Phase = ctx.base.elimRepeatedPhase + def elimByNamePhase(using Context): Phase = ctx.base.elimByNamePhase def extensionMethodsPhase(using Context): Phase = ctx.base.extensionMethodsPhase def explicitOuterPhase(using Context): Phase = ctx.base.explicitOuterPhase def gettersPhase(using Context): Phase = ctx.base.gettersPhase diff --git a/compiler/src/dotty/tools/dotc/core/StdNames.scala b/compiler/src/dotty/tools/dotc/core/StdNames.scala index a8915cb9d74b..680f64118a9b 100644 --- a/compiler/src/dotty/tools/dotc/core/StdNames.scala +++ b/compiler/src/dotty/tools/dotc/core/StdNames.scala @@ -184,6 +184,7 @@ object StdNames { // ----- Type names ----------------------------------------- final val BYNAME_PARAM_CLASS: N = "" + final val BYNAME_PARAM_FUN: N = "" final val EQUALS_PATTERN: N = "" final val LOCAL_CHILD: N = "" final val REPEATED_PARAM_CLASS: N = "" diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index 7083e457e577..36db354abba2 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -846,7 +846,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling case _ => tp2.isAnyRef } compareJavaArray - case tp1: ExprType if ctx.phase.id > gettersPhase.id => + case tp1: ExprType if ctx.phaseId > gettersPhase.id => // getters might have converted T to => T, need to compensate. recur(tp1.widenExpr, tp2) case _ => @@ -1510,6 +1510,12 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling case _ => arg1 } arg2.contains(arg1norm) + case ExprType(arg2res) + if ctx.phaseId > ctx.base.elimByNamePhase.id && !ctx.erasedTypes + && defn.isByNameFunction(arg1) => + // ElimByName maps `=> T` to `()? => T`, but only in method parameters. It leaves + // embedded `=> T` alone. This clause needs to compensate for that. + isSubArg(arg1.argInfos.head, arg2res) case _ => arg1 match { case arg1: TypeBounds => diff --git a/compiler/src/dotty/tools/dotc/transform/ElimByNameParams.scala b/compiler/src/dotty/tools/dotc/transform/ElimByNameParams.scala new file mode 100644 index 000000000000..9c026aac6c3b --- /dev/null +++ b/compiler/src/dotty/tools/dotc/transform/ElimByNameParams.scala @@ -0,0 +1,135 @@ +package dotty.tools +package dotc +package transform + +import core._ +import Contexts._ +import Symbols._ +import Types._ +import Flags._ +import SymDenotations.* +import DenotTransformers.InfoTransformer +import NameKinds.SuperArgName +import core.StdNames.nme +import MegaPhase.* +import Decorators.* +import reporting.trace + +/** This phase translates arguments to call-by-name parameters, using the rules + * + * x ==> x if x is a => parameter + * e.apply() ==> (e) if e is pure + * e ==> (() => e) for all other arguments + * + * where + * + * : [T](() => T): T + * + * is a synthetic method defined in Definitions. Erasure will later strip the wrappers. + */ +class ElimByNameParams extends MiniPhase, InfoTransformer: + thisPhase => + + import ast.tpd._ + + override def phaseName: String = ElimByNameParams.name + + override def runsAfterGroupsOf: Set[String] = Set(ExpandSAMs.name, ElimRepeated.name) + // - ExpanSAMs applied to partial functions creates methods that need + // to be fully defined before converting. Test case is pos/i9391.scala. + // - ByNameLambda needs to run in a group after ElimRepeated since ElimRepeated + // works on simple arguments but not converted closures, and it sees the arguments + // after transformations by subsequent miniphases in the same group. + + override def changesParents: Boolean = true + // Expr types in parent type arguments are changed to function types. + + /** If denotation had an ExprType before, it now gets a function type */ + private def exprBecomesFunction(symd: SymDenotation)(using Context): Boolean = + symd.is(Param) || symd.is(ParamAccessor, butNot = Method) + + def transformInfo(tp: Type, sym: Symbol)(using Context): Type = tp match { + case ExprType(rt) if exprBecomesFunction(sym) => + defn.ByNameFunction(rt) + case tp: MethodType => + def exprToFun(tp: Type) = tp match + case ExprType(rt) => defn.ByNameFunction(rt) + case tp => tp + tp.derivedLambdaType( + paramInfos = tp.paramInfos.mapConserve(exprToFun), + resType = transformInfo(tp.resType, sym)) + case tp: PolyType => + tp.derivedLambdaType(resType = transformInfo(tp.resType, sym)) + case _ => tp + } + + override def infoMayChange(sym: Symbol)(using Context): Boolean = + sym.is(Method) || exprBecomesFunction(sym) + + def byNameClosure(arg: Tree, argType: Type)(using Context): Tree = + val meth = newAnonFun(ctx.owner, MethodType(Nil, argType), coord = arg.span) + Closure(meth, + _ => arg.changeOwnerAfter(ctx.owner, meth, thisPhase), + targetType = defn.ByNameFunction(argType) + ).withSpan(arg.span) + + private def isByNameRef(tree: Tree)(using Context): Boolean = + defn.isByNameFunction(tree.tpe.widen) + + /** Map `tree` to `tree.apply()` is `tree` is of type `() ?=> T` */ + private def applyIfFunction(tree: Tree)(using Context) = + if isByNameRef(tree) then + val tree0 = transformFollowing(tree) + atPhase(next) { tree0.select(defn.ContextFunction0_apply).appliedToNone } + else tree + + override def transformIdent(tree: Ident)(using Context): Tree = + applyIfFunction(tree) + + override def transformSelect(tree: Select)(using Context): Tree = + applyIfFunction(tree) + + override def transformTypeApply(tree: TypeApply)(using Context): Tree = tree match { + case TypeApply(Select(_, nme.asInstanceOf_), arg :: Nil) => + // tree might be of form e.asInstanceOf[x.type] where x becomes a function. + // See pos/t296.scala + applyIfFunction(tree) + case _ => tree + } + + override def transformApply(tree: Apply)(using Context): Tree = + trace(s"transforming ${tree.show} at phase ${ctx.phase}", show = true) { + + def transformArg(arg: Tree, formal: Type): Tree = formal match + case defn.ByNameFunction(formalResult) => + def stripTyped(t: Tree): Tree = t match + case Typed(expr, _) => stripTyped(expr) + case _ => t + stripTyped(arg) match + case Apply(Select(qual, nme.apply), Nil) + if isByNameRef(qual) && (isPureExpr(qual) || qual.symbol.isAllOf(InlineParam)) => + qual + case _ => + if isByNameRef(arg) || arg.symbol.name.is(SuperArgName) + then arg + else + var argType = arg.tpe.widenIfUnstable + if argType.isBottomType then argType = formalResult + byNameClosure(arg, argType) + case _ => + arg + + val mt @ MethodType(_) = tree.fun.tpe.widen + val args1 = tree.args.zipWithConserve(mt.paramInfos)(transformArg) + cpy.Apply(tree)(tree.fun, args1) + } + + override def transformValDef(tree: ValDef)(using Context): Tree = + atPhase(next) { + if exprBecomesFunction(tree.symbol) then + cpy.ValDef(tree)(tpt = tree.tpt.withType(tree.symbol.info)) + else tree + } + +object ElimByNameParams: + val name: String = "elimByNameParams" \ No newline at end of file From 01da8666f5c947dda5399985a16a3ea41927e980 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 20 Jan 2022 14:22:19 +0100 Subject: [PATCH 1091/1244] Install the new ElimByName in place of ByNameClosures ... and drop the old ElimByName. --- compiler/src/dotty/tools/dotc/Compiler.scala | 4 +- .../dotty/tools/dotc/core/Definitions.scala | 6 - .../src/dotty/tools/dotc/core/Phases.scala | 2 +- .../src/dotty/tools/dotc/core/StdNames.scala | 2 - .../dotty/tools/dotc/core/TypeComparer.scala | 6 +- .../tools/dotc/transform/ByNameClosures.scala | 40 ----- .../tools/dotc/transform/ElimByName.scala | 155 +++++++++++++----- .../dotc/transform/ElimByNameParams.scala | 135 --------------- .../dotty/tools/dotc/transform/Erasure.scala | 83 +++++----- .../tools/dotc/transform/HoistSuperArgs.scala | 6 +- .../dotc/transform/TransformByNameApply.scala | 67 -------- 11 files changed, 161 insertions(+), 345 deletions(-) delete mode 100644 compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala delete mode 100644 compiler/src/dotty/tools/dotc/transform/ElimByNameParams.scala delete mode 100644 compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala index d416186f6359..d579e850131a 100644 --- a/compiler/src/dotty/tools/dotc/Compiler.scala +++ b/compiler/src/dotty/tools/dotc/Compiler.scala @@ -69,12 +69,11 @@ class Compiler { new InlineVals, // Check right hand-sides of an `inline val`s new ExpandSAMs, // Expand single abstract method closures to anonymous classes new ElimRepeated) :: // Rewrite vararg parameters and arguments - List(new ElimByNameParams) :: List(new init.Checker) :: // Check initialization of objects List(new ProtectedAccessors, // Add accessors for protected members new ExtensionMethods, // Expand methods of value classes with extension methods new UncacheGivenAliases, // Avoid caching RHS of simple parameterless given aliases - new ByNameClosures, // Expand arguments to by-name parameters to closures + new ElimByName, // Map by-name parameters to functions new HoistSuperArgs, // Hoist complex arguments of supercalls to enclosing scope new SpecializeApplyMethods, // Adds specialized methods to FunctionN new RefChecks, // Various checks mostly related to abstract members and overriding @@ -84,7 +83,6 @@ class Compiler { new sjs.ExplicitJSClasses, // Make all JS classes explicit (Scala.js only) new ExplicitOuter, // Add accessors to outer classes from nested ones. new ExplicitSelf, // Make references to non-trivial self types explicit as casts - new ElimByName, // Expand by-name parameter references new StringInterpolatorOpt) :: // Optimizes raw and s string interpolators by rewriting them to string concatenations List(new PruneErasedDefs, // Drop erased definitions from scopes and simplify erased expressions new UninitializedDefs, // Replaces `compiletime.uninitialized` by `_` diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 634394ef48a7..84bd236e5b0d 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -447,12 +447,6 @@ class Definitions { @tu lazy val andType: TypeSymbol = enterBinaryAlias(tpnme.AND, AndType(_, _)) @tu lazy val orType: TypeSymbol = enterBinaryAlias(tpnme.OR, OrType(_, _, soft = false)) - /** Marker method to indicate an argument to a call-by-name parameter. - * Created by byNameClosures and elimByName, eliminated by Erasure, - */ - @tu lazy val cbnArg: TermSymbol = enterPolyMethod(OpsPackageClass, nme.cbnArg, 1, - pt => MethodType(List(FunctionOf(Nil, pt.paramRefs(0))), pt.paramRefs(0))) - /** Method representing a throw */ @tu lazy val throwMethod: TermSymbol = enterMethod(OpsPackageClass, nme.THROWkw, MethodType(List(ThrowableType), NothingType)) diff --git a/compiler/src/dotty/tools/dotc/core/Phases.scala b/compiler/src/dotty/tools/dotc/core/Phases.scala index 7b893ee707c7..623286d837b3 100644 --- a/compiler/src/dotty/tools/dotc/core/Phases.scala +++ b/compiler/src/dotty/tools/dotc/core/Phases.scala @@ -255,7 +255,7 @@ object Phases { myCollectNullableFieldsPhase = phaseOfClass(classOf[CollectNullableFields]) myRefChecksPhase = phaseOfClass(classOf[RefChecks]) myElimRepeatedPhase = phaseOfClass(classOf[ElimRepeated]) - myElimByNamePhase = phaseOfClass(classOf[ElimByNameParams]) + myElimByNamePhase = phaseOfClass(classOf[ElimByName]) myExtensionMethodsPhase = phaseOfClass(classOf[ExtensionMethods]) myErasurePhase = phaseOfClass(classOf[Erasure]) myElimErasedValueTypePhase = phaseOfClass(classOf[ElimErasedValueType]) diff --git a/compiler/src/dotty/tools/dotc/core/StdNames.scala b/compiler/src/dotty/tools/dotc/core/StdNames.scala index 680f64118a9b..f8c70176482c 100644 --- a/compiler/src/dotty/tools/dotc/core/StdNames.scala +++ b/compiler/src/dotty/tools/dotc/core/StdNames.scala @@ -184,7 +184,6 @@ object StdNames { // ----- Type names ----------------------------------------- final val BYNAME_PARAM_CLASS: N = "" - final val BYNAME_PARAM_FUN: N = "" final val EQUALS_PATTERN: N = "" final val LOCAL_CHILD: N = "" final val REPEATED_PARAM_CLASS: N = "" @@ -446,7 +445,6 @@ object StdNames { val bytes: N = "bytes" val canEqual_ : N = "canEqual" val canEqualAny : N = "canEqualAny" - val cbnArg: N = "" val checkInitialized: N = "checkInitialized" val ClassManifestFactory: N = "ClassManifestFactory" val classOf: N = "classOf" diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index 36db354abba2..b2f003c209c7 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -4,7 +4,7 @@ package core import Types._, Contexts._, Symbols._, Flags._, Names._, NameOps._, Denotations._ import Decorators._ -import Phases.gettersPhase +import Phases.{gettersPhase, elimByNamePhase} import StdNames.nme import TypeOps.refineUsingParent import collection.mutable @@ -1511,10 +1511,10 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling } arg2.contains(arg1norm) case ExprType(arg2res) - if ctx.phaseId > ctx.base.elimByNamePhase.id && !ctx.erasedTypes + if ctx.phaseId > elimByNamePhase.id && !ctx.erasedTypes && defn.isByNameFunction(arg1) => // ElimByName maps `=> T` to `()? => T`, but only in method parameters. It leaves - // embedded `=> T` alone. This clause needs to compensate for that. + // embedded `=> T` arguments alone. This clause needs to compensate for that. isSubArg(arg1.argInfos.head, arg2res) case _ => arg1 match { diff --git a/compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala b/compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala deleted file mode 100644 index 51242e7f2dbe..000000000000 --- a/compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala +++ /dev/null @@ -1,40 +0,0 @@ -package dotty.tools.dotc -package transform - -import core._ -import Contexts._ -import Symbols._ -import Types._ -import Flags._ -import DenotTransformers.IdentityDenotTransformer -import core.StdNames.nme - -/** This phase translates arguments to call-by-name parameters, using the rules - * - * x ==> x if x is a => parameter - * e.apply() ==> (e) if e is pure - * e ==> (() => e) for all other arguments - * - * where - * - * : [T](() => T): T - * - * is a synthetic method defined in Definitions. Erasure will later strip the wrappers. - */ -class ByNameClosures extends TransformByNameApply with IdentityDenotTransformer { thisPhase => - import ast.tpd._ - - override def phaseName: String = ByNameClosures.name - - override def runsAfterGroupsOf: Set[String] = Set(ExpandSAMs.name) - // ExpanSAMs applied to partial functions creates methods that need - // to be fully defined before converting. Test case is pos/i9391.scala. - - override def mkByNameClosure(arg: Tree, argType: Type)(using Context): Tree = - val meth = newAnonFun(ctx.owner, MethodType(Nil, argType)) - Closure(meth, _ => arg.changeOwnerAfter(ctx.owner, meth, thisPhase)).withSpan(arg.span) -} - -object ByNameClosures { - val name: String = "byNameClosures" -} \ No newline at end of file diff --git a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala index aeed5ac76d39..a167dba0d77b 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala @@ -1,80 +1,155 @@ -package dotty.tools.dotc +package dotty.tools +package dotc package transform import core._ -import DenotTransformers.InfoTransformer -import Symbols._ import Contexts._ +import Symbols._ import Types._ +import Flags._ +import SymDenotations.* +import DenotTransformers.InfoTransformer +import NameKinds.SuperArgName import core.StdNames.nme -import ast.Trees._ +import MegaPhase.* +import Decorators.* +import reporting.trace -/** This phase eliminates ExprTypes `=> T` as types of method parameter references, and replaces them b - * nullary function types. More precisely: +/** This phase implements the following transformations: * - * For the types of parameter symbols: + * 1. For types of method and class parameters: * - * => T ==> () => T + * => T becomes () ?=> T * - * For cbn parameter values + * 2. For references to cbn-parameters: * - * x ==> x() + * x becomes x.apply() * - * Note: This scheme to have inconsistent types between method types (whose formal types are still - * ExprTypes and parameter valdefs (which are now FunctionTypes) is not pretty. There are two - * other options which have been abandoned or not yet pursued. + * 3. For arguments to cbn parameters * - * Option 1: Transform => T to () => T also in method and function types. The problem with this is - * that is that it requires to look at every type, and this forces too much, causing - * Cyclic Reference errors. Abandoned for this reason. + * e becomes () ?=> e * - * Option 2: Merge ElimByName with erasure, or have it run immediately before. This has not been - * tried yet. + * An opimization is applied: If the argument `e` to a cbn parameter is already + * of type `() ?=> T` and is a pure expression, we avoid (2) and (3), i.e. we + * pass `e` directly instead of `() ?=> e.apply()`. + * + * Note that `() ?=> T` cannot be written in source since user-defined context functions + * must have at least one parameter. We use the type here as a convenient marker + * of something that will erase to Function0, and where we know that it came from + * a by-name parameter. + * + * Note also that the transformation applies only to types of parameters, not to other + * occurrences of ExprTypes. In particular, embedded occurrences in function types + * such as `(=> T) => U` are left as-is. Trying to convert these as well would mean + * traversing all the types, and that leads to cyclic reference errors in many cases. + * This can cause problems in that we might have sometimes a `() ?=> T` where a + * `=> T` is expected. To compensate, there is a new clause in TypeComparer#subArg that + * declares `() ?=> T` to be a subtype of `T` for arguments of type applications, + * after this phase and up to erasure. */ -class ElimByName extends TransformByNameApply with InfoTransformer { +class ElimByName extends MiniPhase, InfoTransformer: + thisPhase => + import ast.tpd._ override def phaseName: String = ElimByName.name - override def changesParents: Boolean = true // Only true for by-names + override def runsAfterGroupsOf: Set[String] = Set(ExpandSAMs.name, ElimRepeated.name) + // - ExpanSAMs applied to partial functions creates methods that need + // to be fully defined before converting. Test case is pos/i9391.scala. + // - ByNameLambda needs to run in a group after ElimRepeated since ElimRepeated + // works on simple arguments but not converted closures, and it sees the arguments + // after transformations by subsequent miniphases in the same group. + + override def changesParents: Boolean = true + // Expr types in parent type arguments are changed to function types. + + /** If denotation had an ExprType before, it now gets a function type */ + private def exprBecomesFunction(symd: SymDenotation)(using Context): Boolean = + symd.is(Param) || symd.is(ParamAccessor, butNot = Method) + + def transformInfo(tp: Type, sym: Symbol)(using Context): Type = tp match { + case ExprType(rt) if exprBecomesFunction(sym) => + defn.ByNameFunction(rt) + case tp: MethodType => + def exprToFun(tp: Type) = tp match + case ExprType(rt) => defn.ByNameFunction(rt) + case tp => tp + tp.derivedLambdaType( + paramInfos = tp.paramInfos.mapConserve(exprToFun), + resType = transformInfo(tp.resType, sym)) + case tp: PolyType => + tp.derivedLambdaType(resType = transformInfo(tp.resType, sym)) + case _ => tp + } + + override def infoMayChange(sym: Symbol)(using Context): Boolean = + sym.is(Method) || exprBecomesFunction(sym) + + def byNameClosure(arg: Tree, argType: Type)(using Context): Tree = + val meth = newAnonFun(ctx.owner, MethodType(Nil, argType), coord = arg.span) + Closure(meth, + _ => arg.changeOwnerAfter(ctx.owner, meth, thisPhase), + targetType = defn.ByNameFunction(argType) + ).withSpan(arg.span) - /** Map `tree` to `tree.apply()` is `ftree` was of ExprType and becomes now a function */ - private def applyIfFunction(tree: Tree, ftree: Tree)(using Context) = - if (isByNameRef(ftree)) { + private def isByNameRef(tree: Tree)(using Context): Boolean = + defn.isByNameFunction(tree.tpe.widen) + + /** Map `tree` to `tree.apply()` is `tree` is of type `() ?=> T` */ + private def applyIfFunction(tree: Tree)(using Context) = + if isByNameRef(tree) then val tree0 = transformFollowing(tree) - atPhase(next) { tree0.select(defn.Function0_apply).appliedToNone } - } + atPhase(next) { tree0.select(defn.ContextFunction0_apply).appliedToNone } else tree override def transformIdent(tree: Ident)(using Context): Tree = - applyIfFunction(tree, tree) + applyIfFunction(tree) override def transformSelect(tree: Select)(using Context): Tree = - applyIfFunction(tree, tree) + applyIfFunction(tree) override def transformTypeApply(tree: TypeApply)(using Context): Tree = tree match { case TypeApply(Select(_, nme.asInstanceOf_), arg :: Nil) => // tree might be of form e.asInstanceOf[x.type] where x becomes a function. // See pos/t296.scala - applyIfFunction(tree, arg) + applyIfFunction(tree) case _ => tree } + override def transformApply(tree: Apply)(using Context): Tree = + trace(s"transforming ${tree.show} at phase ${ctx.phase}", show = true) { + + def transformArg(arg: Tree, formal: Type): Tree = formal match + case defn.ByNameFunction(formalResult) => + def stripTyped(t: Tree): Tree = t match + case Typed(expr, _) => stripTyped(expr) + case _ => t + stripTyped(arg) match + case Apply(Select(qual, nme.apply), Nil) + if isByNameRef(qual) && (isPureExpr(qual) || qual.symbol.isAllOf(InlineParam)) => + qual + case _ => + if isByNameRef(arg) || arg.symbol.name.is(SuperArgName) + then arg + else + var argType = arg.tpe.widenIfUnstable + if argType.isBottomType then argType = formalResult + byNameClosure(arg, argType) + case _ => + arg + + val mt @ MethodType(_) = tree.fun.tpe.widen + val args1 = tree.args.zipWithConserve(mt.paramInfos)(transformArg) + cpy.Apply(tree)(tree.fun, args1) + } + override def transformValDef(tree: ValDef)(using Context): Tree = atPhase(next) { - if (exprBecomesFunction(tree.symbol)) + if exprBecomesFunction(tree.symbol) then cpy.ValDef(tree)(tpt = tree.tpt.withType(tree.symbol.info)) else tree } - def transformInfo(tp: Type, sym: Symbol)(using Context): Type = tp match { - case ExprType(rt) => defn.FunctionOf(Nil, rt) - case _ => tp - } - - override def infoMayChange(sym: Symbol)(using Context): Boolean = sym.isTerm && exprBecomesFunction(sym) -} - -object ElimByName { - val name: String = "elimByName" -} +object ElimByName: + val name: String = "elimByName" \ No newline at end of file diff --git a/compiler/src/dotty/tools/dotc/transform/ElimByNameParams.scala b/compiler/src/dotty/tools/dotc/transform/ElimByNameParams.scala deleted file mode 100644 index 9c026aac6c3b..000000000000 --- a/compiler/src/dotty/tools/dotc/transform/ElimByNameParams.scala +++ /dev/null @@ -1,135 +0,0 @@ -package dotty.tools -package dotc -package transform - -import core._ -import Contexts._ -import Symbols._ -import Types._ -import Flags._ -import SymDenotations.* -import DenotTransformers.InfoTransformer -import NameKinds.SuperArgName -import core.StdNames.nme -import MegaPhase.* -import Decorators.* -import reporting.trace - -/** This phase translates arguments to call-by-name parameters, using the rules - * - * x ==> x if x is a => parameter - * e.apply() ==> (e) if e is pure - * e ==> (() => e) for all other arguments - * - * where - * - * : [T](() => T): T - * - * is a synthetic method defined in Definitions. Erasure will later strip the wrappers. - */ -class ElimByNameParams extends MiniPhase, InfoTransformer: - thisPhase => - - import ast.tpd._ - - override def phaseName: String = ElimByNameParams.name - - override def runsAfterGroupsOf: Set[String] = Set(ExpandSAMs.name, ElimRepeated.name) - // - ExpanSAMs applied to partial functions creates methods that need - // to be fully defined before converting. Test case is pos/i9391.scala. - // - ByNameLambda needs to run in a group after ElimRepeated since ElimRepeated - // works on simple arguments but not converted closures, and it sees the arguments - // after transformations by subsequent miniphases in the same group. - - override def changesParents: Boolean = true - // Expr types in parent type arguments are changed to function types. - - /** If denotation had an ExprType before, it now gets a function type */ - private def exprBecomesFunction(symd: SymDenotation)(using Context): Boolean = - symd.is(Param) || symd.is(ParamAccessor, butNot = Method) - - def transformInfo(tp: Type, sym: Symbol)(using Context): Type = tp match { - case ExprType(rt) if exprBecomesFunction(sym) => - defn.ByNameFunction(rt) - case tp: MethodType => - def exprToFun(tp: Type) = tp match - case ExprType(rt) => defn.ByNameFunction(rt) - case tp => tp - tp.derivedLambdaType( - paramInfos = tp.paramInfos.mapConserve(exprToFun), - resType = transformInfo(tp.resType, sym)) - case tp: PolyType => - tp.derivedLambdaType(resType = transformInfo(tp.resType, sym)) - case _ => tp - } - - override def infoMayChange(sym: Symbol)(using Context): Boolean = - sym.is(Method) || exprBecomesFunction(sym) - - def byNameClosure(arg: Tree, argType: Type)(using Context): Tree = - val meth = newAnonFun(ctx.owner, MethodType(Nil, argType), coord = arg.span) - Closure(meth, - _ => arg.changeOwnerAfter(ctx.owner, meth, thisPhase), - targetType = defn.ByNameFunction(argType) - ).withSpan(arg.span) - - private def isByNameRef(tree: Tree)(using Context): Boolean = - defn.isByNameFunction(tree.tpe.widen) - - /** Map `tree` to `tree.apply()` is `tree` is of type `() ?=> T` */ - private def applyIfFunction(tree: Tree)(using Context) = - if isByNameRef(tree) then - val tree0 = transformFollowing(tree) - atPhase(next) { tree0.select(defn.ContextFunction0_apply).appliedToNone } - else tree - - override def transformIdent(tree: Ident)(using Context): Tree = - applyIfFunction(tree) - - override def transformSelect(tree: Select)(using Context): Tree = - applyIfFunction(tree) - - override def transformTypeApply(tree: TypeApply)(using Context): Tree = tree match { - case TypeApply(Select(_, nme.asInstanceOf_), arg :: Nil) => - // tree might be of form e.asInstanceOf[x.type] where x becomes a function. - // See pos/t296.scala - applyIfFunction(tree) - case _ => tree - } - - override def transformApply(tree: Apply)(using Context): Tree = - trace(s"transforming ${tree.show} at phase ${ctx.phase}", show = true) { - - def transformArg(arg: Tree, formal: Type): Tree = formal match - case defn.ByNameFunction(formalResult) => - def stripTyped(t: Tree): Tree = t match - case Typed(expr, _) => stripTyped(expr) - case _ => t - stripTyped(arg) match - case Apply(Select(qual, nme.apply), Nil) - if isByNameRef(qual) && (isPureExpr(qual) || qual.symbol.isAllOf(InlineParam)) => - qual - case _ => - if isByNameRef(arg) || arg.symbol.name.is(SuperArgName) - then arg - else - var argType = arg.tpe.widenIfUnstable - if argType.isBottomType then argType = formalResult - byNameClosure(arg, argType) - case _ => - arg - - val mt @ MethodType(_) = tree.fun.tpe.widen - val args1 = tree.args.zipWithConserve(mt.paramInfos)(transformArg) - cpy.Apply(tree)(tree.fun, args1) - } - - override def transformValDef(tree: ValDef)(using Context): Tree = - atPhase(next) { - if exprBecomesFunction(tree.symbol) then - cpy.ValDef(tree)(tpt = tree.tpt.withType(tree.symbol.info)) - else tree - } - -object ElimByNameParams: - val name: String = "elimByNameParams" \ No newline at end of file diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index 91214341f650..765d514de5c4 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -805,49 +805,46 @@ object Erasure { */ override def typedApply(tree: untpd.Apply, pt: Type)(using Context): Tree = val Apply(fun, args) = tree - if fun.symbol == defn.cbnArg then - typedUnadapted(args.head, pt) - else - val origFun = fun.asInstanceOf[tpd.Tree] - val origFunType = origFun.tpe.widen(using preErasureCtx) - val ownArgs = if origFunType.isErasedMethod then Nil else args - val fun1 = typedExpr(fun, AnyFunctionProto) - fun1.tpe.widen match - case mt: MethodType => - val (xmt, // A method type like `mt` but with bunched arguments expanded to individual ones - bunchArgs, // whether arguments are bunched - outers) = // the outer reference parameter(s) - if fun1.isInstanceOf[Apply] then - (mt, fun1.removeAttachment(BunchedArgs).isDefined, Nil) - else - val xmt = expandedMethodType(mt, origFun) - (xmt, xmt ne mt, outer.args(origFun)) - - val args0 = outers ::: ownArgs - val args1 = args0.zipWithConserve(xmt.paramInfos)(typedExpr) - .asInstanceOf[List[Tree]] - - def mkApply(finalFun: Tree, finalArgs: List[Tree]) = - val app = untpd.cpy.Apply(tree)(finalFun, finalArgs) - .withType(applyResultType(xmt, args1)) - if bunchArgs then app.withAttachment(BunchedArgs, ()) else app - - def app(fun1: Tree): Tree = fun1 match - case Block(stats, expr) => - cpy.Block(fun1)(stats, app(expr)) - case Apply(fun2, SeqLiteral(prevArgs, argTpt) :: _) if bunchArgs => - mkApply(fun2, JavaSeqLiteral(prevArgs ++ args1, argTpt) :: Nil) - case Apply(fun2, prevArgs) => - mkApply(fun2, prevArgs ++ args1) - case _ if bunchArgs => - mkApply(fun1, JavaSeqLiteral(args1, TypeTree(defn.ObjectType)) :: Nil) - case _ => - mkApply(fun1, args1) - - app(fun1) - case t => - if ownArgs.isEmpty then fun1 - else throw new MatchError(i"tree $tree has unexpected type of function $fun/$fun1: $t, was $origFunType, args = $ownArgs") + val origFun = fun.asInstanceOf[tpd.Tree] + val origFunType = origFun.tpe.widen(using preErasureCtx) + val ownArgs = if origFunType.isErasedMethod then Nil else args + val fun1 = typedExpr(fun, AnyFunctionProto) + fun1.tpe.widen match + case mt: MethodType => + val (xmt, // A method type like `mt` but with bunched arguments expanded to individual ones + bunchArgs, // whether arguments are bunched + outers) = // the outer reference parameter(s) + if fun1.isInstanceOf[Apply] then + (mt, fun1.removeAttachment(BunchedArgs).isDefined, Nil) + else + val xmt = expandedMethodType(mt, origFun) + (xmt, xmt ne mt, outer.args(origFun)) + + val args0 = outers ::: ownArgs + val args1 = args0.zipWithConserve(xmt.paramInfos)(typedExpr) + .asInstanceOf[List[Tree]] + + def mkApply(finalFun: Tree, finalArgs: List[Tree]) = + val app = untpd.cpy.Apply(tree)(finalFun, finalArgs) + .withType(applyResultType(xmt, args1)) + if bunchArgs then app.withAttachment(BunchedArgs, ()) else app + + def app(fun1: Tree): Tree = fun1 match + case Block(stats, expr) => + cpy.Block(fun1)(stats, app(expr)) + case Apply(fun2, SeqLiteral(prevArgs, argTpt) :: _) if bunchArgs => + mkApply(fun2, JavaSeqLiteral(prevArgs ++ args1, argTpt) :: Nil) + case Apply(fun2, prevArgs) => + mkApply(fun2, prevArgs ++ args1) + case _ if bunchArgs => + mkApply(fun1, JavaSeqLiteral(args1, TypeTree(defn.ObjectType)) :: Nil) + case _ => + mkApply(fun1, args1) + + app(fun1) + case t => + if ownArgs.isEmpty then fun1 + else throw new MatchError(i"tree $tree has unexpected type of function $fun/$fun1: $t, was $origFunType, args = $ownArgs") end typedApply // The following four methods take as the proto-type the erasure of the pre-existing type, diff --git a/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala b/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala index e1bcc7e6a9b4..c87fd037f2da 100644 --- a/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala +++ b/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala @@ -45,10 +45,8 @@ class HoistSuperArgs extends MiniPhase with IdentityDenotTransformer { thisPhase def phaseName: String = HoistSuperArgs.name - override def runsAfter: Set[String] = Set(ByNameClosures.name) + override def runsAfter: Set[String] = Set(ElimByName.name) // By name closures need to be introduced first in order to be hoisted out here. - // There's an interaction with by name closures in that the marker - // application should not be hoisted, but be left at the point of call. /** Defines methods for hoisting complex supercall arguments out of * parent super calls and constructor definitions. @@ -126,8 +124,6 @@ class HoistSuperArgs extends MiniPhase with IdentityDenotTransformer { thisPhase // begin hoistSuperArg arg match { - case Apply(fn, arg1 :: Nil) if fn.symbol == defn.cbnArg => - cpy.Apply(arg)(fn, hoistSuperArg(arg1, cdef) :: Nil) case _ if arg.existsSubTree(needsHoist) => val superMeth = newSuperArgMethod(arg.tpe) val superArgDef = DefDef(superMeth, prefss => { diff --git a/compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala b/compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala deleted file mode 100644 index 9eb9b3f0ad5a..000000000000 --- a/compiler/src/dotty/tools/dotc/transform/TransformByNameApply.scala +++ /dev/null @@ -1,67 +0,0 @@ -package dotty.tools -package dotc -package transform - -import MegaPhase._ -import core._ -import Symbols._ -import SymDenotations._ -import Contexts._ -import Types._ -import Flags._ -import Decorators._ -import DenotTransformers._ -import StdNames.nme -import NameKinds.SuperArgName -import ast.Trees._ -import reporting.trace - -/** Abstract base class of ByNameClosures and ElimByName, factoring out the - * common functionality to transform arguments of by-name parameters. - */ -abstract class TransformByNameApply extends MiniPhase { thisPhase: DenotTransformer => - import ast.tpd._ - - /** The info of the tree's symbol before it is potentially transformed in this phase */ - private def originalDenotation(tree: Tree)(using Context) = - atPhase(thisPhase)(tree.symbol.denot) - - /** If denotation had an ExprType before, it now gets a function type */ - protected def exprBecomesFunction(symd: SymDenotation)(using Context): Boolean = - symd.is(Param) || symd.is(ParamAccessor, butNot = Method) - - protected def isByNameRef(tree: Tree)(using Context): Boolean = { - val origDenot = originalDenotation(tree) - origDenot.info.isInstanceOf[ExprType] && exprBecomesFunction(origDenot) - } - - def mkByNameClosure(arg: Tree, argType: Type)(using Context): Tree = unsupported(i"mkClosure($arg)") - - override def transformApply(tree: Apply)(using Context): Tree = - trace(s"transforming ${tree.show} at phase ${ctx.phase}", show = true) { - - def transformArg(arg: Tree, formal: Type): Tree = formal.dealias match { - case formalExpr: ExprType => - var argType = arg.tpe.widenIfUnstable - if (argType.isBottomType) argType = formal.widenExpr - def wrap(arg: Tree) = - ref(defn.cbnArg).appliedToType(argType).appliedTo(arg).withSpan(arg.span) - def unTyped(t: Tree): Tree = t match { case Typed(expr, _) => unTyped(expr) case _ => t } - unTyped(arg) match { - case Apply(Select(qual, nme.apply), Nil) - if qual.tpe.derivesFrom(defn.Function0) && (isPureExpr(qual) || qual.symbol.isAllOf(Inline | Param)) => - wrap(qual) - case _ => - if isByNameRef(arg) || arg.symbol == defn.cbnArg || arg.symbol.name.is(SuperArgName) - then arg - else wrap(mkByNameClosure(arg, argType)) - } - case _ => - arg - } - - val mt @ MethodType(_) = tree.fun.tpe.widen - val args1 = tree.args.zipWithConserve(mt.paramInfos)(transformArg) - cpy.Apply(tree)(tree.fun, args1) - } -} From 545f4b7be45897ad0113911444cecdf273fe5cd0 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 20 Jan 2022 14:34:31 +0100 Subject: [PATCH 1092/1244] Specialize byname functions I tried to extend specialization to all context functions, not just ones of 0 arity. But that runs into problems for dependent context functions, since the necessary casts get complicated. Since context functions over primitive types are an anti-pattern anyway I don't think we need to optimize this case, after all. --- .../dotty/tools/dotc/core/Definitions.scala | 3 +- .../dotc/transform/SpecializeFunctions.scala | 39 ++++++++++--------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 84bd236e5b0d..794119cd7a79 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -1559,7 +1559,8 @@ class Definitions { new PerRun(Function2SpecializedReturnTypes.map(_.symbol)) def isSpecializableFunction(cls: ClassSymbol, paramTypes: List[Type], retType: Type)(using Context): Boolean = - paramTypes.length <= 2 && cls.derivesFrom(FunctionClass(paramTypes.length)) + paramTypes.length <= 2 + && (cls.derivesFrom(FunctionClass(paramTypes.length)) || isByNameFunctionClass(cls)) && isSpecializableFunctionSAM(paramTypes, retType) /** If the Single Abstract Method of a Function class has this type, is it specializable? */ diff --git a/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala b/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala index 91555dc2b995..78b6edcd213b 100644 --- a/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala +++ b/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala @@ -76,24 +76,27 @@ class SpecializeFunctions extends MiniPhase { argTypes, retType ) - - if (!isSpecializable || argTypes.exists(_.isInstanceOf[ExprType])) return tree - - val specializedApply = nme.apply.specializedFunction(retType, argTypes) - val newSel = fun match { - case Select(qual, _) => - qual.select(specializedApply) - case _ => - (fun.tpe: @unchecked) match { - case TermRef(prefix: ThisType, name) => - tpd.This(prefix.cls).select(specializedApply) - case TermRef(prefix: NamedType, name) => - tpd.ref(prefix).select(specializedApply) - } - } - - newSel.appliedToTermArgs(args) - + if isSpecializable then + val specializedApply = nme.apply.specializedFunction(retType, argTypes) + val newSel = fun match + case Select(qual, _) => + val qual1 = qual.tpe.widen match + case defn.ByNameFunction(res) => + // Need to cast to regular function, since specialied apply methods + // are not members of ContextFunction0. The cast will be eliminated in + // erasure. + qual.cast(defn.FunctionOf(Nil, res)) + case _ => + qual + qual1.select(specializedApply) + case _ => + (fun.tpe: @unchecked) match + case TermRef(prefix: ThisType, name) => + tpd.This(prefix.cls).select(specializedApply) + case TermRef(prefix: NamedType, name) => + tpd.ref(prefix).select(specializedApply) + newSel.appliedToTermArgs(args) + else tree case _ => tree } From 610fda2b0687405c93c38dad8aac5b3f3fa7cbdf Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 20 Jan 2022 14:56:53 +0100 Subject: [PATCH 1093/1244] Fix typos in comment --- .../dotty/tools/dotc/transform/ElimByName.scala | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala index a167dba0d77b..a125508d1698 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala @@ -29,7 +29,7 @@ import reporting.trace * * e becomes () ?=> e * - * An opimization is applied: If the argument `e` to a cbn parameter is already + * An optimization is applied: If the argument `e` to a cbn parameter is already * of type `() ?=> T` and is a pure expression, we avoid (2) and (3), i.e. we * pass `e` directly instead of `() ?=> e.apply()`. * @@ -40,12 +40,13 @@ import reporting.trace * * Note also that the transformation applies only to types of parameters, not to other * occurrences of ExprTypes. In particular, embedded occurrences in function types - * such as `(=> T) => U` are left as-is. Trying to convert these as well would mean - * traversing all the types, and that leads to cyclic reference errors in many cases. - * This can cause problems in that we might have sometimes a `() ?=> T` where a - * `=> T` is expected. To compensate, there is a new clause in TypeComparer#subArg that - * declares `() ?=> T` to be a subtype of `T` for arguments of type applications, - * after this phase and up to erasure. + * such as `(=> T) => U` are left as-is here (they are eliminated in erasure). + * Trying to convert these as well would mean traversing all the types, and that + * leads to cyclic reference errors in many cases. This can cause problems in that + * we might have sometimes a `() ?=> T` where a `=> T` is expected. To compensate, + * there is a new clause in TypeComparer#subArg that declares `() ?=> T` to be a + * subtype of `=> T` for arguments of type applications at any point after this phase + * and up to erasure. */ class ElimByName extends MiniPhase, InfoTransformer: thisPhase => From fba3dbf034a549c2c16e0585a645568264f86f56 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 20 Jan 2022 17:36:03 +0100 Subject: [PATCH 1094/1244] Make isSubArg symmetric again --- compiler/src/dotty/tools/dotc/core/TypeComparer.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index b2f003c209c7..ea80bcb22dfa 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -1499,7 +1499,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling false } - def isSubArg(arg1: Type, arg2: Type): Boolean = arg2 match { + def isSubArg(arg1: Type, arg2: Type): Boolean = arg2 match case arg2: TypeBounds => val arg1norm = arg1 match { case arg1: TypeBounds => @@ -1517,14 +1517,16 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling // embedded `=> T` arguments alone. This clause needs to compensate for that. isSubArg(arg1.argInfos.head, arg2res) case _ => - arg1 match { + arg1 match case arg1: TypeBounds => compareCaptured(arg1, arg2) + case ExprType(arg1res) + if ctx.phaseId > elimByNamePhase.id && !ctx.erasedTypes + && defn.isByNameFunction(arg2) => + isSubArg(arg1res, arg2.argInfos.head) case _ => (v > 0 || isSubType(arg2, arg1)) && (v < 0 || isSubType(arg1, arg2)) - } - } isSubArg(args1.head, args2.head) } && recurArgs(args1.tail, args2.tail, tparams2.tail) From 50b9927c9d054c0cc4fa0579600fbc061da7b3db Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 20 Jan 2022 17:56:59 +0100 Subject: [PATCH 1095/1244] Reorganize RefChecks tasks - Split out forward reference checks and cross version (i.e. experimental/deprecated) checks into their own miniphases. These have nothing to do with the core tasks of RefChecks. - Move RefChecks earlier in the pipeline, so that it is not affected by ElimByName's questionable type manipulations. --- compiler/src/dotty/tools/dotc/Compiler.scala | 12 +- .../tools/dotc/transform/ElimByName.scala | 8 +- .../dotc/transform/ForwardDepChecks.scala | 111 +++++++ .../tools/dotc/typer/CrossVersionChecks.scala | 210 +++++++++++++ .../dotty/tools/dotc/typer/RefChecks.scala | 277 +----------------- 5 files changed, 344 insertions(+), 274 deletions(-) create mode 100644 compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala create mode 100644 compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala index d579e850131a..cbcc62b7fb6b 100644 --- a/compiler/src/dotty/tools/dotc/Compiler.scala +++ b/compiler/src/dotty/tools/dotc/Compiler.scala @@ -7,9 +7,9 @@ import typer.{TyperPhase, RefChecks} import parsing.Parser import Phases.Phase import transform._ -import dotty.tools.backend.jvm.{CollectSuperCalls, GenBCode} import dotty.tools.backend -import dotty.tools.dotc.transform.localopt.StringInterpolatorOpt +import backend.jvm.{CollectSuperCalls, GenBCode} +import localopt.StringInterpolatorOpt /** The central class of the dotc compiler. The job of a compiler is to create * runs, which process given `phases` in a given `rootContext`. @@ -68,15 +68,17 @@ class Compiler { new BetaReduce, // Reduce closure applications new InlineVals, // Check right hand-sides of an `inline val`s new ExpandSAMs, // Expand single abstract method closures to anonymous classes - new ElimRepeated) :: // Rewrite vararg parameters and arguments + new ElimRepeated, // Rewrite vararg parameters and arguments + new RefChecks) :: // Various checks mostly related to abstract members and overriding List(new init.Checker) :: // Check initialization of objects - List(new ProtectedAccessors, // Add accessors for protected members + List(new CrossVersionChecks, // Check issues related to deprecated and experimental + new ProtectedAccessors, // Add accessors for protected members new ExtensionMethods, // Expand methods of value classes with extension methods new UncacheGivenAliases, // Avoid caching RHS of simple parameterless given aliases new ElimByName, // Map by-name parameters to functions new HoistSuperArgs, // Hoist complex arguments of supercalls to enclosing scope + new ForwardDepChecks, // Check that there are no forward references to local vals new SpecializeApplyMethods, // Adds specialized methods to FunctionN - new RefChecks, // Various checks mostly related to abstract members and overriding new TryCatchPatterns, // Compile cases in try/catch new PatternMatcher) :: // Compile pattern matches List(new ElimOpaque, // Turn opaque into normal aliases diff --git a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala index a125508d1698..b3d5ab1da4b4 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala @@ -13,6 +13,7 @@ import NameKinds.SuperArgName import core.StdNames.nme import MegaPhase.* import Decorators.* +import typer.RefChecks import reporting.trace /** This phase implements the following transformations: @@ -55,12 +56,15 @@ class ElimByName extends MiniPhase, InfoTransformer: override def phaseName: String = ElimByName.name - override def runsAfterGroupsOf: Set[String] = Set(ExpandSAMs.name, ElimRepeated.name) + override def runsAfterGroupsOf: Set[String] = Set(ExpandSAMs.name, ElimRepeated.name, RefChecks.name) // - ExpanSAMs applied to partial functions creates methods that need // to be fully defined before converting. Test case is pos/i9391.scala. - // - ByNameLambda needs to run in a group after ElimRepeated since ElimRepeated + // - ElimByName needs to run in a group after ElimRepeated since ElimRepeated // works on simple arguments but not converted closures, and it sees the arguments // after transformations by subsequent miniphases in the same group. + // - ElimByName should run in a group after RefChecks, since RefChecks does heavy + // comparisons of signatures, and ElimByName distorts these signatures by not + // replacing `=>` with `() ?=> T` everywhere. override def changesParents: Boolean = true // Expr types in parent type arguments are changed to function types. diff --git a/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala b/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala new file mode 100644 index 000000000000..ac3b271ece76 --- /dev/null +++ b/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala @@ -0,0 +1,111 @@ +package dotty.tools +package dotc +package transform + +import core.* +import Symbols.*, Types.*, Contexts.*, Flags.*, Decorators.*, reporting.* +import util.Spans.Span +import util.Store +import collection.immutable +import ast.tpd +import MegaPhase.MiniPhase + +object ForwardDepChecks: + + import tpd.* + + val name: String = "forwardDepChecks" + + type LevelAndIndex = immutable.Map[Symbol, (LevelInfo, Int)] + + class OptLevelInfo { + def levelAndIndex: LevelAndIndex = Map() + def enterReference(sym: Symbol, span: Span): Unit = () + } + + /** A class to help in forward reference checking */ + class LevelInfo(outerLevelAndIndex: LevelAndIndex, stats: List[Tree])(using Context) + extends OptLevelInfo { + override val levelAndIndex: LevelAndIndex = + stats.foldLeft(outerLevelAndIndex, 0) {(mi, stat) => + val (m, idx) = mi + val m1 = stat match { + case stat: MemberDef => m.updated(stat.symbol, (this, idx)) + case _ => m + } + (m1, idx + 1) + }._1 + var maxIndex: Int = Int.MinValue + var refSpan: Span = _ + var refSym: Symbol = _ + + override def enterReference(sym: Symbol, span: Span): Unit = + if (sym.exists && sym.owner.isTerm) + levelAndIndex.get(sym) match { + case Some((level, idx)) if (level.maxIndex < idx) => + level.maxIndex = idx + level.refSpan = span + level.refSym = sym + case _ => + } + } + + val NoLevelInfo: OptLevelInfo = new OptLevelInfo() + +class ForwardDepChecks extends MiniPhase: + import ForwardDepChecks.* + import tpd.* + + override def phaseName: String = ForwardDepChecks.name + + override def runsAfter: Set[String] = Set(ElimByName.name) + + private var LevelInfo: Store.Location[OptLevelInfo] = _ + private def currentLevel(using Context): OptLevelInfo = ctx.store(LevelInfo) + + override def initContext(ctx: FreshContext): Unit = + LevelInfo = ctx.addLocation(NoLevelInfo) + + override def prepareForStats(trees: List[Tree])(using Context): Context = + if (ctx.owner.isTerm) + ctx.fresh.updateStore(LevelInfo, new LevelInfo(currentLevel.levelAndIndex, trees)) + else ctx + + override def transformValDef(tree: ValDef)(using Context): ValDef = + val sym = tree.symbol + if sym.exists && sym.owner.isTerm && !sym.is(Lazy) then + currentLevel.levelAndIndex.get(sym) match + case Some((level, symIdx)) if symIdx <= level.maxIndex => + report.error(ForwardReferenceExtendsOverDefinition(sym, level.refSym), + ctx.source.atSpan(level.refSpan)) + case _ => + tree + + override def transformIdent(tree: Ident)(using Context): Ident = { + currentLevel.enterReference(tree.symbol, tree.span) + tree + } + + override def transformApply(tree: Apply)(using Context): Apply = { + if (isSelfConstrCall(tree)) { + assert(currentLevel.isInstanceOf[LevelInfo], s"${ctx.owner}/" + i"$tree") + val level = currentLevel.asInstanceOf[LevelInfo] + if (level.maxIndex > 0) { + // An implementation restriction to avoid VerifyErrors and lazyvals mishaps; see SI-4717 + report.debuglog("refsym = " + level.refSym) + report.error("forward reference not allowed from self constructor invocation", + ctx.source.atSpan(level.refSpan)) + } + } + tree + } + + override def transformNew(tree: New)(using Context): New = { + currentLevel.enterReference(tree.tpe.typeSymbol, tree.span) + tree.tpe.dealias.foreachPart { + case TermRef(_, s: Symbol) => currentLevel.enterReference(s, tree.span) + case _ => + } + tree + } +end ForwardDepChecks \ No newline at end of file diff --git a/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala b/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala new file mode 100644 index 000000000000..5a48da34d87f --- /dev/null +++ b/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala @@ -0,0 +1,210 @@ +package dotty.tools +package dotc +package transform + +import core.* +import Symbols.*, Types.*, Contexts.*, Flags.*, SymUtils.*, Decorators.*, reporting.* +import util.SrcPos +import config.{ScalaVersion, NoScalaVersion, Feature, ScalaRelease} +import MegaPhase.MiniPhase +import scala.util.{Failure, Success} +import ast.tpd + +class CrossVersionChecks extends MiniPhase: + import tpd.* + + def phaseName = "crossVersionChecks" + + override def runsAfterGroupsOf: Set[String] = Set(FirstTransform.name) + // We assume all type trees except TypeTree have been eliminated + + // Note: if a symbol has both @deprecated and @migration annotations and both + // warnings are enabled, only the first one checked here will be emitted. + // I assume that's a consequence of some code trying to avoid noise by suppressing + // warnings after the first, but I think it'd be better if we didn't have to + // arbitrarily choose one as more important than the other. + private def checkUndesiredProperties(sym: Symbol, pos: SrcPos)(using Context): Unit = + checkDeprecated(sym, pos) + checkExperimental(sym, pos) + checkSinceAnnot(sym, pos) + + val xMigrationValue = ctx.settings.Xmigration.value + if xMigrationValue != NoScalaVersion then + checkMigration(sym, pos, xMigrationValue) + + + /** If @deprecated is present, and the point of reference is not enclosed + * in either a deprecated member or a scala bridge method, issue a warning. + */ + private def checkDeprecated(sym: Symbol, pos: SrcPos)(using Context): Unit = + + /** is the owner an enum or its companion and also the owner of sym */ + def isEnumOwner(owner: Symbol)(using Context) = + // pre: sym is an enumcase + if owner.isEnumClass then owner.companionClass eq sym.owner + else if owner.is(ModuleClass) && owner.companionClass.isEnumClass then owner eq sym.owner + else false + + def isDeprecatedOrEnum(owner: Symbol)(using Context) = + // pre: sym is an enumcase + owner.isDeprecated + || isEnumOwner(owner) + + /**Scan the chain of outer declaring scopes from the current context + * a deprecation warning will be skipped if one the following holds + * for a given declaring scope: + * - the symbol associated with the scope is also deprecated. + * - if and only if `sym` is an enum case, the scope is either + * a module that declares `sym`, or the companion class of the + * module that declares `sym`. + */ + def skipWarning(using Context) = + ctx.owner.ownersIterator.exists(if sym.isEnumCase then isDeprecatedOrEnum else _.isDeprecated) + + for annot <- sym.getAnnotation(defn.DeprecatedAnnot) do + if !skipWarning then + val msg = annot.argumentConstant(0).map(": " + _.stringValue).getOrElse("") + val since = annot.argumentConstant(1).map(" since " + _.stringValue).getOrElse("") + report.deprecationWarning(s"${sym.showLocated} is deprecated${since}${msg}", pos) + + private def checkExperimental(sym: Symbol, pos: SrcPos)(using Context): Unit = + if sym.isExperimental && !ctx.owner.isInExperimentalScope then + Feature.checkExperimentalDef(sym, pos) + + private def checkExperimentalSignature(sym: Symbol, pos: SrcPos)(using Context): Unit = + class Checker extends TypeTraverser: + def traverse(tp: Type): Unit = + if tp.typeSymbol.isExperimental then + Feature.checkExperimentalDef(tp.typeSymbol, pos) + else + traverseChildren(tp) + if !sym.isInExperimentalScope then + new Checker().traverse(sym.info) + + private def checkExperimentalAnnots(sym: Symbol)(using Context): Unit = + if !sym.isInExperimentalScope then + for annot <- sym.annotations if annot.symbol.isExperimental do + Feature.checkExperimentalDef(annot.symbol, annot.tree) + + private def checkSinceAnnot(sym: Symbol, pos: SrcPos)(using Context): Unit = + for + annot <- sym.getAnnotation(defn.SinceAnnot) + releaseName <- annot.argumentConstantString(0) + do + ScalaRelease.parse(releaseName) match + case Some(release) if release > ctx.scalaRelease => + report.error( + i"$sym was added in Scala release ${releaseName.show}, therefore it cannot be used in the code targeting Scala ${ctx.scalaRelease.show}", + pos) + case None => + report.error(i"$sym has an unparsable release name: '${releaseName}'", annot.tree.srcPos) + case _ => + + private def checkSinceAnnotInSignature(sym: Symbol, pos: SrcPos)(using Context) = + new TypeTraverser: + def traverse(tp: Type) = + if tp.typeSymbol.hasAnnotation(defn.SinceAnnot) then + checkSinceAnnot(tp.typeSymbol, pos) + else + traverseChildren(tp) + .traverse(sym.info) + + /** If @migration is present (indicating that the symbol has changed semantics between versions), + * emit a warning. + */ + private def checkMigration(sym: Symbol, pos: SrcPos, xMigrationValue: ScalaVersion)(using Context): Unit = + for annot <- sym.getAnnotation(defn.MigrationAnnot) do + val migrationVersion = ScalaVersion.parse(annot.argumentConstant(1).get.stringValue) + migrationVersion match + case Success(symVersion) if xMigrationValue < symVersion => + val msg = annot.argumentConstant(0).get.stringValue + report.warning(SymbolChangedSemanticsInVersion(sym, symVersion, msg), pos) + case Failure(ex) => + report.warning(SymbolHasUnparsableVersionNumber(sym, ex.getMessage), pos) + case _ => + + /** Check that a deprecated val or def does not override a + * concrete, non-deprecated method. If it does, then + * deprecation is meaningless. + */ + private def checkDeprecatedOvers(tree: Tree)(using Context): Unit = { + val symbol = tree.symbol + if (symbol.isDeprecated) { + val concrOvers = + symbol.allOverriddenSymbols.filter(sym => + !sym.isDeprecated && !sym.is(Deferred)) + if (!concrOvers.isEmpty) + report.deprecationWarning( + symbol.toString + " overrides concrete, non-deprecated symbol(s):" + + concrOvers.map(_.name).mkString(" ", ", ", ""), tree.srcPos) + } + } + + /** Check that classes extending experimental classes or nested in experimental classes have the @experimental annotation. */ + private def checkExperimentalInheritance(cls: ClassSymbol)(using Context): Unit = + if !cls.isAnonymousClass && !cls.hasAnnotation(defn.ExperimentalAnnot) then + cls.info.parents.find(_.typeSymbol.isExperimental) match + case Some(parent) => + report.error(em"extension of experimental ${parent.typeSymbol} must have @experimental annotation", cls.srcPos) + case _ => + end checkExperimentalInheritance + + override def transformValDef(tree: ValDef)(using Context): ValDef = + checkDeprecatedOvers(tree) + checkExperimentalAnnots(tree.symbol) + checkExperimentalSignature(tree.symbol, tree) + checkSinceAnnot(tree.symbol, tree.srcPos) + checkSinceAnnotInSignature(tree.symbol, tree) + tree + + override def transformDefDef(tree: DefDef)(using Context): DefDef = + checkDeprecatedOvers(tree) + checkExperimentalAnnots(tree.symbol) + checkExperimentalSignature(tree.symbol, tree) + checkSinceAnnotInSignature(tree.symbol, tree) + tree + + override def transformTemplate(tree: Template)(using Context): Tree = + val cls = ctx.owner.asClass + checkExperimentalInheritance(cls) + checkExperimentalAnnots(cls) + tree + + override def transformIdent(tree: Ident)(using Context): Ident = { + checkUndesiredProperties(tree.symbol, tree.srcPos) + tree + } + + override def transformSelect(tree: Select)(using Context): Select = { + checkUndesiredProperties(tree.symbol, tree.srcPos) + tree + } + + override def transformNew(tree: New)(using Context): New = { + checkUndesiredProperties(tree.tpe.typeSymbol, tree.srcPos) + tree + } + + override def transformTypeTree(tree: TypeTree)(using Context): TypeTree = { + val tpe = tree.tpe + tpe.foreachPart { + case TypeRef(_, sym: Symbol) => + checkDeprecated(sym, tree.srcPos) + checkExperimental(sym, tree.srcPos) + checkSinceAnnot(sym, tree.srcPos) + case TermRef(_, sym: Symbol) => + checkDeprecated(sym, tree.srcPos) + checkExperimental(sym, tree.srcPos) + checkSinceAnnot(sym, tree.srcPos) + case _ => + } + tree + } + + override def transformTypeDef(tree: TypeDef)(using Context): TypeDef = { + checkExperimentalAnnots(tree.symbol) + checkSinceAnnot(tree.symbol, tree.srcPos) + tree + } + +end CrossVersionChecks \ No newline at end of file diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala index c7ba668b7e79..9ababe3e5f07 100644 --- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala @@ -9,13 +9,11 @@ import StdNames._, Denotations._, SymUtils._, Phases._, SymDenotations._ import NameKinds.DefaultGetterName import Annotations._ import util.Spans._ -import util.{Store, SrcPos} +import util.SrcPos import scala.collection.{ mutable, immutable } import ast._ import MegaPhase._ import config.Printers.{checks, noPrinter} -import scala.util.{Try, Failure, Success} -import config.{ScalaVersion, NoScalaVersion, ScalaRelease} import Decorators._ import OverridingPairs.isOverridingPair import typer.ErrorReporting._ @@ -25,7 +23,6 @@ import reporting._ import scala.util.matching.Regex._ import Constants.Constant import NullOpsDecorator._ -import dotty.tools.dotc.config.Feature object RefChecks { import tpd._ @@ -903,128 +900,6 @@ object RefChecks { } } - // Note: if a symbol has both @deprecated and @migration annotations and both - // warnings are enabled, only the first one checked here will be emitted. - // I assume that's a consequence of some code trying to avoid noise by suppressing - // warnings after the first, but I think it'd be better if we didn't have to - // arbitrarily choose one as more important than the other. - private def checkUndesiredProperties(sym: Symbol, pos: SrcPos)(using Context): Unit = - checkDeprecated(sym, pos) - checkExperimental(sym, pos) - checkSinceAnnot(sym, pos) - - val xMigrationValue = ctx.settings.Xmigration.value - if xMigrationValue != NoScalaVersion then - checkMigration(sym, pos, xMigrationValue) - - - /** If @deprecated is present, and the point of reference is not enclosed - * in either a deprecated member or a scala bridge method, issue a warning. - */ - private def checkDeprecated(sym: Symbol, pos: SrcPos)(using Context): Unit = - - /** is the owner an enum or its companion and also the owner of sym */ - def isEnumOwner(owner: Symbol)(using Context) = - // pre: sym is an enumcase - if owner.isEnumClass then owner.companionClass eq sym.owner - else if owner.is(ModuleClass) && owner.companionClass.isEnumClass then owner eq sym.owner - else false - - def isDeprecatedOrEnum(owner: Symbol)(using Context) = - // pre: sym is an enumcase - owner.isDeprecated - || isEnumOwner(owner) - - /**Scan the chain of outer declaring scopes from the current context - * a deprecation warning will be skipped if one the following holds - * for a given declaring scope: - * - the symbol associated with the scope is also deprecated. - * - if and only if `sym` is an enum case, the scope is either - * a module that declares `sym`, or the companion class of the - * module that declares `sym`. - */ - def skipWarning(using Context) = - ctx.owner.ownersIterator.exists(if sym.isEnumCase then isDeprecatedOrEnum else _.isDeprecated) - - for annot <- sym.getAnnotation(defn.DeprecatedAnnot) do - if !skipWarning then - val msg = annot.argumentConstant(0).map(": " + _.stringValue).getOrElse("") - val since = annot.argumentConstant(1).map(" since " + _.stringValue).getOrElse("") - report.deprecationWarning(s"${sym.showLocated} is deprecated${since}${msg}", pos) - - private def checkExperimental(sym: Symbol, pos: SrcPos)(using Context): Unit = - if sym.isExperimental && !ctx.owner.isInExperimentalScope then - Feature.checkExperimentalDef(sym, pos) - - private def checkExperimentalSignature(sym: Symbol, pos: SrcPos)(using Context): Unit = - class Checker extends TypeTraverser: - def traverse(tp: Type): Unit = - if tp.typeSymbol.isExperimental then - Feature.checkExperimentalDef(tp.typeSymbol, pos) - else - traverseChildren(tp) - if !sym.isInExperimentalScope then - new Checker().traverse(sym.info) - - private def checkExperimentalAnnots(sym: Symbol)(using Context): Unit = - if !sym.isInExperimentalScope then - for annot <- sym.annotations if annot.symbol.isExperimental do - Feature.checkExperimentalDef(annot.symbol, annot.tree) - - private def checkSinceAnnot(sym: Symbol, pos: SrcPos)(using Context): Unit = - for - annot <- sym.getAnnotation(defn.SinceAnnot) - releaseName <- annot.argumentConstantString(0) - do - ScalaRelease.parse(releaseName) match - case Some(release) if release > ctx.scalaRelease => - report.error( - i"$sym was added in Scala release ${releaseName.show}, therefore it cannot be used in the code targeting Scala ${ctx.scalaRelease.show}", - pos) - case None => - report.error(i"$sym has an unparsable release name: '${releaseName}'", annot.tree.srcPos) - case _ => - - private def checkSinceAnnotInSignature(sym: Symbol, pos: SrcPos)(using Context) = - new TypeTraverser: - def traverse(tp: Type) = - if tp.typeSymbol.hasAnnotation(defn.SinceAnnot) then - checkSinceAnnot(tp.typeSymbol, pos) - else - traverseChildren(tp) - .traverse(sym.info) - - /** If @migration is present (indicating that the symbol has changed semantics between versions), - * emit a warning. - */ - private def checkMigration(sym: Symbol, pos: SrcPos, xMigrationValue: ScalaVersion)(using Context): Unit = - for annot <- sym.getAnnotation(defn.MigrationAnnot) do - val migrationVersion = ScalaVersion.parse(annot.argumentConstant(1).get.stringValue) - migrationVersion match - case Success(symVersion) if xMigrationValue < symVersion => - val msg = annot.argumentConstant(0).get.stringValue - report.warning(SymbolChangedSemanticsInVersion(sym, symVersion, msg), pos) - case Failure(ex) => - report.warning(SymbolHasUnparsableVersionNumber(sym, ex.getMessage), pos) - case _ => - - /** Check that a deprecated val or def does not override a - * concrete, non-deprecated method. If it does, then - * deprecation is meaningless. - */ - private def checkDeprecatedOvers(tree: Tree)(using Context): Unit = { - val symbol = tree.symbol - if (symbol.isDeprecated) { - val concrOvers = - symbol.allOverriddenSymbols.filter(sym => - !sym.isDeprecated && !sym.is(Deferred)) - if (!concrOvers.isEmpty) - report.deprecationWarning( - symbol.toString + " overrides concrete, non-deprecated symbol(s):" + - concrOvers.map(_.name).mkString(" ", ", ", ""), tree.srcPos) - } - } - /** Check that we do not "override" anything with a private method * or something that becomes a private method. According to the Scala * modeling this is non-sensical since private members don't override. @@ -1037,7 +912,7 @@ object RefChecks { */ def checkNoPrivateOverrides(tree: Tree)(using Context): Unit = val sym = tree.symbol - if sym.owner.isClass + if sym.maybeOwner.isClass && sym.is(Private) && (sym.isOneOf(MethodOrLazyOrMutable) || !sym.is(Local)) // in these cases we'll produce a getter later && !sym.isConstructor @@ -1096,42 +971,6 @@ object RefChecks { end checkUnaryMethods - type LevelAndIndex = immutable.Map[Symbol, (LevelInfo, Int)] - - class OptLevelInfo { - def levelAndIndex: LevelAndIndex = Map() - def enterReference(sym: Symbol, span: Span): Unit = () - } - - /** A class to help in forward reference checking */ - class LevelInfo(outerLevelAndIndex: LevelAndIndex, stats: List[Tree])(using Context) - extends OptLevelInfo { - override val levelAndIndex: LevelAndIndex = - stats.foldLeft(outerLevelAndIndex, 0) {(mi, stat) => - val (m, idx) = mi - val m1 = stat match { - case stat: MemberDef => m.updated(stat.symbol, (this, idx)) - case _ => m - } - (m1, idx + 1) - }._1 - var maxIndex: Int = Int.MinValue - var refSpan: Span = _ - var refSym: Symbol = _ - - override def enterReference(sym: Symbol, span: Span): Unit = - if (sym.exists && sym.owner.isTerm) - levelAndIndex.get(sym) match { - case Some((level, idx)) if (level.maxIndex < idx) => - level.maxIndex = idx - level.refSpan = span - level.refSym = sym - case _ => - } - } - - val NoLevelInfo: RefChecks.OptLevelInfo = new OptLevelInfo() - /** Verify that references in the user-defined `@implicitNotFound` message are valid. * (i.e. they refer to a type variable that really occurs in the signature of the annotated symbol.) */ @@ -1213,15 +1052,6 @@ object RefChecks { end checkImplicitNotFoundAnnotation - - /** Check that classes extending experimental classes or nested in experimental classes have the @experimental annotation. */ - private def checkExperimentalInheritance(cls: ClassSymbol)(using Context): Unit = - if !cls.isAnonymousClass && !cls.hasAnnotation(defn.ExperimentalAnnot) then - cls.info.parents.find(_.typeSymbol.isExperimental) match - case Some(parent) => - report.error(em"extension of experimental ${parent.typeSymbol} must have @experimental annotation", cls.srcPos) - case _ => - end checkExperimentalInheritance } import RefChecks._ @@ -1261,50 +1091,24 @@ class RefChecks extends MiniPhase { thisPhase => override def phaseName: String = RefChecks.name - // Needs to run after ElimRepeated for override checks involving varargs methods override def runsAfter: Set[String] = Set(ElimRepeated.name) - - private var LevelInfo: Store.Location[OptLevelInfo] = _ - private def currentLevel(using Context): OptLevelInfo = ctx.store(LevelInfo) - - override def initContext(ctx: FreshContext): Unit = - LevelInfo = ctx.addLocation(NoLevelInfo) - - override def prepareForStats(trees: List[Tree])(using Context): Context = - if (ctx.owner.isTerm) - ctx.fresh.updateStore(LevelInfo, new LevelInfo(currentLevel.levelAndIndex, trees)) - else ctx + // Needs to run after ElimRepeated for override checks involving varargs methods override def transformValDef(tree: ValDef)(using Context): ValDef = { - checkNoPrivateOverrides(tree) - checkDeprecatedOvers(tree) - checkExperimentalAnnots(tree.symbol) - checkExperimentalSignature(tree.symbol, tree) - checkSinceAnnot(tree.symbol, tree.srcPos) - checkSinceAnnotInSignature(tree.symbol, tree) - val sym = tree.symbol - if (sym.exists && sym.owner.isTerm) { - tree.rhs match { - case Ident(nme.WILDCARD) => report.error(UnboundPlaceholderParameter(), sym.srcPos) - case _ => - } - if (!sym.is(Lazy)) - currentLevel.levelAndIndex.get(sym) match { - case Some((level, symIdx)) if symIdx <= level.maxIndex => - report.error(ForwardReferenceExtendsOverDefinition(sym, level.refSym), - ctx.source.atSpan(level.refSpan)) + if tree.symbol.exists then + checkNoPrivateOverrides(tree) + val sym = tree.symbol + if (sym.exists && sym.owner.isTerm) { + tree.rhs match { + case Ident(nme.WILDCARD) => report.error(UnboundPlaceholderParameter(), sym.srcPos) case _ => } - } + } tree } override def transformDefDef(tree: DefDef)(using Context): DefDef = { checkNoPrivateOverrides(tree) - checkDeprecatedOvers(tree) - checkExperimentalAnnots(tree.symbol) - checkExperimentalSignature(tree.symbol, tree) - checkSinceAnnotInSignature(tree.symbol, tree) checkImplicitNotFoundAnnotation.defDef(tree.symbol.denot) checkUnaryMethods(tree.symbol) tree @@ -1318,8 +1122,6 @@ class RefChecks extends MiniPhase { thisPhase => checkCompanionNameClashes(cls) checkAllOverrides(cls) checkImplicitNotFoundAnnotation.template(cls.classDenot) - checkExperimentalInheritance(cls) - checkExperimentalAnnots(cls) tree } catch { @@ -1327,65 +1129,6 @@ class RefChecks extends MiniPhase { thisPhase => report.error(ex, tree.srcPos) tree } - - override def transformIdent(tree: Ident)(using Context): Ident = { - checkUndesiredProperties(tree.symbol, tree.srcPos) - currentLevel.enterReference(tree.symbol, tree.span) - tree - } - - override def transformSelect(tree: Select)(using Context): Select = { - checkUndesiredProperties(tree.symbol, tree.srcPos) - tree - } - - override def transformApply(tree: Apply)(using Context): Apply = { - if (isSelfConstrCall(tree)) { - assert(currentLevel.isInstanceOf[LevelInfo], s"${ctx.owner}/" + i"$tree") - val level = currentLevel.asInstanceOf[LevelInfo] - if (level.maxIndex > 0) { - // An implementation restriction to avoid VerifyErrors and lazyvals mishaps; see SI-4717 - report.debuglog("refsym = " + level.refSym) - report.error("forward reference not allowed from self constructor invocation", - ctx.source.atSpan(level.refSpan)) - } - } - tree - } - - override def transformNew(tree: New)(using Context): New = { - val tpe = tree.tpe - val sym = tpe.typeSymbol - checkUndesiredProperties(sym, tree.srcPos) - currentLevel.enterReference(sym, tree.span) - tpe.dealias.foreachPart { - case TermRef(_, s: Symbol) => currentLevel.enterReference(s, tree.span) - case _ => - } - tree - } - - override def transformTypeTree(tree: TypeTree)(using Context): TypeTree = { - val tpe = tree.tpe - tpe.foreachPart { - case TypeRef(_, sym: Symbol) => - checkDeprecated(sym, tree.srcPos) - checkExperimental(sym, tree.srcPos) - checkSinceAnnot(sym, tree.srcPos) - case TermRef(_, sym: Symbol) => - checkDeprecated(sym, tree.srcPos) - checkExperimental(sym, tree.srcPos) - checkSinceAnnot(sym, tree.srcPos) - case _ => - } - tree - } - - override def transformTypeDef(tree: TypeDef)(using Context): TypeDef = { - checkExperimentalAnnots(tree.symbol) - checkSinceAnnot(tree.symbol, tree.srcPos) - tree - } } /* todo: rewrite and re-enable From 8dfcf5478126bcdbefa53a774dbe3250653347de Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 21 Jan 2022 10:15:30 +0100 Subject: [PATCH 1096/1244] Fix "have same type after erasure" check Perform the overriding checks after elimByName. I observed some problem with catsEffect2, where a super accessor method with a `() ?=> T` parameter was compared with a corresponding super accessor method with a `=> T` parameter. One of these methods was generated before elimByName, the other after. So comparing them at phase elimRepeated + 1 gave two different types. The problem is fixed by comparing after elimByName, which means that the type of the second method is converted to match the first. --- compiler/src/dotty/tools/dotc/core/TypeComparer.scala | 6 +++--- .../dotty/tools/dotc/transform/ElimErasedValueType.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index ea80bcb22dfa..8b4eab685f2a 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -1512,17 +1512,17 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling arg2.contains(arg1norm) case ExprType(arg2res) if ctx.phaseId > elimByNamePhase.id && !ctx.erasedTypes - && defn.isByNameFunction(arg1) => + && defn.isByNameFunction(arg1.dealias) => // ElimByName maps `=> T` to `()? => T`, but only in method parameters. It leaves // embedded `=> T` arguments alone. This clause needs to compensate for that. - isSubArg(arg1.argInfos.head, arg2res) + isSubArg(arg1.dealias.argInfos.head, arg2res) case _ => arg1 match case arg1: TypeBounds => compareCaptured(arg1, arg2) case ExprType(arg1res) if ctx.phaseId > elimByNamePhase.id && !ctx.erasedTypes - && defn.isByNameFunction(arg2) => + && defn.isByNameFunction(arg2.dealias) => isSubArg(arg1res, arg2.argInfos.head) case _ => (v > 0 || isSubType(arg2, arg1)) && diff --git a/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala b/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala index 0e62d1357fa5..aabbca4bc7bf 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala @@ -117,7 +117,7 @@ class ElimErasedValueType extends MiniPhase with InfoTransformer { thisPhase => // Do the test at the earliest phase where both symbols existed. val phaseId = sym1.originDenotation.validFor.firstPhaseId max sym2.originDenotation.validFor.firstPhaseId - atPhase(elimRepeatedPhase.next)(checkNoConflict(sym1, sym2, sym1.info)) + atPhase(elimByNamePhase.next)(checkNoConflict(sym1, sym2, sym1.info)) opc.next() } } From 8d9ed1ce8baf083a99499d2b38afd64152b3ca9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Marks?= Date: Wed, 26 Jan 2022 15:56:35 +0100 Subject: [PATCH 1097/1244] Change versions after the release of 3.1.1 --- project/Build.scala | 6 +++--- project/MiMaFilters.scala | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 07bbf72e3785..000dfb8e2b6e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -59,9 +59,9 @@ object DottyJSPlugin extends AutoPlugin { } object Build { - val referenceVersion = "3.1.1-RC2" + val referenceVersion = "3.1.2-RC1" - val baseVersion = "3.1.2-RC1" + val baseVersion = "3.1.3-RC1" // Versions used by the vscode extension to create a new project // This should be the latest published releases. @@ -77,7 +77,7 @@ object Build { * set to 3.1.3. If it is going to be 3.1.0, it must be set to the latest * 3.0.x release. */ - val previousDottyVersion = "3.1.0" + val previousDottyVersion = "3.1.1" object CompatMode { final val BinaryCompatible = 0 diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index ff1e7ae906e2..cac81eecc141 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -4,8 +4,6 @@ import com.typesafe.tools.mima.core._ object MiMaFilters { val Library: Seq[ProblemFilter] = Seq( // Experimental APIs that can be added in 3.2.0 - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.init"), - ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.last"), ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.append"), ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"), ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"), @@ -20,14 +18,6 @@ object MiMaFilters { ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#CompilationInfoModule.XmacroSettings"), ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#CompilationInfoModule.XmacroSettings"), - // Should have been added in 3.1.0 - // These are only allowed on imports and therefore should not be present in binaries emitted before - // this addition of these members and therefore should not cause any conflicts. - ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1-migration"), - ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1"), - ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$"), - ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$minusmigration$"), - // Private to the compiler - needed for forward binary compatibility ProblemFilters.exclude[MissingClassProblem]("scala.annotation.since") ) From 4f7327ad4737ff7db5515a77e946bed3d817b0bd Mon Sep 17 00:00:00 2001 From: Kacper Korban Date: Wed, 26 Jan 2022 19:45:31 +0100 Subject: [PATCH 1098/1244] Fix chat link in README closes #14359 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 834f02bc01fd..991d6842acdc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Dotty ===== [![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster) -[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://img.shields.io/discord/632150470000902164) +[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://discord.com/invite/scala) * [Homepage](https://dotty.epfl.ch) * [Documentation](https://dotty.epfl.ch/docs) From eee261e4807bec39f13616135ce783a3574c18ff Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 26 Jan 2022 18:07:22 +0000 Subject: [PATCH 1099/1244] Fix approximating RefinedTypes (n>1) --- .../src/dotty/tools/dotc/core/Types.scala | 2 +- tests/pos/i14349.min.scala | 13 +++++++++++++ tests/pos/i14349.scala | 19 +++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/pos/i14349.min.scala create mode 100644 tests/pos/i14349.scala diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 363a9e34230e..769defc3e42c 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -5802,7 +5802,7 @@ object Types { case Range(infoLo: TypeBounds, infoHi: TypeBounds) => assert(variance == 0) if (!infoLo.isTypeAlias && !infoHi.isTypeAlias) propagate(infoLo, infoHi) - else range(defn.NothingType, tp.parent) + else range(defn.NothingType, parent) case Range(infoLo, infoHi) => propagate(infoLo, infoHi) case _ => diff --git a/tests/pos/i14349.min.scala b/tests/pos/i14349.min.scala new file mode 100644 index 000000000000..8922d73056d6 --- /dev/null +++ b/tests/pos/i14349.min.scala @@ -0,0 +1,13 @@ +class Inv[M] + +class Module: + type X + type Y + type M = Module { + type X = Module.this.X + type Y = Module.this.Y + } + def expose = new Inv[M] + def test = this match { case m => m.expose } + // was: leak: `(m : Module)` in `m.expose: Inv[? <: Module { X = m.X }]` + def res: Inv[_ <: Module] = this match { case m => m.expose } diff --git a/tests/pos/i14349.scala b/tests/pos/i14349.scala new file mode 100644 index 000000000000..05e4e1e3603f --- /dev/null +++ b/tests/pos/i14349.scala @@ -0,0 +1,19 @@ +trait Module: + self => + type M <: Module { + type X = self.X + type Y = self.Y + } + type X + type Y + + def expose: Expose[X, Y, M] + +trait Expose[ + X0, + Y0, + M <: Module { type X = X0; type Y = Y0 } +] + +def test(ms: Seq[Option[Module]]): Seq[Expose[_, _, _]] = + ms.collect { case Some(module) => module.expose } From 3ff1fc2d0ee348ad99f47c08c4476ac794649406 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 17 Jan 2022 14:39:35 +0100 Subject: [PATCH 1100/1244] Properly desugar `inline given .. with ..` ```scala inline given Foo with { .. } ``` now becomes ```scala inline given def given_Foo: Foo with {..} = new Foo class given_Foo extends Foo with { } ``` There are no creation of `lazy vals` when we have `inline`. We inline the `new givne_Foo` only, the class does not get inlined. This is useful to remove the instatiation of the given instance when the methods are inline themselfs. Fixes #14282 Fixes #14177 --- compiler/src/dotty/tools/dotc/ast/Desugar.scala | 4 ++-- .../src/dotty/tools/dotc/parsing/Parsers.scala | 2 +- tests/neg/i14177a.scala | 6 ++++++ tests/pos/i14177b.scala | 15 +++++++++++++++ tests/pos/i14282.scala | 13 +++++++++++++ 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 tests/neg/i14177a.scala create mode 100644 tests/pos/i14177b.scala create mode 100644 tests/pos/i14282.scala diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index 7121f7e7370d..75e300118562 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -783,7 +783,7 @@ object desugar { DefDef( className.toTermName, joinParams(constrTparams, defParamss), classTypeRef, creatorExpr) - .withMods(companionMods | mods.flags.toTermFlags & GivenOrImplicit | Final) + .withMods(companionMods | mods.flags.toTermFlags & (GivenOrImplicit | Inline) | Final) .withSpan(cdef.span) :: Nil } @@ -809,7 +809,7 @@ object desugar { Nil } } - val classMods = if mods.is(Given) then mods | Synthetic else mods + val classMods = if mods.is(Given) then mods &~ Inline | Synthetic else mods cpy.TypeDef(cdef: TypeDef)( name = className, rhs = cpy.Template(impl)(constr, parents1, clsDerived, self1, diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index bbe2ea914a43..3ffef90057ef 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -3637,7 +3637,7 @@ object Parsers { val templ = if isStatSep || isStatSeqEnd then Template(constr, parents, Nil, EmptyValDef, Nil) else withTemplate(constr, parents) - if noParams then ModuleDef(name, templ) + if noParams && !mods.is(Inline) then ModuleDef(name, templ) else TypeDef(name.toTypeName, templ) end gdef finalizeDef(gdef, mods1, start) diff --git a/tests/neg/i14177a.scala b/tests/neg/i14177a.scala new file mode 100644 index 000000000000..3031271c369b --- /dev/null +++ b/tests/neg/i14177a.scala @@ -0,0 +1,6 @@ +import scala.compiletime.* + +trait C[A] + +inline given [Tup <: Tuple]: C[Tup] with + val cs = summonAll[Tuple.Map[Tup, C]] // error cannot reduce inline match with diff --git a/tests/pos/i14177b.scala b/tests/pos/i14177b.scala new file mode 100644 index 000000000000..6da9a72ae551 --- /dev/null +++ b/tests/pos/i14177b.scala @@ -0,0 +1,15 @@ +class T + +inline given fail1: T with + val cs = scala.compiletime.summonAll[EmptyTuple] +inline given fail2[X]: T with + val cs = scala.compiletime.summonAll[EmptyTuple] +inline given fail3(using DummyImplicit): T with + val cs = scala.compiletime.summonAll[EmptyTuple] + +inline given ok1: T = new T: + val cs = scala.compiletime.summonAll[EmptyTuple] +inline given ok2[X]: T = new T: + val cs = scala.compiletime.summonAll[EmptyTuple] +inline given ok3(using DummyImplicit): T = new T: + val cs = scala.compiletime.summonAll[EmptyTuple] diff --git a/tests/pos/i14282.scala b/tests/pos/i14282.scala new file mode 100644 index 000000000000..2cc3ff1226e2 --- /dev/null +++ b/tests/pos/i14282.scala @@ -0,0 +1,13 @@ +trait Foo[A] { + inline def foo(): Unit +} + +inline given FooA[A]: Foo[A] with { + inline def foo(): Unit = println() +} +def test1 = FooA.foo() + +inline given FooInt: Foo[Int] with { + inline def foo(): Unit = println() +} +def test2 = FooInt.foo() From 391c29ab582d6ccde445c313510917099636cf1e Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 18 Jan 2022 11:55:23 +0100 Subject: [PATCH 1101/1244] Disallow `transparent inline given .. with ..` --- compiler/src/dotty/tools/dotc/ast/Desugar.scala | 4 +++- tests/neg/i14177c.scala | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 tests/neg/i14177c.scala diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index 75e300118562..bce9613a3290 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -809,7 +809,9 @@ object desugar { Nil } } - val classMods = if mods.is(Given) then mods &~ Inline | Synthetic else mods + if mods.isAllOf(Given | Inline | Transparent) then + report.error("inline non-alias given cannot be trasparent", cdef) + val classMods = if mods.is(Given) then mods &~ (Inline | Transparent) | Synthetic else mods cpy.TypeDef(cdef: TypeDef)( name = className, rhs = cpy.Template(impl)(constr, parents1, clsDerived, self1, diff --git a/tests/neg/i14177c.scala b/tests/neg/i14177c.scala new file mode 100644 index 000000000000..d281938ca0ea --- /dev/null +++ b/tests/neg/i14177c.scala @@ -0,0 +1,15 @@ +class T + +transparent inline given fail1: T with // error + val cs = scala.compiletime.summonAll[EmptyTuple] +transparent inline given fail2[X]: T with // error + val cs = scala.compiletime.summonAll[EmptyTuple] +transparent inline given fail3(using DummyImplicit): T with // error + val cs = scala.compiletime.summonAll[EmptyTuple] + +transparent inline given ok1: T = new T: + val cs = scala.compiletime.summonAll[EmptyTuple] +transparent inline given ok2[X]: T = new T: + val cs = scala.compiletime.summonAll[EmptyTuple] +transparent inline given ok3(using DummyImplicit): T = new T: + val cs = scala.compiletime.summonAll[EmptyTuple] From 6968ee19c9c49f0ba9f4627bf51ac6f2ecbca070 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 18 Jan 2022 12:02:18 +0100 Subject: [PATCH 1102/1244] Add documentation on inline given instances --- compiler/src/dotty/tools/dotc/ast/Desugar.scala | 2 +- docs/docs/reference/contextual/givens.md | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index bce9613a3290..920871210eee 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -810,7 +810,7 @@ object desugar { } } if mods.isAllOf(Given | Inline | Transparent) then - report.error("inline non-alias given cannot be trasparent", cdef) + report.error("inline given instances cannot be trasparent", cdef) val classMods = if mods.is(Given) then mods &~ (Inline | Transparent) | Synthetic else mods cpy.TypeDef(cdef: TypeDef)( name = className, diff --git a/docs/docs/reference/contextual/givens.md b/docs/docs/reference/contextual/givens.md index 9b90040c01c3..e65e6153a579 100644 --- a/docs/docs/reference/contextual/givens.md +++ b/docs/docs/reference/contextual/givens.md @@ -100,6 +100,21 @@ transparent inline given mkAnnotations[A, T]: Annotations[A, T] = ${ Since `mkAnnotations` is `transparent`, the type of an application is the type of its right-hand side, which can be a proper subtype of the declared result type `Annotations[A, T]`. +Given instances can have the `inline` but not `transparent` modifiers as their type is already known from the signature. +Example: + +```scala +trait Show[T] { + inline def show(x: T): String +} + +inline given Show[Foo] with { + /*transparent*/ inline def show(x: Foo): String = ${ ... } +} +``` +Note that the inline methods within the given instances may be `transparent`. + + ## Pattern-Bound Given Instances Given instances can also appear in patterns. Example: From 9280bcf55f232971c00512d1579ec36f8452dcab Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 18 Jan 2022 13:05:37 +0100 Subject: [PATCH 1103/1244] Expand inline given instance docs --- docs/docs/reference/contextual/givens.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/docs/reference/contextual/givens.md b/docs/docs/reference/contextual/givens.md index e65e6153a579..1f613ab6a495 100644 --- a/docs/docs/reference/contextual/givens.md +++ b/docs/docs/reference/contextual/givens.md @@ -114,6 +114,9 @@ inline given Show[Foo] with { ``` Note that the inline methods within the given instances may be `transparent`. +The inlining of given instances will not inline/duplicate the implementation of the given, it will just inline the instantiation of that instance. +This is used to help dead code elimination of the given instances that are not used after inlining. + ## Pattern-Bound Given Instances From dc7f13a6ac103f2be62d2ab389c9defbc61cf694 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Wed, 26 Jan 2022 11:56:58 +0100 Subject: [PATCH 1104/1244] Add example --- docs/docs/reference/contextual/givens.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/docs/reference/contextual/givens.md b/docs/docs/reference/contextual/givens.md index 1f613ab6a495..2af94c0a8aea 100644 --- a/docs/docs/reference/contextual/givens.md +++ b/docs/docs/reference/contextual/givens.md @@ -111,6 +111,10 @@ trait Show[T] { inline given Show[Foo] with { /*transparent*/ inline def show(x: Foo): String = ${ ... } } + +def app = + // inlines `show` method call and removes the call to `given Show[Foo]` + summon[Show[Foo]].show(foo) ``` Note that the inline methods within the given instances may be `transparent`. From 77538328c3fab746dadab9eb0e6060dcd26b2c3b Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Thu, 20 Jan 2022 13:56:17 -0800 Subject: [PATCH 1105/1244] Parameter untupling is not a conversion of functions --- .../parameter-untupling-spec.md | 9 +++--- .../other-new-features/parameter-untupling.md | 31 +++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/docs/docs/reference/other-new-features/parameter-untupling-spec.md b/docs/docs/reference/other-new-features/parameter-untupling-spec.md index feedb77aa774..e01e91059a27 100644 --- a/docs/docs/reference/other-new-features/parameter-untupling-spec.md +++ b/docs/docs/reference/other-new-features/parameter-untupling-spec.md @@ -77,11 +77,12 @@ is feasible for parameter untupling with the expected type `TupleN[T1, ..., Tn] with the same expected type. ## Migration -Code like this could not be written before, hence the new notation would not be ambiguous after adoption. +Code like this could not be written before, hence the new notation is not ambiguous after adoption. -Though it is possible that someone has written an implicit conversion form `(T1, ..., Tn) => R` to `TupleN[T1, ..., Tn] => R` -for some `n`. This change could be detected and fixed by [`Scalafix`](https://scalacenter.github.io/scalafix/). Furthermore, such conversion would probably -be doing the same translation (semantically) but in a less efficient way. +It is possible that someone has written an implicit conversion from `(T1, ..., Tn) => R` to `TupleN[T1, ..., Tn] => R` for some `n`. +Such a conversion is now only useful for general conversions of function values, when parameter untupling is not applicable. +Some care is required to implement the conversion efficiently. +Obsolete conversions could be detected and fixed by [`Scalafix`](https://scalacenter.github.io/scalafix/). ## Reference diff --git a/docs/docs/reference/other-new-features/parameter-untupling.md b/docs/docs/reference/other-new-features/parameter-untupling.md index 1beed4968d4f..84bbe52bddc1 100644 --- a/docs/docs/reference/other-new-features/parameter-untupling.md +++ b/docs/docs/reference/other-new-features/parameter-untupling.md @@ -33,11 +33,42 @@ or, equivalently: ```scala xs.map(_ + _) ``` +and +```scala +def combine(i: Int, j: Int) = i + j +xs.map(combine) +``` Generally, a function value with `n > 1` parameters is converted to a pattern-matching closure using `case` if the expected type is a unary function type of the form `((T_1, ..., T_n)) => U`. +More specifically, the adaptation is applied to the mismatching formal +parameter list. In particular, the adaptation is not a conversion +between function types. That is why the following is not accepted: + +```scala +val combiner: (Int, Int) => Int = _ + _ +xs.map(combiner) // Type Mismatch +``` + +The function value must be explicitly tupled, rather than the parameters untupled: +```scala +xs.map(combiner.tupled) +``` + +A conversion may be provided in user code: + +```scala +import scala.language.implicitConversions +transparent inline implicit def `fallback untupling`(f: (Int, Int) => Int): ((Int, Int)) => Int = + p => f(p._1, p._2) // use specialized apply instead of unspecialized `tupled` +xs.map(combiner) +``` + +Parameter untupling is attempted before conversions are applied, so that a conversion in scope +cannot subvert untupling. + ## Reference For more information see: From a92007c4697bdcf2677904726d8aba7491b96b9c Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 6 Jan 2022 15:38:40 +0100 Subject: [PATCH 1106/1244] Scala2Unpickler: Fix annotation argument handling When an annotation argument is an Array, we can't know the element type of the Array until we've applied the argument to the annotation constructor, so we need to unpickle annotation arguments as untyped trees and rely on resolveConstructor to type them. This is the same logic we already use when unpickling Java classfiles since 610450f4f91be6c416a41ee2887f667e21385425. Fixes #14223. --- .../core/unpickleScala2/Scala2Unpickler.scala | 20 +++++++++---------- sbt-test/scala2-compat/i14223/app/App.scala | 6 ++++++ sbt-test/scala2-compat/i14223/build.sbt | 13 ++++++++++++ sbt-test/scala2-compat/i14223/lib/Lib.scala | 12 +++++++++++ sbt-test/scala2-compat/i14223/test | 1 + 5 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 sbt-test/scala2-compat/i14223/app/App.scala create mode 100644 sbt-test/scala2-compat/i14223/build.sbt create mode 100644 sbt-test/scala2-compat/i14223/lib/Lib.scala create mode 100644 sbt-test/scala2-compat/i14223/test diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index 305a8a7510df..b5b8c4715ebc 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -959,33 +959,33 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas /** Read an annotation argument, which is pickled either * as a Constant or a Tree. */ - protected def readAnnotArg(i: Int)(using Context): Tree = bytes(index(i)) match { + protected def readAnnotArg(i: Int)(using Context): untpd.Tree = untpd.TypedSplice(bytes(index(i)) match case TREE => at(i, () => readTree()) case _ => at(i, () => readConstant() match case c: Constant => Literal(c) case tp: TermRef => ref(tp) ) - } + ) /** Read a ClassfileAnnotArg (argument to a classfile annotation) */ - private def readArrayAnnotArg()(using Context): Tree = { + private def readArrayAnnotArg()(using Context): untpd.Tree = { readByte() // skip the `annotargarray` tag val end = readNat() + readIndex // array elements are trees representing instances of scala.annotation.Annotation - SeqLiteral( + untpd.JavaSeqLiteral( until(end, () => readClassfileAnnotArg(readNat())), - TypeTree(defn.AnnotationClass.typeRef)) + untpd.TypeTree()) } - private def readAnnotInfoArg()(using Context): Tree = { + private def readAnnotInfoArg()(using Context): untpd.Tree = untpd.TypedSplice { readByte() // skip the `annotinfo` tag val end = readNat() + readIndex readAnnotationContents(end) } - protected def readClassfileAnnotArg(i: Int)(using Context): Tree = bytes(index(i)) match { + protected def readClassfileAnnotArg(i: Int)(using Context): untpd.Tree = bytes(index(i)) match { case ANNOTINFO => at(i, () => readAnnotInfoArg()) case ANNOTARGARRAY => at(i, () => readArrayAnnotArg()) case _ => readAnnotArg(i) @@ -997,7 +997,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas protected def readAnnotationContents(end: Int)(using Context): Tree = { val atp = readTypeRef() val args = { - val t = new ListBuffer[Tree] + val t = new ListBuffer[untpd.Tree] while (readIndex != end) { val argref = readNat() @@ -1005,14 +1005,14 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas if (isNameEntry(argref)) { val name = at(argref, () => readName()) val arg = readClassfileAnnotArg(readNat()) - NamedArg(name.asTermName, arg) + untpd.NamedArg(name.asTermName, arg) } else readAnnotArg(argref) } } t.toList } - resolveConstructor(atp, args) + untpd.resolveConstructor(atp, args) } /** Read an annotation and as a side effect store it into diff --git a/sbt-test/scala2-compat/i14223/app/App.scala b/sbt-test/scala2-compat/i14223/app/App.scala new file mode 100644 index 000000000000..dc229c0b1a86 --- /dev/null +++ b/sbt-test/scala2-compat/i14223/app/App.scala @@ -0,0 +1,6 @@ +import kc.Encoder + +def test: Unit = + val cellEncoder = new Encoder[String] { + override def encode: String = "" + } diff --git a/sbt-test/scala2-compat/i14223/build.sbt b/sbt-test/scala2-compat/i14223/build.sbt new file mode 100644 index 000000000000..433a5e8baddf --- /dev/null +++ b/sbt-test/scala2-compat/i14223/build.sbt @@ -0,0 +1,13 @@ +val scala3Version = sys.props("plugin.scalaVersion") +val scala2Version = sys.props("plugin.scala2Version") + +lazy val lib = project.in(file("lib")) + .settings( + scalaVersion := scala2Version + ) + +lazy val app = project.in(file("app")) + .dependsOn(lib) + .settings( + scalaVersion := scala3Version + ) diff --git a/sbt-test/scala2-compat/i14223/lib/Lib.scala b/sbt-test/scala2-compat/i14223/lib/Lib.scala new file mode 100644 index 000000000000..5311bd22f313 --- /dev/null +++ b/sbt-test/scala2-compat/i14223/lib/Lib.scala @@ -0,0 +1,12 @@ +package kc + +trait Encoder[E] { + def encode: E + + @SuppressWarnings(Array("foo")) + def tag1: Encoder[E] = ??? + + // Make sure we handle empty Array literals too where we can't guess the Array type from its elements + @SuppressWarnings(Array()) + def tag2: Encoder[E] = ??? +} diff --git a/sbt-test/scala2-compat/i14223/test b/sbt-test/scala2-compat/i14223/test new file mode 100644 index 000000000000..19aca297fdcf --- /dev/null +++ b/sbt-test/scala2-compat/i14223/test @@ -0,0 +1 @@ +> app/compile From a8c8a8aa92365f5279558bcfb7eaa7850c7cef90 Mon Sep 17 00:00:00 2001 From: Kacper Korban Date: Fri, 28 Jan 2022 00:56:25 +0100 Subject: [PATCH 1107/1244] Correctly handle context functions in scaladoc closes #14343 --- scaladoc-testcases/src/tests/contextfunctions.scala | 4 ++++ scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala | 7 ++++--- .../signatures/TranslatableSignaturesTestCases.scala | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 scaladoc-testcases/src/tests/contextfunctions.scala diff --git a/scaladoc-testcases/src/tests/contextfunctions.scala b/scaladoc-testcases/src/tests/contextfunctions.scala new file mode 100644 index 000000000000..527053943b5e --- /dev/null +++ b/scaladoc-testcases/src/tests/contextfunctions.scala @@ -0,0 +1,4 @@ +package tests.contextfunctions + +val x: Int ?=> Float + = 5.0f diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala index faa8b61f807f..c0197b152a5f 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala @@ -182,18 +182,19 @@ trait TypesSupport: ++ plain(" ").l ++ inner(typeList.last) else if t.isFunctionType then + val arrow = if t.isContextFunctionType then " ?=> " else " => " typeList match case Nil => Nil case Seq(rtpe) => - plain("()").l ++ keyword(" => ").l ++ inner(rtpe) + plain("()").l ++ keyword(arrow).l ++ inner(rtpe) case Seq(arg, rtpe) => val partOfSignature = arg match case byName: ByNameType => plain("(").l ++ inner(byName) ++ plain(")").l case _ => inner(arg) - partOfSignature ++ keyword(" => ").l ++ inner(rtpe) + partOfSignature ++ keyword(arrow).l ++ inner(rtpe) case args => - plain("(").l ++ commas(args.init.map(inner)) ++ plain(")").l ++ keyword(" => ").l ++ inner(args.last) + plain("(").l ++ commas(args.init.map(inner)) ++ plain(")").l ++ keyword(arrow).l ++ inner(args.last) else if t.isTupleN then typeList match case Nil => diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala index d85d2d960d2c..e56b741f5fee 100644 --- a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala +++ b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala @@ -90,3 +90,5 @@ class ContextBounds extends SignatureTest("contextBounds", SignatureTest.all) class FBoundedTypeParameters extends SignatureTest("fboundedTypeParameters", SignatureTest.all) class Exports extends SignatureTest("exports2", SignatureTest.all, sourceFiles = List("exports1", "exports2")) + +class ContextFunctions extends SignatureTest("contextfunctions", SignatureTest.all) From fc1712303ab95632e1c94fbb118e379f78df35e0 Mon Sep 17 00:00:00 2001 From: Phil Date: Wed, 26 Jan 2022 09:48:05 -0700 Subject: [PATCH 1108/1244] addresses compile error mentioned in #14332 --- compiler/test/dotty/tools/scripting/ExpressionTest.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/test/dotty/tools/scripting/ExpressionTest.scala b/compiler/test/dotty/tools/scripting/ExpressionTest.scala index fd642a7744e0..cfab3e97788e 100755 --- a/compiler/test/dotty/tools/scripting/ExpressionTest.scala +++ b/compiler/test/dotty/tools/scripting/ExpressionTest.scala @@ -27,13 +27,13 @@ class ExpressionTest: @Test def verifyImports: Unit = val expressionLines = List( "import java.nio.file.Paths", - """val cwd = Paths.get(""."")""", - """println(cwd.toFile.listFiles.toList.filter(_.isDirectory).size)""", + s"""println(Paths.get("\""."\"").toFile.listFiles.toList.filter(_.isDirectory).size)""", ) val expression = expressionLines.mkString(";") - testExpression(expression){ result => + val success = testExpression(expression){ result => result.matches("[0-9]+") && result.toInt > 0 } + assert(success) def getResult(expression: String): String = val cmd = s"bin/scala -e $expression" @@ -42,7 +42,7 @@ class ExpressionTest: printf("stderr: %s\n", stderr.mkString("\n","\n","")) stdout.filter(_.nonEmpty).mkString("") - def testExpression(expression: String)(check: (result: String) => Boolean) = { + def testExpression(expression: String)(check: (result: String) => Boolean): Boolean = { val result = getResult(expression) check(result) } From 269dae2b28f6369483d4d6c6a9afc5151ef0844c Mon Sep 17 00:00:00 2001 From: Phil Date: Thu, 27 Jan 2022 15:13:02 -0700 Subject: [PATCH 1109/1244] remove unused code; eliminate quotes in eval expression --- .../test/dotty/tools/scripting/ExpressionTest.scala | 7 ++++--- .../test/dotty/tools/scripting/ScriptTestEnv.scala | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/compiler/test/dotty/tools/scripting/ExpressionTest.scala b/compiler/test/dotty/tools/scripting/ExpressionTest.scala index cfab3e97788e..f11d5d60dea0 100755 --- a/compiler/test/dotty/tools/scripting/ExpressionTest.scala +++ b/compiler/test/dotty/tools/scripting/ExpressionTest.scala @@ -25,9 +25,11 @@ class ExpressionTest: assert(result.contains(expected), s"expression [$expression] did not send [$expected] to stdout") @Test def verifyImports: Unit = + val expressionLines = List( "import java.nio.file.Paths", - s"""println(Paths.get("\""."\"").toFile.listFiles.toList.filter(_.isDirectory).size)""", + "import dotty.tools.dotc.config.Properties.userDir", + s"""println(Paths.get(userDir).toFile.listFiles.toList.filter(_.isDirectory).size)""", ) val expression = expressionLines.mkString(";") val success = testExpression(expression){ result => @@ -36,8 +38,7 @@ class ExpressionTest: assert(success) def getResult(expression: String): String = - val cmd = s"bin/scala -e $expression" - val (_, _, stdout, stderr) = bashCommand(s"""bin/scala -e '$expression'""") + val (_, _, stdout, stderr) = bashCommand(s"$scalaPath -e '$expression'") printf("stdout: %s\n", stdout.mkString("|")) printf("stderr: %s\n", stderr.mkString("\n","\n","")) stdout.filter(_.nonEmpty).mkString("") diff --git a/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala b/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala index a37918f93ed2..15bcf4034a5f 100644 --- a/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala +++ b/compiler/test/dotty/tools/scripting/ScriptTestEnv.scala @@ -21,13 +21,14 @@ object ScriptTestEnv { def psep: String = sys.props("path.separator") def userDir: String = sys.props("user.dir").norm def testCwd = envOrElse("TEST_CWD", "").norm // optional working directory TEST_CWD + def verbose = envOrElse("VERBOSE", "").nonEmpty def whichJava: String = whichExe("java") def whichBash: String = whichExe("bash") lazy val workingDirectory: String = { val dirstr = if testCwd.nonEmpty then - printf("TEST_CWD set to [%s]\n", testCwd) + if verbose then printf("TEST_CWD set to [%s]\n", testCwd) testCwd else userDir // userDir, if TEST_CWD not set @@ -37,7 +38,7 @@ object ScriptTestEnv { if !test.isDirectory then printf("warning: not found below working directory: %s\n", test.norm) - printf("working directory is [%s]\n", dirstr) + if verbose then printf("working directory is [%s]\n", dirstr) dirstr } @@ -106,7 +107,7 @@ object ScriptTestEnv { // a misconfigured environment (e.g., script is not executable) can prevent script execution val validTest = !stderr.exists(_.contains("Permission denied")) if ! validTest then - printf("\nunable to execute script, return value is %d\n", exitVal) + System.err.printf("\nunable to execute script, return value is %d\n", exitVal) stderr.foreach { System.err.printf("stderr [%s]\n", _) } (validTest, exitVal, stdout.reverse, stderr.reverse) @@ -275,8 +276,7 @@ object ScriptTestEnv { ("MSYS", msyshome), ("SHELLOPTS", shellopts), ).filter { case (name, valu) => valu.nonEmpty } - for (k, v) <- pairs do - printf("%s : %s\n", k ,v) + if verbose then for (k, v) <- pairs do printf("%s : %s\n", k ,v) pairs } From c296385f4c2fc15ee85995bfd5793f67e7d1289c Mon Sep 17 00:00:00 2001 From: Phil Date: Thu, 27 Jan 2022 17:30:04 -0700 Subject: [PATCH 1110/1244] remove unused code, cleanup old-style syntax, add main method to ExpressionTest --- .../dotty/tools/scripting/ExpressionTest.scala | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/compiler/test/dotty/tools/scripting/ExpressionTest.scala b/compiler/test/dotty/tools/scripting/ExpressionTest.scala index f11d5d60dea0..136007af835d 100755 --- a/compiler/test/dotty/tools/scripting/ExpressionTest.scala +++ b/compiler/test/dotty/tools/scripting/ExpressionTest.scala @@ -25,11 +25,10 @@ class ExpressionTest: assert(result.contains(expected), s"expression [$expression] did not send [$expected] to stdout") @Test def verifyImports: Unit = - val expressionLines = List( "import java.nio.file.Paths", - "import dotty.tools.dotc.config.Properties.userDir", - s"""println(Paths.get(userDir).toFile.listFiles.toList.filter(_.isDirectory).size)""", + "import scala.util.Properties.userDir", + "println(Paths.get(userDir).toFile.listFiles.toList.filter(_.isDirectory).size)", ) val expression = expressionLines.mkString(";") val success = testExpression(expression){ result => @@ -40,11 +39,18 @@ class ExpressionTest: def getResult(expression: String): String = val (_, _, stdout, stderr) = bashCommand(s"$scalaPath -e '$expression'") printf("stdout: %s\n", stdout.mkString("|")) - printf("stderr: %s\n", stderr.mkString("\n","\n","")) + printf("stderr: %s\n", stderr.mkString("\n", "\n", "")) stdout.filter(_.nonEmpty).mkString("") - def testExpression(expression: String)(check: (result: String) => Boolean): Boolean = { + def testExpression(expression: String)(check: (result: String) => Boolean): Boolean = val result = getResult(expression) check(result) - } +object ExpressionTest: + + def main(args: Array[String]): Unit = + val tests = new ExpressionTest + println("\n=== verifyCommandLineExpression ===") + tests.verifyCommandLineExpression + println("\n=== verifyImports ===") + tests.verifyImports From 63c7fa2d2feb83c80058f6fc82e0dba9f43ac729 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 28 Jan 2022 16:32:24 +0100 Subject: [PATCH 1111/1244] Close Files.lines stream Fixes #14376 --- compiler/test/dotty/tools/utils.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala index c70dbf3456cb..f1faa77b1f48 100644 --- a/compiler/test/dotty/tools/utils.scala +++ b/compiler/test/dotty/tools/utils.scala @@ -47,7 +47,11 @@ def assertThrows[T <: Throwable: ClassTag](p: T => Boolean)(body: => Any): Unit end assertThrows def toolArgsFor(files: List[JPath], charset: Charset = UTF_8): List[String] = - files.flatMap(path => toolArgsParse(Files.lines(path, charset).limit(10).toScala(List))) + files.flatMap(path => toolArgsParse { + val stream = Files.lines(path, charset) + try stream.limit(10).toScala(List) + finally stream.close() + }) // Inspect the first 10 of the given lines for compiler options of the form // `// scalac: args`, `/* scalac: args`, ` * scalac: args`. From 2282b1d4b89ca910fb598931a81b8fdb3bfae9a4 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 28 Jan 2022 16:42:23 +0100 Subject: [PATCH 1112/1244] Use `Using.resource` --- compiler/test/dotty/tools/utils.scala | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala index f1faa77b1f48..388715f45cc2 100644 --- a/compiler/test/dotty/tools/utils.scala +++ b/compiler/test/dotty/tools/utils.scala @@ -47,11 +47,7 @@ def assertThrows[T <: Throwable: ClassTag](p: T => Boolean)(body: => Any): Unit end assertThrows def toolArgsFor(files: List[JPath], charset: Charset = UTF_8): List[String] = - files.flatMap(path => toolArgsParse { - val stream = Files.lines(path, charset) - try stream.limit(10).toScala(List) - finally stream.close() - }) + files.flatMap(path => toolArgsParse(resource(Files.lines(path, charset))(_.limit(10).toScala(List)))) // Inspect the first 10 of the given lines for compiler options of the form // `// scalac: args`, `/* scalac: args`, ` * scalac: args`. From 37dae0f84cc02b9c7e03427e8619ba56fafc1f34 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 26 Jan 2022 22:02:55 +0100 Subject: [PATCH 1113/1244] Keep language imports around longer Some phases might need to know what language imports are active. Concretely, uner explicit nulls, the exhaustivity checks for patterns need to know that. We therefore keep language imports until phase PruneErasedDefs. Other imports are dropped in FirstTransform, as before. The handling of statements in MegaPhase was changed so that imports now are visible in the context for transforming the following statements. Fixes #14346 --- .../tools/dotc/transform/FirstTransform.scala | 8 +++-- .../tools/dotc/transform/MegaPhase.scala | 34 +++++++++++++++++-- .../dotc/transform/PruneErasedDefs.scala | 10 ++++++ .../src/dotty/tools/dotc/typer/Typer.scala | 2 +- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala index 1ff9edda16d8..03ab3860a127 100644 --- a/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala +++ b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala @@ -25,7 +25,8 @@ object FirstTransform { } /** The first tree transform - * - eliminates some kinds of trees: Imports, NamedArgs + * - eliminates some kinds of trees: Imports other than language imports, + * Exports, NamedArgs, type trees other than TypeTree * - stubs out native methods * - eliminates self tree in Template and self symbol in ClassInfo * - collapses all type trees to trees of class TypeTree @@ -58,7 +59,7 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase => tree.symbol.is(JavaStatic) && qualTpe.derivesFrom(tree.symbol.enclosingClass), i"non member selection of ${tree.symbol.showLocated} from ${qualTpe} in $tree") case _: TypeTree => - case _: Import | _: NamedArg | _: TypTree => + case _: Export | _: NamedArg | _: TypTree => assert(false, i"illegal tree: $tree") case _ => } @@ -136,7 +137,8 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase => } override def transformOther(tree: Tree)(using Context): Tree = tree match { - case tree: ImportOrExport => EmptyTree + case tree: Import if untpd.languageImport(tree.expr).isEmpty => EmptyTree + case tree: Export => EmptyTree case tree: NamedArg => transformAllDeep(tree.arg) case tree => if (tree.isType) toTypeTree(tree) else tree } diff --git a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala index 77671fc6498c..a7a19d03e9ff 100644 --- a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala +++ b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala @@ -432,16 +432,44 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase { def transformSpecificTree[T <: Tree](tree: T, start: Int)(using Context): T = transformTree(tree, start).asInstanceOf[T] - def transformStats(trees: List[Tree], exprOwner: Symbol, start: Int)(using Context): List[Tree] = { + def transformStats(trees: List[Tree], exprOwner: Symbol, start: Int)(using Context): List[Tree] = + def transformStat(stat: Tree)(using Context): Tree = stat match { case _: Import | _: DefTree => transformTree(stat, start) case Thicket(stats) => cpy.Thicket(stat)(stats.mapConserve(transformStat)) case _ => transformTree(stat, start)(using ctx.exprContext(stat, exprOwner)) } + + def restContext(tree: Tree)(using Context): Context = tree match + case imp: Import => ctx.importContext(imp, imp.symbol) + case _ => ctx + + // A slower implementation that avoids deep recursions and stack overflows + def transformSlow(trees: List[Tree])(using Context): List[Tree] = + var curCtx = ctx + flatten(trees.mapConserve { tree => + val tree1 = transformStat(tree)(using curCtx) + curCtx = restContext(tree)(using curCtx) + tree1 + }) + + def recur(trees: List[Tree], count: Int)(using Context): List[Tree] = + if count > MapRecursionLimit then + transformSlow(trees) + else trees match + case tree :: rest => + val tree1 = transformStat(tree) + val rest1 = recur(rest, count + 1)(using restContext(tree)) + if (tree1 eq tree) && (rest1 eq rest) then trees + else tree1 match + case Thicket(elems1) => elems1 ::: rest1 + case _ => tree1 :: rest1 + case nil => nil + val nestedCtx = prepStats(trees, start) - val trees1 = trees.mapInline(transformStat(_)(using nestedCtx)) + val trees1 = recur(trees, 0)(using nestedCtx) goStats(trees1, start)(using nestedCtx) - } + end transformStats def transformUnit(tree: Tree)(using Context): Tree = { val nestedCtx = prepUnit(tree, 0) diff --git a/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala b/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala index 7d8f0025eb15..e52b77379c27 100644 --- a/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala +++ b/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala @@ -14,6 +14,7 @@ import StdNames.nme import ast.tpd import SymUtils._ import config.Feature +import Decorators.* /** This phase makes all erased term members of classes private so that they cannot * conflict with non-erased members. This is needed so that subsequent phases like @@ -21,6 +22,7 @@ import config.Feature * The phase also replaces all expressions that appear in an erased context by * default values. This is necessary so that subsequent checking phases such * as IsInstanceOfChecker don't give false negatives. + * Finally, the phase drops (language-) imports. */ class PruneErasedDefs extends MiniPhase with SymTransformer { thisTransform => import tpd._ @@ -54,10 +56,18 @@ class PruneErasedDefs extends MiniPhase with SymTransformer { thisTransform => checkErasedInExperimental(tree.symbol) tree + override def transformOther(tree: Tree)(using Context): Tree = tree match + case tree: Import => EmptyTree + case _ => tree + def checkErasedInExperimental(sym: Symbol)(using Context): Unit = // Make an exception for Scala 2 experimental macros to allow dual Scala 2/3 macros under non experimental mode if sym.is(Erased, butNot = Macro) && sym != defn.Compiletime_erasedValue && !sym.isInExperimentalScope then Feature.checkExperimentalFeature("erased", sym.sourcePos) + + override def checkPostCondition(tree: Tree)(using Context): Unit = tree match + case _: tpd.Import => assert(false, i"illegal tree: $tree") + case _ => } object PruneErasedDefs { diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 4c0c10f7c026..02f3f6b4f164 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -2556,7 +2556,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer |The selector is not a member of an object or package.""") else typd(imp.expr, AnySelectionProto) - def typedImport(imp: untpd.Import, sym: Symbol)(using Context): Import = + def typedImport(imp: untpd.Import, sym: Symbol)(using Context): Tree = val expr1 = typedImportQualifier(imp, typedExpr(_, _)(using ctx.withOwner(sym))) checkLegalImportPath(expr1) val selectors1 = typedSelectors(imp.selectors) From 7da757c2557b23a7084f14ce7b83c6d60c38a66a Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 28 Jan 2022 10:17:24 +0100 Subject: [PATCH 1114/1244] Make import contexts visible in macro transforms Todo: We have very similar and involved operations now sor handling statements in tpd.TreeMapWithPreciseStatContexts and MegaPhase. Can we factor out the common logic? But we should not create any closures doing so, to keep things fast. --- .../tools/dotc/ast/TreeMapWithImplicits.scala | 41 +---------------- compiler/src/dotty/tools/dotc/ast/tpd.scala | 46 ++++++++++++++++++- .../tools/dotc/transform/MacroTransform.scala | 14 ++---- 3 files changed, 49 insertions(+), 52 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala b/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala index 359f5d5c2580..3f4ff4687787 100644 --- a/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala +++ b/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala @@ -15,51 +15,12 @@ import scala.annotation.tailrec * * This incudes implicits defined in scope as well as imported implicits. */ -class TreeMapWithImplicits extends tpd.TreeMap { +class TreeMapWithImplicits extends tpd.TreeMapWithPreciseStatContexts { import tpd._ def transformSelf(vd: ValDef)(using Context): ValDef = cpy.ValDef(vd)(tpt = transform(vd.tpt)) - /** Transform statements, while maintaining import contexts and expression contexts - * in the same way as Typer does. The code addresses additional concerns: - * - be tail-recursive where possible - * - don't re-allocate trees where nothing has changed - */ - override def transformStats(stats: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = { - - @tailrec def traverse(curStats: List[Tree])(using Context): List[Tree] = { - - def recur(stats: List[Tree], changed: Tree, rest: List[Tree])(using Context): List[Tree] = - if (stats eq curStats) { - val rest1 = transformStats(rest, exprOwner) - changed match { - case Thicket(trees) => trees ::: rest1 - case tree => tree :: rest1 - } - } - else stats.head :: recur(stats.tail, changed, rest) - - curStats match { - case stat :: rest => - val statCtx = stat match { - case stat: DefTree => ctx - case _ => ctx.exprContext(stat, exprOwner) - } - val restCtx = stat match { - case stat: Import => ctx.importContext(stat, stat.symbol) - case _ => ctx - } - val stat1 = transform(stat)(using statCtx) - if (stat1 ne stat) recur(stats, stat1, rest)(using restCtx) - else traverse(rest)(using restCtx) - case nil => - stats - } - } - traverse(stats) - } - private def nestedScopeCtx(defs: List[Tree])(using Context): Context = { val nestedCtx = ctx.fresh.setNewScope defs foreach { diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index 1334a4f73016..f0db2533bfdb 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -1153,10 +1153,54 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { recur(trees, 0) end extension + /** A treemap that generates the same contexts as the original typer for statements. + * This means: + * - statements that are not definitions get the exprOwner as owner + * - imports are reflected in the contexts of subsequent statements + */ + class TreeMapWithPreciseStatContexts(cpy: TreeCopier = tpd.cpy) extends TreeMap(cpy): + + /** Transform statements, while maintaining import contexts and expression contexts + * in the same way as Typer does. The code addresses additional concerns: + * - be tail-recursive where possible + * - don't re-allocate trees where nothing has changed + */ + override def transformStats(stats: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = + + @tailrec def traverse(curStats: List[Tree])(using Context): List[Tree] = + + def recur(stats: List[Tree], changed: Tree, rest: List[Tree])(using Context): List[Tree] = + if stats eq curStats then + val rest1 = transformStats(rest, exprOwner) + changed match + case Thicket(trees) => trees ::: rest1 + case tree => tree :: rest1 + else + stats.head :: recur(stats.tail, changed, rest) + + curStats match + case stat :: rest => + val statCtx = stat match + case _: DefTree | _: ImportOrExport => ctx + case _ => ctx.exprContext(stat, exprOwner) + val restCtx = stat match + case stat: Import => ctx.importContext(stat, stat.symbol) + case _ => ctx + val stat1 = transform(stat)(using statCtx) + if stat1 ne stat then recur(stats, stat1, rest)(using restCtx) + else traverse(rest)(using restCtx) + case nil => + stats + + traverse(stats) + end transformStats + + end TreeMapWithPreciseStatContexts + /** Map Inlined nodes, NamedArgs, Blocks with no statements and local references to underlying arguments. * Also drops Inline and Block with no statements. */ - class MapToUnderlying extends TreeMap { + private class MapToUnderlying extends TreeMap { override def transform(tree: Tree)(using Context): Tree = tree match { case tree: Ident if isBinding(tree.symbol) && skipLocal(tree.symbol) => tree.symbol.defTree match { diff --git a/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala b/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala index 6a246e509e61..0baf85c4e21d 100644 --- a/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala +++ b/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala @@ -29,19 +29,11 @@ abstract class MacroTransform extends Phase { */ protected def transformPhase(using Context): Phase = this - class Transformer extends TreeMap(cpy = cpyBetweenPhases) { + class Transformer extends TreeMapWithPreciseStatContexts(cpy = cpyBetweenPhases): - protected def localCtx(tree: Tree)(using Context): FreshContext = + protected def localCtx(tree: Tree)(using Context): FreshContext = ctx.fresh.setTree(tree).setOwner(localOwner(tree)) - override def transformStats(trees: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = { - def transformStat(stat: Tree): Tree = stat match { - case _: Import | _: DefTree => transform(stat) - case _ => transform(stat)(using ctx.exprContext(stat, exprOwner)) - } - flatten(trees.mapconserve(transformStat(_))) - } - override def transform(tree: Tree)(using Context): Tree = try tree match { @@ -67,5 +59,5 @@ abstract class MacroTransform extends Phase { def transformSelf(vd: ValDef)(using Context): ValDef = cpy.ValDef(vd)(tpt = transform(vd.tpt)) - } + end Transformer } From b7f063d4211b5e7865c8a299209b1d54b99090f3 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 28 Jan 2022 13:00:07 +0100 Subject: [PATCH 1115/1244] A version of transformStats that avoids stack overflows --- compiler/src/dotty/tools/dotc/ast/tpd.scala | 41 +++++++++++---------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index f0db2533bfdb..3e63f14e2634 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -1164,37 +1164,38 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { * in the same way as Typer does. The code addresses additional concerns: * - be tail-recursive where possible * - don't re-allocate trees where nothing has changed + * - avoid stack overflows for long statement lists */ override def transformStats(stats: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = - - @tailrec def traverse(curStats: List[Tree])(using Context): List[Tree] = - - def recur(stats: List[Tree], changed: Tree, rest: List[Tree])(using Context): List[Tree] = - if stats eq curStats then - val rest1 = transformStats(rest, exprOwner) - changed match - case Thicket(trees) => trees ::: rest1 - case tree => tree :: rest1 - else - stats.head :: recur(stats.tail, changed, rest) - - curStats match + @tailrec + def loop(mapped: mutable.ListBuffer[Tree] | Null, unchanged: List[Tree], pending: List[Tree])(using Context): List[Tree] = + pending match case stat :: rest => - val statCtx = stat match + def statCtx = stat match case _: DefTree | _: ImportOrExport => ctx case _ => ctx.exprContext(stat, exprOwner) - val restCtx = stat match + def restCtx = stat match case stat: Import => ctx.importContext(stat, stat.symbol) case _ => ctx val stat1 = transform(stat)(using statCtx) - if stat1 ne stat then recur(stats, stat1, rest)(using restCtx) - else traverse(rest)(using restCtx) + if stat1 eq stat then + loop(mapped, unchanged, rest) + else + val buf = if mapped == null then new mutable.ListBuffer[Tree] else mapped + var xc = unchanged + while xc ne pending do + buf += xc.head + xc = xc.tail + stat1 match + case Thicket(stats1) => buf ++= stats1 + case _ => buf += stat1 + loop(buf, rest, rest)(using restCtx) case nil => - stats + if mapped == null then unchanged + else mapped.prependToList(unchanged) - traverse(stats) + loop(null, stats, stats) end transformStats - end TreeMapWithPreciseStatContexts /** Map Inlined nodes, NamedArgs, Blocks with no statements and local references to underlying arguments. From d1c32f2b4691063ce579139709562147daa07148 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Fri, 28 Jan 2022 14:02:17 +0100 Subject: [PATCH 1116/1244] Use a single "mapStatements" implementation in three places Use a single "mapStatements" implementation in three TreeMapWithImplicits, MacroTransform, and MegaPhase. --- compiler/src/dotty/tools/dotc/ast/tpd.scala | 36 +++++++++---------- .../tools/dotc/transform/MegaPhase.scala | 36 +------------------ 2 files changed, 19 insertions(+), 53 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index 3e63f14e2634..98ea6e0c5c44 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -1151,35 +1151,26 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { case _ => tree1 :: rest1 case nil => nil recur(trees, 0) - end extension - - /** A treemap that generates the same contexts as the original typer for statements. - * This means: - * - statements that are not definitions get the exprOwner as owner - * - imports are reflected in the contexts of subsequent statements - */ - class TreeMapWithPreciseStatContexts(cpy: TreeCopier = tpd.cpy) extends TreeMap(cpy): - /** Transform statements, while maintaining import contexts and expression contexts + /** Transform statements while maintaining import contexts and expression contexts * in the same way as Typer does. The code addresses additional concerns: * - be tail-recursive where possible * - don't re-allocate trees where nothing has changed - * - avoid stack overflows for long statement lists */ - override def transformStats(stats: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = + inline def mapStatements(exprOwner: Symbol, inline op: Tree => Context ?=> Tree)(using Context): List[Tree] = @tailrec def loop(mapped: mutable.ListBuffer[Tree] | Null, unchanged: List[Tree], pending: List[Tree])(using Context): List[Tree] = pending match case stat :: rest => - def statCtx = stat match + val statCtx = stat match case _: DefTree | _: ImportOrExport => ctx case _ => ctx.exprContext(stat, exprOwner) - def restCtx = stat match + val stat1 = op(stat)(using statCtx) + val restCtx = stat match case stat: Import => ctx.importContext(stat, stat.symbol) case _ => ctx - val stat1 = transform(stat)(using statCtx) if stat1 eq stat then - loop(mapped, unchanged, rest) + loop(mapped, unchanged, rest)(using restCtx) else val buf = if mapped == null then new mutable.ListBuffer[Tree] else mapped var xc = unchanged @@ -1194,9 +1185,18 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { if mapped == null then unchanged else mapped.prependToList(unchanged) - loop(null, stats, stats) - end transformStats - end TreeMapWithPreciseStatContexts + loop(null, trees, trees) + end mapStatements + end extension + + /** A treemap that generates the same contexts as the original typer for statements. + * This means: + * - statements that are not definitions get the exprOwner as owner + * - imports are reflected in the contexts of subsequent statements + */ + class TreeMapWithPreciseStatContexts(cpy: TreeCopier = tpd.cpy) extends TreeMap(cpy): + override def transformStats(trees: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = + trees.mapStatements(exprOwner, transform(_)) /** Map Inlined nodes, NamedArgs, Blocks with no statements and local references to underlying arguments. * Also drops Inline and Block with no statements. diff --git a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala index a7a19d03e9ff..1d8a2d6b9eee 100644 --- a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala +++ b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala @@ -433,43 +433,9 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase { transformTree(tree, start).asInstanceOf[T] def transformStats(trees: List[Tree], exprOwner: Symbol, start: Int)(using Context): List[Tree] = - - def transformStat(stat: Tree)(using Context): Tree = stat match { - case _: Import | _: DefTree => transformTree(stat, start) - case Thicket(stats) => cpy.Thicket(stat)(stats.mapConserve(transformStat)) - case _ => transformTree(stat, start)(using ctx.exprContext(stat, exprOwner)) - } - - def restContext(tree: Tree)(using Context): Context = tree match - case imp: Import => ctx.importContext(imp, imp.symbol) - case _ => ctx - - // A slower implementation that avoids deep recursions and stack overflows - def transformSlow(trees: List[Tree])(using Context): List[Tree] = - var curCtx = ctx - flatten(trees.mapConserve { tree => - val tree1 = transformStat(tree)(using curCtx) - curCtx = restContext(tree)(using curCtx) - tree1 - }) - - def recur(trees: List[Tree], count: Int)(using Context): List[Tree] = - if count > MapRecursionLimit then - transformSlow(trees) - else trees match - case tree :: rest => - val tree1 = transformStat(tree) - val rest1 = recur(rest, count + 1)(using restContext(tree)) - if (tree1 eq tree) && (rest1 eq rest) then trees - else tree1 match - case Thicket(elems1) => elems1 ::: rest1 - case _ => tree1 :: rest1 - case nil => nil - val nestedCtx = prepStats(trees, start) - val trees1 = recur(trees, 0)(using nestedCtx) + val trees1 = trees.mapStatements(exprOwner, transformTree(_, start))(using nestedCtx) goStats(trees1, start)(using nestedCtx) - end transformStats def transformUnit(tree: Tree)(using Context): Tree = { val nestedCtx = prepUnit(tree, 0) From e93f515c023f6cb049bfae1700c4ee362fe2e8b5 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sat, 29 Jan 2022 10:52:52 +0100 Subject: [PATCH 1117/1244] Update experimental overview page --- docs/docs/reference/experimental/overview.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/docs/reference/experimental/overview.md b/docs/docs/reference/experimental/overview.md index fdd44832fd8f..d7686b8ecc02 100644 --- a/docs/docs/reference/experimental/overview.md +++ b/docs/docs/reference/experimental/overview.md @@ -13,6 +13,13 @@ They are enabled by importing the feature or using the `-language` compiler flag * `fewerBraces`: Enable support for using indentation for arguments. * [`genericNumberLiterals`](./numeric-literals.md): Enable support for generic number literals. * [`namedTypeArguments`](./named-typeargs.md): Enable support for named type arguments +* [`saferExceptions`](./canthrow.md): Enable support for checked exceptions. + +### Experimental language features supported by special compiler options + +Some experimental language features that are still in research and development can be enabled with special compiler options. These include + +* `-Yexplicit-nulls` Enable support for tracking null references in the type system. ### Experimental language imports From 1b4a89dc9bfbf53ff07f9088304411a6e9dada30 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sat, 29 Jan 2022 15:04:19 +0100 Subject: [PATCH 1118/1244] Reorganize side bar and overview page --- docs/docs/reference/experimental/overview.md | 11 ++++++----- docs/sidebar.yml | 2 -- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/docs/reference/experimental/overview.md b/docs/docs/reference/experimental/overview.md index d7686b8ecc02..785816412e24 100644 --- a/docs/docs/reference/experimental/overview.md +++ b/docs/docs/reference/experimental/overview.md @@ -1,6 +1,6 @@ --- layout: doc-page -title: "Experimental language features" +title: "Overview" movedTo: https://docs.scala-lang.org/scala3/reference/experimental/overview.html --- @@ -15,13 +15,14 @@ They are enabled by importing the feature or using the `-language` compiler flag * [`namedTypeArguments`](./named-typeargs.md): Enable support for named type arguments * [`saferExceptions`](./canthrow.md): Enable support for checked exceptions. +### Experimental language imports + +In general, experimental language features can be imported in an experimental scope (see [experimental definitions](../other-new-features/experimental-defs.md). +They can be imported at the top-level if all top-level definitions are @experimental. + ### Experimental language features supported by special compiler options Some experimental language features that are still in research and development can be enabled with special compiler options. These include * `-Yexplicit-nulls` Enable support for tracking null references in the type system. -### Experimental language imports - -In general, experimental language features can be imported in an experimental scope (see [experimental definitions](../other-new-features/experimental-defs.md). -They can be imported at the top-level if all top-level definitions are @experimental. diff --git a/docs/sidebar.yml b/docs/sidebar.yml index 6f8af7cd53eb..31fa0d11a1a3 100644 --- a/docs/sidebar.yml +++ b/docs/sidebar.yml @@ -114,9 +114,7 @@ sidebar: - page: docs/reference/experimental/overview.md - page: docs/reference/experimental/canthrow.md - page: docs/reference/experimental/erased-defs.md - - page: docs/reference/experimental/erased-defs-spec.md - page: docs/reference/experimental/named-typeargs.md - - page: docs/reference/experimental/named-typeargs-spec.md - page: docs/reference/experimental/numeric-literals.md - page: docs/reference/syntax.md - title: Language Versions From fc885f986b8f89c46d70ad33d2f385785a6ee668 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sat, 29 Jan 2022 15:12:58 +0100 Subject: [PATCH 1119/1244] Move explicit-nulls page to experimental section --- .../{other-new-features => experimental}/explicit-nulls.md | 0 docs/docs/reference/experimental/overview.md | 2 +- docs/sidebar.yml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename docs/docs/reference/{other-new-features => experimental}/explicit-nulls.md (100%) diff --git a/docs/docs/reference/other-new-features/explicit-nulls.md b/docs/docs/reference/experimental/explicit-nulls.md similarity index 100% rename from docs/docs/reference/other-new-features/explicit-nulls.md rename to docs/docs/reference/experimental/explicit-nulls.md diff --git a/docs/docs/reference/experimental/overview.md b/docs/docs/reference/experimental/overview.md index 785816412e24..2644de0d864e 100644 --- a/docs/docs/reference/experimental/overview.md +++ b/docs/docs/reference/experimental/overview.md @@ -24,5 +24,5 @@ They can be imported at the top-level if all top-level definitions are @experime Some experimental language features that are still in research and development can be enabled with special compiler options. These include -* `-Yexplicit-nulls` Enable support for tracking null references in the type system. +* [`-Yexplicit-nulls`](./explicit-nulls.md). Enable support for tracking null references in the type system. diff --git a/docs/sidebar.yml b/docs/sidebar.yml index 31fa0d11a1a3..0a0e8acae652 100644 --- a/docs/sidebar.yml +++ b/docs/sidebar.yml @@ -64,7 +64,6 @@ sidebar: - page: docs/reference/other-new-features/targetName.md - page: docs/reference/other-new-features/control-syntax.md - page: docs/reference/other-new-features/indentation.md - - page: docs/reference/other-new-features/explicit-nulls.md - page: docs/reference/other-new-features/safe-initialization.md - page: docs/reference/other-new-features/type-test.md - page: docs/reference/other-new-features/experimental-defs.md @@ -116,6 +115,7 @@ sidebar: - page: docs/reference/experimental/erased-defs.md - page: docs/reference/experimental/named-typeargs.md - page: docs/reference/experimental/numeric-literals.md + - page: docs/reference/experimental/explicit-nulls.md - page: docs/reference/syntax.md - title: Language Versions index: docs/reference/language-versions/language-versions.md From c5d2be74789d8cedd3247000d6a46105f0f7e98f Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Mon, 31 Jan 2022 12:29:19 +0100 Subject: [PATCH 1120/1244] refactor: improve output of -Xshow-phases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change improves the usability and the display of the current -Xshow-phases flag. Currently when this is used you just get a big flattened list like so: ``` ❯ scala3-compiler -Xshow-phases parser typer inlinedPositions sbt-deps extractSemanticDB posttyper prepjsinterop sbt-api SetRootTree pickler inlining postInlining staging pickleQuotes {firstTransform, checkReentrant, elimPackagePrefixes, cookComments, checkStatic, checkLoopingImplicits, betaReduce, inlineVals, expandSAMs} initChecker {elimRepeated, protectedAccessors, extmethods, uncacheGivenAliases, byNameClosures, hoistSuperArgs, specializeApplyMethods, refchecks, tryCatchPatterns, patternMatcher} {elimOpaque, explicitJSClasses, explicitOuter, explicitSelf, elimByName, stringInterpolatorOpt} {pruneErasedDefs, uninitializedDefs, inlinePatterns, vcInlineMethods, seqLiterals, intercepted, getters, specializeFunctions, liftTry, collectNullableFields, elimOuterSelect, resolveSuper, functionXXLForwarders, paramForwarding, genericTuples, letOverApply, arrayConstructors} erasure {elimErasedValueType, pureStats, vcElideAllocations, arrayApply, addLocalJSFakeNews, elimPolyFunction, tailrec, completeJavaEnums, mixin, lazyVals, memoize, nonLocalReturns, capturedVars} {constructors, instrumentation} {lambdaLift, elimStaticThis, countOuterAccesses} {dropOuterAccessors, checkNoSuperThis, flatten, transformWildcards, moveStatic, expandPrivate, restoreScopes, selectStatic, junitBootstrappers, Collect entry points, collectSuperCalls, repeatableAnnotations} genSJSIR genBCode ``` This changes mimics the Scala 2 compiler and provides a more structured output that also contains the description of the phase: ``` sbt:scala3> scala3/scalac -Xshow-phases phase name description ---------- ----------- parser scan and parse sources typer type the trees inlinedPositions check inlined positions sbt-deps sends information on classes' dependencies to sbt extractSemanticDB extract info into .semanticdb files posttyper additional checks and cleanups after type checking prepjsinterop additional checks and transformations for Scala.js sbt-api sends a representation of the API of classes to sbt SetRootTree set the rootTreeOrProvider on class symbols pickler generates TASTy info inlining inline and execute macros postInlining add mirror support for inlined code staging check staging levels and heal staged types pickleQuotes turn quoted trees into explicit run-time data struct { firstTransform some transformations to put trees into a canonical f checkReentrant check no data races involving global vars elimPackagePrefixes eliminate references to package prefixes in Select n cookComments cook the comments: expand variables, doc, etc. checkStatic check restrictions that apply to @static members checkLoopingImplicits check that implicit defs do not call themselves in a betaReduce reduce closure applications inlineVals check right hand-sides of an `inline val`s expandSAMs expand SAM closures to anonymous classes elimRepeated rewrite vararg parameters and arguments refchecks checks related to abstract members and overriding } initChecker check initialization of objects { crossVersionChecks check issues related to deprecated and experimental protectedAccessors add accessors for protected members extmethods expand methods of value classes with extension metho uncacheGivenAliases avoid caching RHS of simple parameterless given alia elimByName map by-name parameters to functions hoistSuperArgs hoist complex arguments of supercalls to enclosing s forwardDepChecks ensure no forward references to local vals specializeApplyMethods adds specialized methods to FunctionN tryCatchPatterns compile cases in try/catch patternMatcher compile pattern matches } { elimOpaque turn opaque into normal aliases explicitJSClasses make all JS classes explicit explicitOuter add accessors to outer classes from nested ones explicitSelf make references to non-trivial self types explicit a stringInterpolatorOpt optimize raw and s string interpolators } { pruneErasedDefs drop erased definitions and simplify erased expressi uninitializedDefs replaces `compiletime.uninitialized` by `_` inlinePatterns remove placeholders of inlined patterns vcInlineMethods inlines calls to value class methods seqLiterals express vararg arguments as arrays intercepted handling of `==`, `|=`, `getClass` methods getters replace non-private vals and vars with getter defs specializeFunctions specialize Function{0,1,2} by replacing super with s liftTry Lifts try's that might be executed on non-empty expr collectNullableFields collect fields that can be nulled out after use in l elimOuterSelect expand outer selections resolveSuper implement super accessors functionXXLForwarders add forwarders for FunctionXXL apply methods paramForwarding add forwarders for aliases of superclass parameters genericTuples optimize generic operations on tuples letOverApply lift blocks from receivers of applications arrayConstructors intercept creation of (non-generic) arrays and intri } erasure rewrite types to JVM model { elimErasedValueType expand erased value types to their underlying implme pureStats remove pure statements in blocks vcElideAllocations peep-hole optimization to eliminate unnecessary valu etaReduce reduce eta expansions of pure paths arrayApply optimize `scala.Array.apply` addLocalJSFakeNews adds fake new invocations to local JS classes in cal elimPolyFunction rewrite PolyFunction subclasses to FunctionN subclas tailrec rewrite tail recursion to loops completeJavaEnums fill in constructors for Java enums mixin expand trait fields and trait initializers lazyVals expand lazy vals memoize add private fields to getters and setters nonLocalReturns expand non-local returns capturedVars represent vars captured by closures as heap objects } { constructors collect initialization code in primary constructors instrumentation count calls and allocations under -Yinstrument } { lambdaLift lifts out nested functions to class scope elimStaticThis replace This references to static objects by global countOuterAccesses identify outer accessors that can be dropped } { dropOuterAccessors drop unused outer accessors checkNoSuperThis check that supercalls don't contain references to Th flatten lift all inner classes to package scope transformWildcards replace wildcards with default values moveStatic move static methods from companion to the class itse expandPrivate widen private definitions accessed from nested class restoreScopes repair rendered invalid scopes selectStatic get rid of selects that would be compiled into GetSt junitBootstrappers generate JUnit-specific bootstrapper classes for Sca Collect entry points collect all entry points and save them in the contex collectSuperCalls find classes that are called with super repeatableAnnotations aggregate repeatable annotations } genSJSIR generate .sjsir files for Scala.js genBCode generate JVM bytecode ``` The mini-phases are still grouped and indicated by the surrounding `{}`. There are also some small changes in all the phase files to ensure they are all done the same way with overriding the phaseName and the description, both provided in a companion object. The descriptions themselves were just pulled from the comments in the code. --- .../tools/backend/jvm/CollectSuperCalls.scala | 8 ++++- .../dotty/tools/backend/jvm/GenBCode.scala | 6 +++- .../dotty/tools/backend/sjs/GenSJSIR.scala | 9 +++++- .../dotty/tools/dotc/config/CliCommand.scala | 31 ++++++++++++++++--- .../tools/dotc/parsing/ParserPhase.scala | 2 ++ .../src/dotty/tools/dotc/sbt/ExtractAPI.scala | 9 +++++- .../tools/dotc/sbt/ExtractDependencies.scala | 7 ++++- .../dotc/semanticdb/ExtractSemanticDB.scala | 3 ++ .../tools/dotc/transform/ArrayApply.scala | 8 ++++- .../dotc/transform/ArrayConstructors.scala | 8 ++++- .../tools/dotc/transform/BetaReduce.scala | 7 ++++- .../tools/dotc/transform/CapturedVars.scala | 9 ++++-- .../transform/CheckLoopingImplicits.scala | 3 ++ .../dotc/transform/CheckNoSuperThis.scala | 5 ++- .../tools/dotc/transform/CheckReentrant.scala | 8 ++++- .../tools/dotc/transform/CheckStatic.scala | 3 ++ .../dotc/transform/CollectEntryPoints.scala | 9 +++++- .../transform/CollectNullableFields.scala | 3 ++ .../dotc/transform/CompleteJavaEnums.scala | 3 ++ .../tools/dotc/transform/Constructors.scala | 4 +++ .../tools/dotc/transform/CookComments.scala | 9 ++++-- .../dotc/transform/CountOuterAccesses.scala | 3 ++ .../dotc/transform/DropOuterAccessors.scala | 3 ++ .../tools/dotc/transform/ElimByName.scala | 5 ++- .../dotc/transform/ElimErasedValueType.scala | 3 ++ .../tools/dotc/transform/ElimOpaque.scala | 5 ++- .../dotc/transform/ElimOuterSelect.scala | 8 ++++- .../dotc/transform/ElimPackagePrefixes.scala | 8 ++++- .../dotc/transform/ElimPolyFunction.scala | 5 ++- .../tools/dotc/transform/ElimRepeated.scala | 3 ++ .../tools/dotc/transform/ElimStaticThis.scala | 9 +++++- .../dotty/tools/dotc/transform/Erasure.scala | 3 ++ .../tools/dotc/transform/EtaReduce.scala | 10 ++++-- .../tools/dotc/transform/ExpandPrivate.scala | 8 ++++- .../tools/dotc/transform/ExpandSAMs.scala | 3 ++ .../tools/dotc/transform/ExplicitOuter.scala | 3 ++ .../tools/dotc/transform/ExplicitSelf.scala | 8 ++++- .../dotc/transform/ExtensionMethods.scala | 4 ++- .../tools/dotc/transform/FirstTransform.scala | 3 ++ .../dotty/tools/dotc/transform/Flatten.scala | 8 ++++- .../dotc/transform/ForwardDepChecks.scala | 5 ++- .../transform/FunctionXXLForwarders.scala | 7 ++++- .../dotty/tools/dotc/transform/Getters.scala | 3 ++ .../tools/dotc/transform/HoistSuperArgs.scala | 5 ++- .../tools/dotc/transform/InlinePatterns.scala | 9 +++++- .../tools/dotc/transform/InlineVals.scala | 10 ++++-- .../dotty/tools/dotc/transform/Inlining.scala | 3 ++ .../dotc/transform/Instrumentation.scala | 8 ++++- .../dotc/transform/InterceptedMethods.scala | 3 ++ .../tools/dotc/transform/LambdaLift.scala | 6 ++-- .../dotty/tools/dotc/transform/LazyVals.scala | 3 ++ .../tools/dotc/transform/LetOverApply.scala | 8 ++++- .../dotty/tools/dotc/transform/LiftTry.scala | 5 ++- .../dotty/tools/dotc/transform/Memoize.scala | 3 ++ .../dotty/tools/dotc/transform/Mixin.scala | 3 ++ .../tools/dotc/transform/MoveStatics.scala | 3 ++ .../dotc/transform/NonLocalReturns.scala | 9 +++++- .../dotc/transform/ParamForwarding.scala | 8 ++++- .../tools/dotc/transform/PatternMatcher.scala | 4 +++ .../tools/dotc/transform/PickleQuotes.scala | 3 ++ .../dotty/tools/dotc/transform/Pickler.scala | 3 ++ .../tools/dotc/transform/PostInlining.scala | 6 +++- .../tools/dotc/transform/PostTyper.scala | 4 ++- .../dotc/transform/ProtectedAccessors.scala | 3 ++ .../dotc/transform/PruneErasedDefs.scala | 3 ++ .../tools/dotc/transform/PureStats.scala | 3 ++ .../transform/RepeatableAnnotations.scala | 9 +++++- .../tools/dotc/transform/ResolveSuper.scala | 3 ++ .../tools/dotc/transform/RestoreScopes.scala | 8 ++++- .../tools/dotc/transform/SelectStatic.scala | 8 ++++- .../tools/dotc/transform/SeqLiterals.scala | 10 +++++- .../tools/dotc/transform/SetRootTree.scala | 4 +++ .../transform/SpecializeApplyMethods.scala | 8 ++++- .../dotc/transform/SpecializeFunctions.scala | 10 +++++- .../dotty/tools/dotc/transform/Staging.scala | 3 ++ .../dotty/tools/dotc/transform/TailRec.scala | 3 ++ .../dotc/transform/TransformWildcards.scala | 8 ++++- .../dotc/transform/TryCatchPatterns.scala | 7 ++++- .../dotc/transform/TupleOptimizations.scala | 7 ++++- .../dotc/transform/UncacheGivenAliases.scala | 3 ++ .../dotc/transform/UninitializedDefs.scala | 3 ++ .../dotc/transform/VCElideAllocations.scala | 8 ++++- .../dotc/transform/VCInlineMethods.scala | 8 ++++- .../dotc/transform/YCheckPositions.scala | 7 ++++- .../tools/dotc/transform/init/Checker.scala | 8 ++++- .../localopt/StringInterpolatorOpt.scala | 8 ++++- .../transform/sjs/AddLocalJSFakeNews.scala | 3 ++ .../transform/sjs/ExplicitJSClasses.scala | 3 ++ .../transform/sjs/JUnitBootstrappers.scala | 6 +++- .../dotc/transform/sjs/PrepJSInterop.scala | 3 ++ .../tools/dotc/typer/CrossVersionChecks.scala | 10 ++++-- .../dotty/tools/dotc/typer/RefChecks.scala | 3 ++ .../dotty/tools/dotc/typer/TyperPhase.scala | 5 +++ 93 files changed, 488 insertions(+), 64 deletions(-) diff --git a/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala b/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala index 35bc25693d10..299c1c75d6cf 100644 --- a/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala +++ b/compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala @@ -20,7 +20,9 @@ import dotty.tools.dotc.transform.MegaPhase.MiniPhase class CollectSuperCalls extends MiniPhase { import tpd._ - def phaseName: String = "collectSuperCalls" + override def phaseName: String = CollectSuperCalls.name + + override def description: String = CollectSuperCalls.description override def transformSelect(tree: Select)(using Context): Tree = { tree.qualifier match { @@ -40,3 +42,7 @@ class CollectSuperCalls extends MiniPhase { } } } + +object CollectSuperCalls: + val name: String = "collectSuperCalls" + val description: String = "find classes that are called with super" diff --git a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala index fdb6a6218670..2f2f653ae2e2 100644 --- a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala +++ b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala @@ -34,7 +34,10 @@ import StdNames._ import dotty.tools.io._ class GenBCode extends Phase { - def phaseName: String = GenBCode.name + + override def phaseName: String = GenBCode.name + + override def description: String = GenBCode.description private val superCallsMap = new MutableSymbolMap[Set[ClassSymbol]] def registerSuperCall(sym: Symbol, calls: ClassSymbol): Unit = { @@ -106,6 +109,7 @@ class GenBCode extends Phase { object GenBCode { val name: String = "genBCode" + val description: String = "generate JVM bytecode" } class GenBCodePipeline(val int: DottyBackendInterface, val primitives: DottyPrimitives)(using Context) extends BCodeSyncAndTry { diff --git a/compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala b/compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala index a5eb4f0d117a..1579b4577933 100644 --- a/compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala +++ b/compiler/src/dotty/tools/backend/sjs/GenSJSIR.scala @@ -6,7 +6,10 @@ import Phases._ /** Generates Scala.js IR files for the compilation unit. */ class GenSJSIR extends Phase { - def phaseName: String = "genSJSIR" + + override def phaseName: String = GenSJSIR.name + + override def description: String = GenSJSIR.description override def isRunnable(using Context): Boolean = super.isRunnable && ctx.settings.scalajs.value @@ -14,3 +17,7 @@ class GenSJSIR extends Phase { def run(using Context): Unit = new JSCodeGen().run() } + +object GenSJSIR: + val name: String = "genSJSIR" + val description: String = "generate .sjsir files for Scala.js" diff --git a/compiler/src/dotty/tools/dotc/config/CliCommand.scala b/compiler/src/dotty/tools/dotc/config/CliCommand.scala index 1e61914a89ca..5a648db2b504 100644 --- a/compiler/src/dotty/tools/dotc/config/CliCommand.scala +++ b/compiler/src/dotty/tools/dotc/config/CliCommand.scala @@ -138,11 +138,32 @@ trait CliCommand: protected def yusageMessage(using settings: ConcreteSettings)(using SettingsState) = createUsageMsg("Possible private", shouldExplain = true, isPrivate) - protected def phasesMessage: String = - (new Compiler()).phases.map { - case List(single) => single.phaseName - case more => more.map(_.phaseName).mkString("{", ", ", "}") - }.mkString("\n") + /** Used for the formatted output of -Xshow-phases */ + protected def phasesMessage(using ctx: Context): String = + + val phases = new Compiler().phases + val nameLimit = 25 + val maxCol = ctx.settings.pageWidth.value + val maxName = phases.flatten.map(_.phaseName.length).max + val width = maxName.min(nameLimit) + val maxDesc = maxCol - (width + 6) + val fmt = s"%${width}.${width}s %.${maxDesc}s%n" + + val sb = new StringBuilder + sb ++= fmt.format("phase name", "description") + sb ++= fmt.format("----------", "-----------") + + phases.foreach { + case List(single) => + sb ++= fmt.format(single.phaseName, single.description) + case Nil => () + case more => + sb ++= fmt.format(s"{", "") + more.foreach { mini => sb ++= fmt.format(mini.phaseName, mini.description) } + sb ++= fmt.format(s"}", "") + } + sb.mkString + /** Provide usage feedback on argument summary, assuming that all settings * are already applied in context. diff --git a/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala b/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala index a9da623f84da..d5918b5179ca 100644 --- a/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala +++ b/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala @@ -15,6 +15,7 @@ import dotty.tools.unsupported class Parser extends Phase { override def phaseName: String = Parser.name + override def description: String = Parser.description // We run TreeChecker only after type checking override def isCheckable: Boolean = false @@ -58,4 +59,5 @@ class Parser extends Phase { object Parser{ val name: String = "parser" + val description: String = "scan and parse sources" } diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala index 3e0e148f7101..3e442aab5b68 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala @@ -43,7 +43,10 @@ import scala.util.chaining.* * @see ExtractDependencies */ class ExtractAPI extends Phase { - override def phaseName: String = "sbt-api" + + override def phaseName: String = ExtractAPI.name + + override def description: String = ExtractAPI.description override def isRunnable(using Context): Boolean = { def forceRun = ctx.settings.YdumpSbtInc.value || ctx.settings.YforceSbtPhases.value @@ -87,6 +90,10 @@ class ExtractAPI extends Phase { } } +object ExtractAPI: + val name: String = "sbt-api" + val description: String = "sends a representation of the API of classes to sbt" + /** Extracts full (including private members) API representation out of Symbols and Types. * * The exact representation used for each type is not important: the only thing diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala index b6c0d544491b..0dd30cd27ced 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala @@ -49,7 +49,9 @@ import scala.collection.{Set, mutable} class ExtractDependencies extends Phase { import ExtractDependencies._ - override def phaseName: String = "sbt-deps" + override def phaseName: String = ExtractDependencies.name + + override def description: String = ExtractDependencies.description override def isRunnable(using Context): Boolean = { def forceRun = ctx.settings.YdumpSbtInc.value || ctx.settings.YforceSbtPhases.value @@ -180,6 +182,9 @@ class ExtractDependencies extends Phase { } object ExtractDependencies { + val name: String = "sbt-deps" + val description: String = "sends information on classes' dependencies to sbt" + def classNameAsString(sym: Symbol)(using Context): String = sym.fullName.stripModuleClassSuffix.toString diff --git a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala index 3c2c08ded7a0..e40607ef0d5a 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala @@ -36,6 +36,8 @@ class ExtractSemanticDB extends Phase: override val phaseName: String = ExtractSemanticDB.name + override val description: String = ExtractSemanticDB.description + override def isRunnable(using Context) = super.isRunnable && ctx.settings.Xsemanticdb.value @@ -461,6 +463,7 @@ object ExtractSemanticDB: import java.nio.file.Paths val name: String = "extractSemanticDB" + val description: String = "extract info into .semanticdb files" def write( source: SourceFile, diff --git a/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala b/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala index 348bc735bd9c..cc39c5a3517b 100644 --- a/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala +++ b/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala @@ -21,7 +21,9 @@ import scala.reflect.ClassTag class ArrayApply extends MiniPhase { import tpd._ - override def phaseName: String = "arrayApply" + override def phaseName: String = ArrayApply.name + + override def description: String = ArrayApply.description override def transformApply(tree: tpd.Apply)(using Context): tpd.Tree = if isArrayModuleApply(tree.symbol) then @@ -71,3 +73,7 @@ class ArrayApply extends MiniPhase { } } } + +object ArrayApply: + val name: String = "arrayApply" + val description: String = "optimize `scala.Array.apply`" diff --git a/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala b/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala index 301026548444..1bcaa2626ee3 100644 --- a/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala +++ b/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala @@ -22,7 +22,9 @@ import scala.collection.immutable.:: class ArrayConstructors extends MiniPhase { import ast.tpd._ - override def phaseName: String = "arrayConstructors" + override def phaseName: String = ArrayConstructors.name + + override def description: String = ArrayConstructors.description override def transformApply(tree: tpd.Apply)(using Context): tpd.Tree = { def expand(elemType: Type, dims: List[Tree]) = @@ -49,3 +51,7 @@ class ArrayConstructors extends MiniPhase { else tree } } + +object ArrayConstructors: + val name: String = "arrayConstructors" + val description: String = "intercept creation of (non-generic) arrays and intrinsify" diff --git a/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala b/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala index 17ce6020e2a9..79b68b331930 100644 --- a/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala +++ b/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala @@ -33,7 +33,9 @@ import ast.TreeTypeMap class BetaReduce extends MiniPhase: import ast.tpd._ - def phaseName: String = "betaReduce" + override def phaseName: String = BetaReduce.name + + override def description: String = BetaReduce.description override def transformApply(app: Apply)(using Context): Tree = app.fun match case Select(fn, nme.apply) if defn.isFunctionType(fn.tpe) => @@ -47,6 +49,9 @@ class BetaReduce extends MiniPhase: object BetaReduce: import ast.tpd._ + val name: String = "betaReduce" + val description: String = "reduce closure applications" + /** Beta-reduces a call to `fn` with arguments `argSyms` or returns `tree` */ def apply(original: Tree, fn: Tree, args: List[Tree])(using Context): Tree = fn match diff --git a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala index 6e04ac1f2e96..2969b00c7dd2 100644 --- a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala +++ b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala @@ -22,8 +22,9 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer: thisPhase => import ast.tpd._ - /** the following two members override abstract members in Transform */ - val phaseName: String = "capturedVars" + override def phaseName: String = CapturedVars.name + + override def description: String = CapturedVars.description override def runsAfterGroupsOf: Set[String] = Set(LiftTry.name) // lifting tries changes what variables are considered to be captured @@ -167,3 +168,7 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer: case _ => tree recur(tree.lhs) + +object CapturedVars: + val name: String = "capturedVars" + val description: String = "represent vars captured by closures as heap objects" diff --git a/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala b/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala index 21b994a6d1b8..074f5a634821 100644 --- a/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala +++ b/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala @@ -12,6 +12,7 @@ import annotation.threadUnsafe object CheckLoopingImplicits: val name: String = "checkLoopingImplicits" + val description: String = "check that implicit defs do not call themselves in an infinite loop" /** Checks that implicit defs do not call themselves in an infinite loop */ class CheckLoopingImplicits extends MiniPhase: @@ -20,6 +21,8 @@ class CheckLoopingImplicits extends MiniPhase: override def phaseName: String = CheckLoopingImplicits.name + override def description: String = CheckLoopingImplicits.description + override def transformValDef(mdef: ValDef)(using Context): Tree = transform(mdef) diff --git a/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala b/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala index d84fcd9ca11e..5d11cbdf7bb5 100644 --- a/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala +++ b/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala @@ -12,6 +12,7 @@ import annotation.threadUnsafe object CheckNoSuperThis: val name: String = "checkNoSuperThis" + val description: String = "check that supercalls don't contain references to This" /** Checks that super and this calls do not pass `this` as (part of) an argument. */ class CheckNoSuperThis extends MiniPhase: @@ -20,6 +21,8 @@ class CheckNoSuperThis extends MiniPhase: override def phaseName: String = CheckNoSuperThis.name + override def description: String = CheckNoSuperThis.description + override def runsAfterGroupsOf: Set[String] = Set(Constructors.name) override def transformDefDef(mdef: DefDef)(using Context): DefDef = @@ -47,4 +50,4 @@ class CheckNoSuperThis extends MiniPhase: case _ => mdef -end CheckNoSuperThis \ No newline at end of file +end CheckNoSuperThis diff --git a/compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala b/compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala index 56c7c8b9b3d9..6b0a4c3e9737 100644 --- a/compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala +++ b/compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala @@ -29,7 +29,9 @@ import Decorators._ class CheckReentrant extends MiniPhase { import ast.tpd._ - override def phaseName: String = "checkReentrant" + override def phaseName: String = CheckReentrant.name + + override def description: String = CheckReentrant.description private var shared: Set[Symbol] = Set() private var seen: Set[ClassSymbol] = Set() @@ -84,3 +86,7 @@ class CheckReentrant extends MiniPhase { tree } } + +object CheckReentrant: + val name: String = "checkReentrant" + val description: String = "check no data races involving global vars" diff --git a/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala b/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala index 3edddadfb2ae..ddd42d615ad4 100644 --- a/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala +++ b/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala @@ -29,6 +29,8 @@ class CheckStatic extends MiniPhase { override def phaseName: String = CheckStatic.name + override def description: String = CheckStatic.description + override def transformTemplate(tree: tpd.Template)(using Context): tpd.Tree = { val defns = tree.body.collect{case t: ValOrDefDef => t} var hadNonStaticField = false @@ -63,4 +65,5 @@ class CheckStatic extends MiniPhase { object CheckStatic { val name: String = "checkStatic" + val description: String = "check restrictions that apply to @static members" } diff --git a/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala b/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala index b92c57f1fb5e..de304f5d3077 100644 --- a/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala +++ b/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala @@ -29,7 +29,10 @@ import dotty.tools.backend.jvm.GenBCode * -Xmain-class */ class CollectEntryPoints extends MiniPhase: - def phaseName: String = "Collect entry points" + + override def phaseName: String = CollectEntryPoints.name + + override def description: String = CollectEntryPoints.description override def isRunnable(using Context): Boolean = def forceRun = ctx.settings.XmainClass.isDefault && ctx.settings.outputDir.value.isInstanceOf[JarArchive] @@ -52,3 +55,7 @@ class CollectEntryPoints extends MiniPhase: case _ => } } + +object CollectEntryPoints: + val name: String = "Collect entry points" + val description: String = "collect all entry points and save them in the context" diff --git a/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala b/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala index 71bae0ec5a6d..cf575e84975d 100644 --- a/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala +++ b/compiler/src/dotty/tools/dotc/transform/CollectNullableFields.scala @@ -13,6 +13,7 @@ import java.util.IdentityHashMap object CollectNullableFields { val name: String = "collectNullableFields" + val description: String = "collect fields that can be nulled out after use in lazy initialization" } /** Collect fields that can be nulled out after use in lazy initialization. @@ -43,6 +44,8 @@ class CollectNullableFields extends MiniPhase { override def phaseName: String = CollectNullableFields.name + override def description: String = CollectNullableFields.description + /** Running after `ElimByName` to see by names as nullable types. */ override def runsAfter: Set[String] = Set(ElimByName.name) diff --git a/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala b/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala index 4aa352f60f1b..9f90ae43c751 100644 --- a/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala +++ b/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala @@ -20,6 +20,7 @@ import annotation.threadUnsafe object CompleteJavaEnums { val name: String = "completeJavaEnums" + val description: String = "fill in constructors for Java enums" private val nameParamName: TermName = "_$name".toTermName private val ordinalParamName: TermName = "_$ordinal".toTermName @@ -35,6 +36,8 @@ class CompleteJavaEnums extends MiniPhase with InfoTransformer { thisPhase => override def phaseName: String = CompleteJavaEnums.name + override def description: String = CompleteJavaEnums.description + override def relaxedTypingInGroup: Boolean = true // Because it adds additional parameters to some constructors diff --git a/compiler/src/dotty/tools/dotc/transform/Constructors.scala b/compiler/src/dotty/tools/dotc/transform/Constructors.scala index 86a7232e3d8d..be77103e2395 100644 --- a/compiler/src/dotty/tools/dotc/transform/Constructors.scala +++ b/compiler/src/dotty/tools/dotc/transform/Constructors.scala @@ -21,6 +21,7 @@ import collection.mutable object Constructors { val name: String = "constructors" + val description: String = "collect initialization code in primary constructors" } /** This transform @@ -33,6 +34,9 @@ class Constructors extends MiniPhase with IdentityDenotTransformer { thisPhase = import tpd._ override def phaseName: String = Constructors.name + + override def description: String = Constructors.description + override def runsAfter: Set[String] = Set(HoistSuperArgs.name) override def runsAfterGroupsOf: Set[String] = Set(Memoize.name) // Memoized needs to be finished because we depend on the ownerchain after Memoize diff --git a/compiler/src/dotty/tools/dotc/transform/CookComments.scala b/compiler/src/dotty/tools/dotc/transform/CookComments.scala index 6ef0bdc4c247..27f34891fc2c 100644 --- a/compiler/src/dotty/tools/dotc/transform/CookComments.scala +++ b/compiler/src/dotty/tools/dotc/transform/CookComments.scala @@ -6,7 +6,10 @@ import dotty.tools.dotc.core.ContextOps._ import dotty.tools.dotc.typer.Docstrings class CookComments extends MegaPhase.MiniPhase { - override def phaseName: String = "cookComments" + + override def phaseName: String = CookComments.name + + override def description: String = CookComments.description override def transformTypeDef(tree: tpd.TypeDef)(using Context): tpd.Tree = { if (ctx.settings.YcookComments.value && tree.isClassDef) { @@ -26,4 +29,6 @@ class CookComments extends MegaPhase.MiniPhase { } } - +object CookComments: + val name = "cookComments" + val description: String = "cook the comments: expand variables, doc, etc." diff --git a/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala b/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala index 27a7907b266e..54ac7478c332 100644 --- a/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala +++ b/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala @@ -15,6 +15,7 @@ import collection.mutable object CountOuterAccesses: val name: String = "countOuterAccesses" + val description: String = "identify outer accessors that can be dropped" /** Characterizes outer accessors and outer fields that can be dropped * if there are no references to them from within the toplevel class @@ -38,6 +39,8 @@ class CountOuterAccesses extends MiniPhase: override def phaseName: String = CountOuterAccesses.name + override def description: String = CountOuterAccesses.description + override def runsAfter: Set[String] = Set(LambdaLift.name) // LambdaLift can create outer paths. These need to be known in this phase. diff --git a/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala b/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala index c6b3785e99ed..e9322a450cb9 100644 --- a/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala +++ b/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala @@ -18,6 +18,7 @@ import annotation.threadUnsafe object DropOuterAccessors: val name: String = "dropOuterAccessors" + val description: String = "drop unused outer accessors" /** Drops unused outer accessors of inner classes that are visible only in one * toplevel class. For other classes, we can't tell whether an outer accessor @@ -29,6 +30,8 @@ class DropOuterAccessors extends MiniPhase with IdentityDenotTransformer: override def phaseName: String = DropOuterAccessors.name + override def description: String = DropOuterAccessors.description + override def runsAfterGroupsOf: Set[String] = Set(CountOuterAccesses.name) override def changesMembers: Boolean = true // the phase drops outer accessors diff --git a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala index b3d5ab1da4b4..3a91f6623243 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimByName.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimByName.scala @@ -56,6 +56,8 @@ class ElimByName extends MiniPhase, InfoTransformer: override def phaseName: String = ElimByName.name + override def description: String = ElimByName.description + override def runsAfterGroupsOf: Set[String] = Set(ExpandSAMs.name, ElimRepeated.name, RefChecks.name) // - ExpanSAMs applied to partial functions creates methods that need // to be fully defined before converting. Test case is pos/i9391.scala. @@ -157,4 +159,5 @@ class ElimByName extends MiniPhase, InfoTransformer: } object ElimByName: - val name: String = "elimByName" \ No newline at end of file + val name: String = "elimByName" + val description: String = "map by-name parameters to functions" diff --git a/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala b/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala index aabbca4bc7bf..503561915040 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala @@ -13,6 +13,7 @@ import NameKinds.SuperAccessorName object ElimErasedValueType { val name: String = "elimErasedValueType" + val description: String = "expand erased value types to their underlying implmementation types" def elimEVT(tp: Type)(using Context): Type = tp match { case ErasedValueType(_, underlying) => @@ -40,6 +41,8 @@ class ElimErasedValueType extends MiniPhase with InfoTransformer { thisPhase => override def phaseName: String = ElimErasedValueType.name + override def description: String = ElimErasedValueType.description + override def runsAfter: Set[String] = Set(Erasure.name) def transformInfo(tp: Type, sym: Symbol)(using Context): Type = sym match { diff --git a/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala b/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala index 3eca6ea6b28c..a6f9cbf7dbe9 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala @@ -18,6 +18,7 @@ import ast.Trees._ object ElimOpaque { val name: String = "elimOpaque" + val description: String = "turn opaque into normal aliases" } /** Rewrites opaque type aliases to normal alias types */ @@ -27,6 +28,8 @@ class ElimOpaque extends MiniPhase with DenotTransformer { override def phaseName: String = ElimOpaque.name + override def description: String = ElimOpaque.description + // Override checks need to take place before treating opaque types as aliases override def runsAfterGroupsOf: Set[String] = Set(typer.RefChecks.name) @@ -72,4 +75,4 @@ class ElimOpaque extends MiniPhase with DenotTransformer { tree else tree -} \ No newline at end of file +} diff --git a/compiler/src/dotty/tools/dotc/transform/ElimOuterSelect.scala b/compiler/src/dotty/tools/dotc/transform/ElimOuterSelect.scala index 20a3c3223ea8..f161cd4f8cb7 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimOuterSelect.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimOuterSelect.scala @@ -13,7 +13,9 @@ import NameKinds.OuterSelectName class ElimOuterSelect extends MiniPhase { import ast.tpd._ - override def phaseName: String = "elimOuterSelect" + override def phaseName: String = ElimOuterSelect.name + + override def description: String = ElimOuterSelect.description override def runsAfterGroupsOf: Set[String] = Set(ExplicitOuter.name) // ExplicitOuter needs to have run to completion before so that all classes @@ -30,3 +32,7 @@ class ElimOuterSelect extends MiniPhase { case _ => tree } } + +object ElimOuterSelect: + val name: String = "elimOuterSelect" + val description: String = "expand outer selections" diff --git a/compiler/src/dotty/tools/dotc/transform/ElimPackagePrefixes.scala b/compiler/src/dotty/tools/dotc/transform/ElimPackagePrefixes.scala index 9179fb6c2d2c..83349f1f6199 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimPackagePrefixes.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimPackagePrefixes.scala @@ -12,7 +12,9 @@ import MegaPhase.MiniPhase */ class ElimPackagePrefixes extends MiniPhase { - override def phaseName: String = "elimPackagePrefixes" + override def phaseName: String = ElimPackagePrefixes.name + + override def description: String = ElimPackagePrefixes.description override def transformSelect(tree: Select)(using Context): Tree = if (isPackageClassRef(tree)) Ident(tree.tpe.asInstanceOf[TypeRef]) else tree @@ -29,3 +31,7 @@ class ElimPackagePrefixes extends MiniPhase { case _ => false } } + +object ElimPackagePrefixes: + val name: String = "elimPackagePrefixes" + val description: String = "eliminate references to package prefixes in Select nodes" diff --git a/compiler/src/dotty/tools/dotc/transform/ElimPolyFunction.scala b/compiler/src/dotty/tools/dotc/transform/ElimPolyFunction.scala index cb99e8ca9c8a..756ddd9bf0eb 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimPolyFunction.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimPolyFunction.scala @@ -24,6 +24,8 @@ class ElimPolyFunction extends MiniPhase with DenotTransformer { override def phaseName: String = ElimPolyFunction.name + override def description: String = ElimPolyFunction.description + override def runsAfter = Set(Erasure.name) override def changesParents: Boolean = true // Replaces PolyFunction by FunctionN @@ -63,6 +65,7 @@ class ElimPolyFunction extends MiniPhase with DenotTransformer { } object ElimPolyFunction { - val name = "elimPolyFunction" + val name: String = "elimPolyFunction" + val description: String = "rewrite PolyFunction subclasses to FunctionN subclasses" } diff --git a/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala index 84a83a1b9b06..1ca258420aa2 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala @@ -19,6 +19,7 @@ import NullOpsDecorator._ object ElimRepeated { val name: String = "elimRepeated" + val description: String = "rewrite vararg parameters and arguments" } /** A transformer that eliminates repeated parameters (T*) from all types, replacing @@ -30,6 +31,8 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase => override def phaseName: String = ElimRepeated.name + override def description: String = ElimRepeated.description + override def changesMembers: Boolean = true // the phase adds vararg forwarders def transformInfo(tp: Type, sym: Symbol)(using Context): Type = diff --git a/compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala b/compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala index 8bf188a6a2de..02612253c735 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimStaticThis.scala @@ -13,7 +13,10 @@ import dotty.tools.dotc.core.Types.{ThisType, TermRef} */ class ElimStaticThis extends MiniPhase { import ast.tpd._ - def phaseName: String = "elimStaticThis" + + override def phaseName: String = ElimStaticThis.name + + override def description: String = ElimStaticThis.description override def transformThis(tree: This)(using Context): Tree = if (!tree.symbol.is(Package) && ctx.owner.enclosingMethod.is(JavaStatic)) { @@ -34,3 +37,7 @@ class ElimStaticThis extends MiniPhase { } else tree } + +object ElimStaticThis: + val name: String = "elimStaticThis" + val description: String = "replace This references to static objects by global identifiers" diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index 765d514de5c4..d16cc2f66f51 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -42,6 +42,8 @@ class Erasure extends Phase with DenotTransformer { override def phaseName: String = Erasure.name + override def description: String = Erasure.description + /** List of names of phases that should precede this phase */ override def runsAfter: Set[String] = Set(InterceptedMethods.name, ElimRepeated.name) @@ -203,6 +205,7 @@ object Erasure { import TypeTestsCasts._ val name: String = "erasure" + val description: String = "rewrite types to JVM model" /** An attachment on Apply nodes indicating that multiple arguments * are passed in a single array. This occurs only if the function diff --git a/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala b/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala index 8afdb5121e19..ab5190daf0e8 100644 --- a/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala +++ b/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala @@ -24,7 +24,9 @@ import ast.Trees.* class EtaReduce extends MiniPhase: import ast.tpd._ - override def phaseName: String = "etaReduce" + override def phaseName: String = EtaReduce.name + + override def description: String = EtaReduce.description override def transformBlock(tree: Block)(using Context): Tree = tree match case Block((meth : DefDef) :: Nil, closure: Closure) @@ -41,4 +43,8 @@ class EtaReduce extends MiniPhase: case _ => tree case _ => tree -end EtaReduce \ No newline at end of file +end EtaReduce + +object EtaReduce: + val name: String = "etaReduce" + val description: String = "reduce eta expansions of pure paths" diff --git a/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala b/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala index a9f2aaec2052..f02f6b61d588 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala @@ -32,7 +32,9 @@ import ValueClasses._ class ExpandPrivate extends MiniPhase with IdentityDenotTransformer { thisPhase => import ast.tpd._ - override def phaseName: String = "expandPrivate" + override def phaseName: String = ExpandPrivate.name + + override def description: String = ExpandPrivate.description // This phase moves methods around (in infotransform) so it may need to make other methods public override def runsAfter: Set[String] = Set(MoveStatics.name) @@ -111,3 +113,7 @@ class ExpandPrivate extends MiniPhase with IdentityDenotTransformer { thisPhase tree } } + +object ExpandPrivate: + val name: String = "expandPrivate" + val description: String = "widen private definitions accessed from nested classes" diff --git a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala index ea9e7ede1b9a..0a2e49501278 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala @@ -28,6 +28,7 @@ import dotty.tools.dotc.util.Spans.Span */ object ExpandSAMs: val name: String = "expandSAMs" + val description: String = "expand SAM closures to anonymous classes" /** Is the SAMType `cls` also a SAM under the rules of the platform? */ def isPlatformSam(cls: ClassSymbol)(using Context): Boolean = @@ -43,6 +44,8 @@ class ExpandSAMs extends MiniPhase: override def phaseName: String = ExpandSAMs.name + override def description: String = ExpandSAMs.description + override def transformBlock(tree: Block)(using Context): Tree = tree match { case Block(stats @ (fn: DefDef) :: Nil, Closure(_, fnRef, tpt)) if fnRef.symbol == fn.symbol => tpt.tpe match { diff --git a/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala index 9c50e3c2f114..1ae915a1fc10 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala @@ -40,6 +40,8 @@ class ExplicitOuter extends MiniPhase with InfoTransformer { thisPhase => override def phaseName: String = ExplicitOuter.name + override def description: String = ExplicitOuter.description + override def runsAfter: Set[String] = Set(HoistSuperArgs.name) override def runsAfterGroupsOf: Set[String] = Set(PatternMatcher.name) @@ -125,6 +127,7 @@ object ExplicitOuter { import ast.tpd._ val name: String = "explicitOuter" + val description: String = "add accessors to outer classes from nested ones" /** Ensure that class `cls` has outer accessors */ def ensureOuterAccessors(cls: ClassSymbol)(using Context): Unit = diff --git a/compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala b/compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala index 3a2bda437d80..0398ac7f8d19 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExplicitSelf.scala @@ -21,7 +21,9 @@ import Contexts._, Types._, MegaPhase._, ast.Trees._, Symbols._, Decorators._, F class ExplicitSelf extends MiniPhase { import ast.tpd._ - override def phaseName: String = "explicitSelf" + override def phaseName: String = ExplicitSelf.name + + override def description: String = ExplicitSelf.description private def needsCast(tree: RefTree, cls: ClassSymbol)(using Context) = !cls.is(Package) && cls.givenSelfType.exists && !cls.derivesFrom(tree.symbol.owner) @@ -49,3 +51,7 @@ class ExplicitSelf extends MiniPhase { case _ => tree } } + +object ExplicitSelf: + val name: String = "explicitSelf" + val description: String = "make references to non-trivial self types explicit as casts" diff --git a/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala b/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala index 546c4e18c633..27aee2d445d9 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala @@ -41,9 +41,10 @@ class ExtensionMethods extends MiniPhase with DenotTransformer with FullParamete import tpd._ import ExtensionMethods._ - /** the following two members override abstract members in Transform */ override def phaseName: String = ExtensionMethods.name + override def description: String = ExtensionMethods.description + override def runsAfter: Set[String] = Set( ElimRepeated.name, ProtectedAccessors.name, // protected accessors cannot handle code that is moved from class to companion object @@ -174,6 +175,7 @@ class ExtensionMethods extends MiniPhase with DenotTransformer with FullParamete object ExtensionMethods { val name: String = "extmethods" + val description: String = "expand methods of value classes with extension methods" /** Name of the extension method that corresponds to given instance method `meth`. */ def extensionName(imeth: Symbol)(using Context): TermName = diff --git a/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala index 03ab3860a127..b01fc0a992df 100644 --- a/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala +++ b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala @@ -22,6 +22,7 @@ import TypeUtils.isErasedValueType object FirstTransform { val name: String = "firstTransform" + val description: String = "some transformations to put trees into a canonical form" } /** The first tree transform @@ -40,6 +41,8 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase => override def phaseName: String = FirstTransform.name + override def description: String = FirstTransform.description + /** eliminate self symbol in ClassInfo */ override def transformInfo(tp: Type, sym: Symbol)(using Context): Type = tp match { case tp @ ClassInfo(_, _, _, _, self: Symbol) => diff --git a/compiler/src/dotty/tools/dotc/transform/Flatten.scala b/compiler/src/dotty/tools/dotc/transform/Flatten.scala index 2009076e5846..678a202709e0 100644 --- a/compiler/src/dotty/tools/dotc/transform/Flatten.scala +++ b/compiler/src/dotty/tools/dotc/transform/Flatten.scala @@ -14,7 +14,9 @@ import util.Store class Flatten extends MiniPhase with SymTransformer { import ast.tpd._ - override def phaseName: String = "flatten" + override def phaseName: String = Flatten.name + + override def description: String = Flatten.description // private[this] and protected[this] modifiers must be dropped // before classes are lifted. Getters drop these modifiers. @@ -56,3 +58,7 @@ class Flatten extends MiniPhase with SymTransformer { override def transformTypeDef(tree: TypeDef)(using Context): Tree = liftIfNested(tree) } + +object Flatten: + val name: String = "flatten" + val description: String = "lift all inner classes to package scope" diff --git a/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala b/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala index ac3b271ece76..e01c975d0f0d 100644 --- a/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala +++ b/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala @@ -15,6 +15,7 @@ object ForwardDepChecks: import tpd.* val name: String = "forwardDepChecks" + val description: String = "ensure no forward references to local vals" type LevelAndIndex = immutable.Map[Symbol, (LevelInfo, Int)] @@ -58,6 +59,8 @@ class ForwardDepChecks extends MiniPhase: override def phaseName: String = ForwardDepChecks.name + override def description: String = ForwardDepChecks.description + override def runsAfter: Set[String] = Set(ElimByName.name) private var LevelInfo: Store.Location[OptLevelInfo] = _ @@ -108,4 +111,4 @@ class ForwardDepChecks extends MiniPhase: } tree } -end ForwardDepChecks \ No newline at end of file +end ForwardDepChecks diff --git a/compiler/src/dotty/tools/dotc/transform/FunctionXXLForwarders.scala b/compiler/src/dotty/tools/dotc/transform/FunctionXXLForwarders.scala index 4fd075aa0dba..a7fa5c0fe909 100644 --- a/compiler/src/dotty/tools/dotc/transform/FunctionXXLForwarders.scala +++ b/compiler/src/dotty/tools/dotc/transform/FunctionXXLForwarders.scala @@ -25,7 +25,9 @@ import Types._ class FunctionXXLForwarders extends MiniPhase with IdentityDenotTransformer { import ast.tpd._ - override def phaseName: String = "functionXXLForwarders" + override def phaseName: String = FunctionXXLForwarders.name + + override def description: String = FunctionXXLForwarders.description override def transformTemplate(impl: Template)(using Context): Template = { @@ -59,3 +61,6 @@ class FunctionXXLForwarders extends MiniPhase with IdentityDenotTransformer { } } +object FunctionXXLForwarders: + val name: String = "functionXXLForwarders" + val description: String = "add forwarders for FunctionXXL apply methods" diff --git a/compiler/src/dotty/tools/dotc/transform/Getters.scala b/compiler/src/dotty/tools/dotc/transform/Getters.scala index 7e5ea9c81b2a..2a46185a0512 100644 --- a/compiler/src/dotty/tools/dotc/transform/Getters.scala +++ b/compiler/src/dotty/tools/dotc/transform/Getters.scala @@ -62,6 +62,8 @@ class Getters extends MiniPhase with SymTransformer { thisPhase => override def phaseName: String = Getters.name + override def description: String = Getters.description + override def transformSym(d: SymDenotation)(using Context): SymDenotation = { def noGetterNeeded = d.isOneOf(NoGetterNeededFlags) || @@ -120,4 +122,5 @@ class Getters extends MiniPhase with SymTransformer { thisPhase => object Getters { val name: String = "getters" + val description: String = "replace non-private vals and vars with getter defs" } diff --git a/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala b/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala index c87fd037f2da..3233601310ae 100644 --- a/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala +++ b/compiler/src/dotty/tools/dotc/transform/HoistSuperArgs.scala @@ -16,6 +16,7 @@ import SymUtils._ object HoistSuperArgs { val name: String = "hoistSuperArgs" + val description: String = "hoist complex arguments of supercalls to enclosing scope" } /** This phase hoists complex arguments of supercalls and this-calls out of the enclosing class. @@ -43,7 +44,9 @@ object HoistSuperArgs { class HoistSuperArgs extends MiniPhase with IdentityDenotTransformer { thisPhase => import ast.tpd._ - def phaseName: String = HoistSuperArgs.name + override def phaseName: String = HoistSuperArgs.name + + override def description: String = HoistSuperArgs.description override def runsAfter: Set[String] = Set(ElimByName.name) // By name closures need to be introduced first in order to be hoisted out here. diff --git a/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala b/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala index fdef553a835d..80f7402dfc53 100644 --- a/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala +++ b/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala @@ -29,7 +29,9 @@ import ast.TreeTypeMap class InlinePatterns extends MiniPhase: import ast.tpd._ - def phaseName: String = "inlinePatterns" + override def phaseName: String = InlinePatterns.name + + override def description: String = InlinePatterns.description // This phase needs to run after because it need to transform trees that are generated // by the pattern matcher but are still not visible in that group of phases. @@ -59,3 +61,8 @@ class InlinePatterns extends MiniPhase: case List(ddef @ DefDef(`name`, _, _, _)) => BetaReduce(ddef, args) case _ => tree case _ => tree + +object InlinePatterns: + val name: String = "inlinePatterns" + val description: String = "remove placeholders of inlined patterns" + diff --git a/compiler/src/dotty/tools/dotc/transform/InlineVals.scala b/compiler/src/dotty/tools/dotc/transform/InlineVals.scala index 30ef0ed40375..25fb573ccf10 100644 --- a/compiler/src/dotty/tools/dotc/transform/InlineVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/InlineVals.scala @@ -14,7 +14,9 @@ import dotty.tools.dotc.typer.Inliner class InlineVals extends MiniPhase: import ast.tpd._ - def phaseName: String = "inlineVals" + override def phaseName: String = InlineVals.name + + override def description: String = InlineVals.description override def checkPostCondition(tree: Tree)(using Context): Unit = if !ctx.erasedTypes then @@ -50,4 +52,8 @@ class InlineVals extends MiniPhase: report.error(em"`inline val` with `null` is not supported.\n\nTo inline a `null` consider using `inline def`", rhs) else report.error(em"inline value must contain a literal constant value.\n\nTo inline more complex types consider using `inline def`", rhs) - } \ No newline at end of file + } + +object InlineVals: + val name: String = "inlineVals" + val description: String = "check right hand-sides of an `inline val`s" diff --git a/compiler/src/dotty/tools/dotc/transform/Inlining.scala b/compiler/src/dotty/tools/dotc/transform/Inlining.scala index d6bc8b117a3e..32805ed0d596 100644 --- a/compiler/src/dotty/tools/dotc/transform/Inlining.scala +++ b/compiler/src/dotty/tools/dotc/transform/Inlining.scala @@ -37,6 +37,8 @@ class Inlining extends MacroTransform { override def phaseName: String = Inlining.name + override def description: String = Inlining.description + override def allowsImplicitSearch: Boolean = true override def run(using Context): Unit = @@ -98,3 +100,4 @@ class Inlining extends MacroTransform { object Inlining: val name: String = "inlining" + val description: String = "inline and execute macros" diff --git a/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala b/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala index 676cf00e2f46..12d845ca9a68 100644 --- a/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala +++ b/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala @@ -23,7 +23,9 @@ import Constants.Constant class Instrumentation extends MiniPhase { thisPhase => import ast.tpd._ - override def phaseName: String = "instrumentation" + override def phaseName: String = Instrumentation.name + + override def description: String = Instrumentation.description override def isEnabled(using Context) = ctx.settings.Yinstrument.value @@ -105,3 +107,7 @@ class Instrumentation extends MiniPhase { thisPhase => tree } } + +object Instrumentation: + val name: String = "instrumentation" + val description: String = "count calls and allocations under -Yinstrument" diff --git a/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala b/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala index 0b42162643f8..a2ec4da70c1c 100644 --- a/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala +++ b/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala @@ -13,6 +13,7 @@ import dotty.tools.dotc.transform.MegaPhase.MiniPhase object InterceptedMethods { val name: String = "intercepted" + val description: String = "handling of `==`, `|=`, `getClass` methods" } /** Replace member references as follows: @@ -27,6 +28,8 @@ class InterceptedMethods extends MiniPhase { override def phaseName: String = InterceptedMethods.name + override def description: String = InterceptedMethods.description + // this should be removed if we have guarantee that ## will get Apply node override def transformSelect(tree: tpd.Select)(using Context): Tree = transformRefTree(tree) diff --git a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala index 86972605c3eb..ce392c636a76 100644 --- a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala +++ b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala @@ -23,6 +23,7 @@ object LambdaLift: import ast.tpd._ val name: String = "lambdaLift" + val description: String = "lifts out nested functions to class scope" /** The core lambda lift functionality. */ class Lifter(thisPhase: MiniPhase & DenotTransformer)(using Context): @@ -265,8 +266,9 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisPhase => import LambdaLift._ import ast.tpd._ - /** the following two members override abstract members in Transform */ - val phaseName: String = LambdaLift.name + override def phaseName: String = LambdaLift.name + + override def description: String = LambdaLift.description override def relaxedTypingInGroup: Boolean = true // Because it adds free vars as additional proxy parameters diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala index 121a2fd01a31..aabf8cf9a680 100644 --- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala @@ -30,6 +30,8 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { override def phaseName: String = LazyVals.name + override def description: String = LazyVals.description + /** List of names of phases that should have finished processing of tree * before this phase starts processing same tree */ override def runsAfter: Set[String] = Set(Mixin.name, CollectNullableFields.name) @@ -439,6 +441,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { object LazyVals { val name: String = "lazyVals" + val description: String = "expand lazy vals" object lazyNme { import Names.TermName diff --git a/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala b/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala index cd61c0f5ac82..c7ad2381c5f7 100644 --- a/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala +++ b/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala @@ -15,7 +15,9 @@ import ast.Trees._ class LetOverApply extends MiniPhase: import ast.tpd._ - override def phaseName: String = "letOverApply" + override def phaseName: String = LetOverApply.name + + override def description: String = LetOverApply.description override def transformApply(tree: Apply)(using Context): Tree = tree.fun match @@ -30,3 +32,7 @@ class LetOverApply extends MiniPhase: tree end LetOverApply + +object LetOverApply: + val name: String = "letOverApply" + val description: String = "lift blocks from receivers of applications" diff --git a/compiler/src/dotty/tools/dotc/transform/LiftTry.scala b/compiler/src/dotty/tools/dotc/transform/LiftTry.scala index 074ba7bc0516..f70e6a38fcf5 100644 --- a/compiler/src/dotty/tools/dotc/transform/LiftTry.scala +++ b/compiler/src/dotty/tools/dotc/transform/LiftTry.scala @@ -30,7 +30,9 @@ import util.Store class LiftTry extends MiniPhase with IdentityDenotTransformer { thisPhase => import ast.tpd._ - val phaseName: String = LiftTry.name + override def phaseName: String = LiftTry.name + + override def description: String = LiftTry.description private var NeedLift: Store.Location[Boolean] = _ private def needLift(using Context): Boolean = ctx.store(NeedLift) @@ -83,3 +85,4 @@ class LiftTry extends MiniPhase with IdentityDenotTransformer { thisPhase => } object LiftTry: val name = "liftTry" + val description: String = "Lifts try's that might be executed on non-empty expression stacks" diff --git a/compiler/src/dotty/tools/dotc/transform/Memoize.scala b/compiler/src/dotty/tools/dotc/transform/Memoize.scala index 2f73ed8bd9eb..8e9bea8384c2 100644 --- a/compiler/src/dotty/tools/dotc/transform/Memoize.scala +++ b/compiler/src/dotty/tools/dotc/transform/Memoize.scala @@ -22,6 +22,7 @@ import util.Store object Memoize { val name: String = "memoize" + val description: String = "add private fields to getters and setters" private final class MyState { val classesThatNeedReleaseFence = new util.HashSet[Symbol] @@ -49,6 +50,8 @@ class Memoize extends MiniPhase with IdentityDenotTransformer { thisPhase => override def phaseName: String = Memoize.name + override def description: String = Memoize.description + private var MyState: Store.Location[MyState] = _ private def myState(using Context): MyState = ctx.store(MyState) diff --git a/compiler/src/dotty/tools/dotc/transform/Mixin.scala b/compiler/src/dotty/tools/dotc/transform/Mixin.scala index 52c7b6420acc..c3828327385c 100644 --- a/compiler/src/dotty/tools/dotc/transform/Mixin.scala +++ b/compiler/src/dotty/tools/dotc/transform/Mixin.scala @@ -22,6 +22,7 @@ import collection.mutable object Mixin { val name: String = "mixin" + val description: String = "expand trait fields and trait initializers" def traitSetterName(getter: TermSymbol)(using Context): TermName = getter.ensureNotPrivate.name @@ -112,6 +113,8 @@ class Mixin extends MiniPhase with SymTransformer { thisPhase => override def phaseName: String = Mixin.name + override def description: String = Mixin.description + override def relaxedTypingInGroup: Boolean = true // Because it changes number of parameters in trait initializers diff --git a/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala b/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala index ce71734e16d9..bf25bfe71569 100644 --- a/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala +++ b/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala @@ -26,6 +26,8 @@ class MoveStatics extends MiniPhase with SymTransformer { override def phaseName: String = MoveStatics.name + override def description: String = MoveStatics.description + def transformSym(sym: SymDenotation)(using Context): SymDenotation = if (sym.hasAnnotation(defn.ScalaStaticAnnot) && sym.owner.is(Flags.Module) && sym.owner.companionClass.exists && (sym.is(Flags.Method) || !(sym.is(Flags.Mutable) && sym.owner.companionClass.is(Flags.Trait)))) { @@ -88,4 +90,5 @@ class MoveStatics extends MiniPhase with SymTransformer { object MoveStatics { val name: String = "moveStatic" + val description: String = "move static methods from companion to the class itself" } diff --git a/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala b/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala index e65809fd97ba..4ab9663f6529 100644 --- a/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala +++ b/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala @@ -10,6 +10,10 @@ import config.SourceVersion._ object NonLocalReturns { import ast.tpd._ + + val name: String = "nonLocalReturns" + val description: String = "expand non-local returns" + def isNonLocalReturn(ret: Return)(using Context): Boolean = !ret.from.symbol.is(Label) && (ret.from.symbol != ctx.owner.enclosingMethod || ctx.owner.is(Lazy)) } @@ -17,7 +21,10 @@ object NonLocalReturns { /** Implement non-local returns using NonLocalReturnControl exceptions. */ class NonLocalReturns extends MiniPhase { - override def phaseName: String = "nonLocalReturns" + + override def phaseName: String = NonLocalReturns.name + + override def description: String = NonLocalReturns.description import NonLocalReturns._ import ast.tpd._ diff --git a/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala b/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala index 028516f1ca07..6eb29f26edea 100644 --- a/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala +++ b/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala @@ -36,7 +36,9 @@ class ParamForwarding extends MiniPhase with IdentityDenotTransformer: private def thisPhase: ParamForwarding = this - val phaseName: String = "paramForwarding" + override def phaseName: String = ParamForwarding.name + + override def description: String = ParamForwarding.description def transformIfParamAlias(mdef: ValOrDefDef)(using Context): Tree = @@ -80,3 +82,7 @@ class ParamForwarding extends MiniPhase with IdentityDenotTransformer: override def transformDefDef(mdef: DefDef)(using Context): Tree = transformIfParamAlias(mdef) + +object ParamForwarding: + val name: String = "paramForwarding" + val description: String = "add forwarders for aliases of superclass parameters" diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala index 7546c1fd854d..5ba43253e8b3 100644 --- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -27,6 +27,9 @@ class PatternMatcher extends MiniPhase { import PatternMatcher._ override def phaseName: String = PatternMatcher.name + + override def description: String = PatternMatcher.description + override def runsAfter: Set[String] = Set(ElimRepeated.name) override def transformMatch(tree: Match)(using Context): Tree = @@ -53,6 +56,7 @@ object PatternMatcher { import ast.tpd._ val name: String = "patternMatcher" + val description: String = "compile pattern matches" inline val selfCheck = false // debug option, if on we check that no case gets generated twice diff --git a/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala b/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala index be081c695c2d..96506d3c2b05 100644 --- a/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala +++ b/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala @@ -73,6 +73,8 @@ class PickleQuotes extends MacroTransform { override def phaseName: String = PickleQuotes.name + override def description: String = PickleQuotes.description + override def allowsImplicitSearch: Boolean = true override def checkPostCondition(tree: Tree)(using Context): Unit = @@ -528,6 +530,7 @@ object PickleQuotes { import tpd._ val name: String = "pickleQuotes" + val description: String = "turn quoted trees into explicit run-time data structures" def getLiteral(tree: tpd.Tree): Option[Literal] = tree match { case tree: Literal => Some(tree) diff --git a/compiler/src/dotty/tools/dotc/transform/Pickler.scala b/compiler/src/dotty/tools/dotc/transform/Pickler.scala index 7752fc8f2a55..98b61d8b6b60 100644 --- a/compiler/src/dotty/tools/dotc/transform/Pickler.scala +++ b/compiler/src/dotty/tools/dotc/transform/Pickler.scala @@ -18,6 +18,7 @@ import scala.concurrent.duration.Duration object Pickler { val name: String = "pickler" + val description: String = "generates TASTy info" /** If set, perform jump target compacting, position and comment pickling, * as well as final assembly in parallel with downstream phases; force @@ -32,6 +33,8 @@ class Pickler extends Phase { override def phaseName: String = Pickler.name + override def description: String = Pickler.description + // No need to repickle trees coming from TASTY override def isRunnable(using Context): Boolean = super.isRunnable && !ctx.settings.fromTasty.value diff --git a/compiler/src/dotty/tools/dotc/transform/PostInlining.scala b/compiler/src/dotty/tools/dotc/transform/PostInlining.scala index 54e654781aed..e50a8b77ff0e 100644 --- a/compiler/src/dotty/tools/dotc/transform/PostInlining.scala +++ b/compiler/src/dotty/tools/dotc/transform/PostInlining.scala @@ -13,6 +13,9 @@ class PostInlining extends MacroTransform, IdentityDenotTransformer: thisPhase => override def phaseName: String = PostInlining.name + + override def description: String = PostInlining.description + override def changesMembers = true override def run(using Context): Unit = @@ -31,4 +34,5 @@ class PostInlining extends MacroTransform, IdentityDenotTransformer: case tree1 => tree1 object PostInlining: - val name: String = "postInlining" \ No newline at end of file + val name: String = "postInlining" + val description: String = "add mirror support for inlined code" diff --git a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala index 54bb72275921..bfcf6cc6e5bf 100644 --- a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala +++ b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala @@ -17,6 +17,7 @@ import reporting._ object PostTyper { val name: String = "posttyper" + val description: String = "additional checks and cleanups after type checking" } /** A macro transform that runs immediately after typer and that performs the following functions: @@ -57,9 +58,10 @@ object PostTyper { class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase => import tpd._ - /** the following two members override abstract members in Transform */ override def phaseName: String = PostTyper.name + override def description: String = PostTyper.description + override def checkPostCondition(tree: tpd.Tree)(using Context): Unit = tree match { case tree: ValOrDefDef => assert(!tree.symbol.signature.isUnderDefined) diff --git a/compiler/src/dotty/tools/dotc/transform/ProtectedAccessors.scala b/compiler/src/dotty/tools/dotc/transform/ProtectedAccessors.scala index ccd7066e7cec..98e835293303 100644 --- a/compiler/src/dotty/tools/dotc/transform/ProtectedAccessors.scala +++ b/compiler/src/dotty/tools/dotc/transform/ProtectedAccessors.scala @@ -18,6 +18,7 @@ import dotty.tools.dotc.util.Property */ object ProtectedAccessors { val name: String = "protectedAccessors" + val description: String = "add accessors for protected members" /** Is the current context's owner inside the access boundary established by `sym`? */ def insideBoundaryOf(sym: Symbol)(using Context): Boolean = @@ -51,6 +52,8 @@ class ProtectedAccessors extends MiniPhase { override def phaseName: String = ProtectedAccessors.name + override def description: String = ProtectedAccessors.description + private val AccessorsKey = new Property.Key[Accessors] private def accessors(using Context): Accessors = diff --git a/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala b/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala index e52b77379c27..fca0b6b34928 100644 --- a/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala +++ b/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala @@ -30,6 +30,8 @@ class PruneErasedDefs extends MiniPhase with SymTransformer { thisTransform => override def phaseName: String = PruneErasedDefs.name + override def description: String = PruneErasedDefs.description + override def changesMembers: Boolean = true // makes erased members private override def runsAfterGroupsOf: Set[String] = Set(RefChecks.name, ExplicitOuter.name) @@ -74,6 +76,7 @@ object PruneErasedDefs { import tpd._ val name: String = "pruneErasedDefs" + val description: String = "drop erased definitions and simplify erased expressions" def trivialErasedTree(tree: Tree)(using Context): Tree = ref(defn.Compiletime_erasedValue).appliedToType(tree.tpe).withSpan(tree.span) diff --git a/compiler/src/dotty/tools/dotc/transform/PureStats.scala b/compiler/src/dotty/tools/dotc/transform/PureStats.scala index fc9b3bd6543e..b747d7d6b9e4 100644 --- a/compiler/src/dotty/tools/dotc/transform/PureStats.scala +++ b/compiler/src/dotty/tools/dotc/transform/PureStats.scala @@ -9,6 +9,7 @@ import Symbols._, StdNames._, Trees._ object PureStats { val name: String = "pureStats" + val description: String = "remove pure statements in blocks" } /** Remove pure statements in blocks */ @@ -18,6 +19,8 @@ class PureStats extends MiniPhase { override def phaseName: String = PureStats.name + override def description: String = PureStats.description + override def runsAfter: Set[String] = Set(Erasure.name) override def transformBlock(tree: Block)(using Context): Tree = diff --git a/compiler/src/dotty/tools/dotc/transform/RepeatableAnnotations.scala b/compiler/src/dotty/tools/dotc/transform/RepeatableAnnotations.scala index ecf2d3e2b96f..24c46cd98e4c 100644 --- a/compiler/src/dotty/tools/dotc/transform/RepeatableAnnotations.scala +++ b/compiler/src/dotty/tools/dotc/transform/RepeatableAnnotations.scala @@ -12,7 +12,10 @@ import Types._ import Decorators._ class RepeatableAnnotations extends MiniPhase: - override def phaseName = "repeatableAnnotations" + + override def phaseName: String = RepeatableAnnotations.name + + override def description: String = RepeatableAnnotations.description override def transformTypeDef(tree: TypeDef)(using Context): Tree = transformDef(tree) override def transformValDef(tree: ValDef)(using Context): Tree = transformDef(tree) @@ -46,3 +49,7 @@ class RepeatableAnnotations extends MiniPhase: Nil case (_, anns) => anns }.toList + +object RepeatableAnnotations: + val name: String = "repeatableAnnotations" + val description: String = "aggregate repeatable annotations" diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index 40c860bf3bdc..2a4a775b834f 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -35,6 +35,8 @@ class ResolveSuper extends MiniPhase with IdentityDenotTransformer { thisPhase = override def phaseName: String = ResolveSuper.name + override def description: String = ResolveSuper.description + override def runsAfter: Set[String] = Set(ElimByName.name, // verified empirically, need to figure out what the reason is. PruneErasedDefs.name) // Erased decls make `isCurrent` work incorrectly @@ -72,6 +74,7 @@ class ResolveSuper extends MiniPhase with IdentityDenotTransformer { thisPhase = object ResolveSuper { val name: String = "resolveSuper" + val description: String = "implement super accessors" /** Returns the symbol that is accessed by a super-accessor in a mixin composition. * diff --git a/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala b/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala index 6fe75ce8a901..4937b3ec80b1 100644 --- a/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala +++ b/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala @@ -16,7 +16,10 @@ import StdNames._ */ class RestoreScopes extends MiniPhase with IdentityDenotTransformer { thisPhase => import ast.tpd._ - override def phaseName: String = "restoreScopes" + + override def phaseName: String = RestoreScopes.name + + override def description: String = RestoreScopes.description override def changesMembers: Boolean = true // the phase affects scopes, applying tree transformations of previous phases @@ -50,3 +53,6 @@ class RestoreScopes extends MiniPhase with IdentityDenotTransformer { thisPhase } } +object RestoreScopes: + val name: String = "restoreScopes" + val description: String = "repair rendered invalid scopes" diff --git a/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala b/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala index 6e9fd6f48568..1db210634ab6 100644 --- a/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala +++ b/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala @@ -46,7 +46,9 @@ import dotty.tools.dotc.transform.SymUtils._ class SelectStatic extends MiniPhase with IdentityDenotTransformer { import ast.tpd._ - override def phaseName: String = "selectStatic" + override def phaseName: String = SelectStatic.name + + override def description: String = SelectStatic.description override def transformSelect(tree: tpd.Select)(using Context): tpd.Tree = { val sym = tree.symbol @@ -94,3 +96,7 @@ class SelectStatic extends MiniPhase with IdentityDenotTransformer { override def transformClosure(tree: tpd.Closure)(using Context): tpd.Tree = normalize(tree) } + +object SelectStatic: + val name: String = "selectStatic" + val description: String = "get rid of selects that would be compiled into GetStatic" diff --git a/compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala b/compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala index aacf3373dbe0..2f586104c4e3 100644 --- a/compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala +++ b/compiler/src/dotty/tools/dotc/transform/SeqLiterals.scala @@ -17,7 +17,10 @@ import Contexts._ class SeqLiterals extends MiniPhase { import ast.tpd._ - override def phaseName: String = "seqLiterals" + override def phaseName: String = SeqLiterals.name + + override def description: String = SeqLiterals.description + override def runsAfter: Set[String] = Set(PatternMatcher.name) override def checkPostCondition(tree: Tree)(using Context): Unit = tree match { @@ -34,3 +37,8 @@ class SeqLiterals extends MiniPhase { wrapArray(arr, elemtp).withSpan(tree.span).ensureConforms(tree.tpe) } } + +object SeqLiterals: + val name: String = "seqLiterals" + val description: String = "express vararg arguments as arrays" + diff --git a/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala b/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala index 06c3d3ffa0eb..a2bd55a1035d 100644 --- a/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala +++ b/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala @@ -9,6 +9,9 @@ import dotty.tools.dotc.core.Phases.Phase class SetRootTree extends Phase { override val phaseName: String = SetRootTree.name + + override val description: String = SetRootTree.description + override def isRunnable(using Context) = super.isRunnable && ctx.settings.YretainTrees.value @@ -43,4 +46,5 @@ class SetRootTree extends Phase { object SetRootTree { val name: String = "SetRootTree" + val description: String = "set the rootTreeOrProvider on class symbols" } diff --git a/compiler/src/dotty/tools/dotc/transform/SpecializeApplyMethods.scala b/compiler/src/dotty/tools/dotc/transform/SpecializeApplyMethods.scala index ef825832c1cd..6ffa05075201 100644 --- a/compiler/src/dotty/tools/dotc/transform/SpecializeApplyMethods.scala +++ b/compiler/src/dotty/tools/dotc/transform/SpecializeApplyMethods.scala @@ -20,7 +20,9 @@ import scala.collection.mutable class SpecializeApplyMethods extends MiniPhase with InfoTransformer { import ast.tpd._ - val phaseName = "specializeApplyMethods" + override def phaseName: String = SpecializeApplyMethods.name + + override def description: String = SpecializeApplyMethods.description override def isEnabled(using Context): Boolean = !ctx.settings.scalajs.value @@ -116,3 +118,7 @@ class SpecializeApplyMethods extends MiniPhase with InfoTransformer { tree } } + +object SpecializeApplyMethods: + val name: String = "specializeApplyMethods" + val description: String = "adds specialized methods to FunctionN" diff --git a/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala b/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala index 78b6edcd213b..97e8e37ae444 100644 --- a/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala +++ b/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala @@ -13,7 +13,11 @@ import scala.collection.mutable */ class SpecializeFunctions extends MiniPhase { import ast.tpd._ - val phaseName = "specializeFunctions" + + override def phaseName: String = SpecializeFunctions.name + + override def description: String = SpecializeFunctions.description + override def runsAfter = Set(ElimByName.name) override def isEnabled(using Context): Boolean = @@ -105,3 +109,7 @@ class SpecializeFunctions extends MiniPhase { p == defn.Function0 || p == defn.Function1 || p == defn.Function2 } } + +object SpecializeFunctions: + val name: String = "specializeFunctions" + val description: String = "specialize Function{0,1,2} by replacing super with specialized super" diff --git a/compiler/src/dotty/tools/dotc/transform/Staging.scala b/compiler/src/dotty/tools/dotc/transform/Staging.scala index b00506c602ad..dbfeaf4728b1 100644 --- a/compiler/src/dotty/tools/dotc/transform/Staging.scala +++ b/compiler/src/dotty/tools/dotc/transform/Staging.scala @@ -34,6 +34,8 @@ class Staging extends MacroTransform { override def phaseName: String = Staging.name + override def description: String = Staging.description + override def runsAfter: Set[String] = Set(Inlining.name) override def allowsImplicitSearch: Boolean = true @@ -85,4 +87,5 @@ class Staging extends MacroTransform { object Staging { val name: String = "staging" + val description: String = "check staging levels and heal staged types" } diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala index ba6f1599def6..66dcd4a9dfbd 100644 --- a/compiler/src/dotty/tools/dotc/transform/TailRec.scala +++ b/compiler/src/dotty/tools/dotc/transform/TailRec.scala @@ -113,6 +113,8 @@ class TailRec extends MiniPhase { override def phaseName: String = TailRec.name + override def description: String = TailRec.description + override def runsAfter: Set[String] = Set(Erasure.name) // tailrec assumes erased types override def transformDefDef(tree: DefDef)(using Context): Tree = { @@ -444,4 +446,5 @@ class TailRec extends MiniPhase { object TailRec { val name: String = "tailrec" + val description: String = "rewrite tail recursion to loops" } diff --git a/compiler/src/dotty/tools/dotc/transform/TransformWildcards.scala b/compiler/src/dotty/tools/dotc/transform/TransformWildcards.scala index eac7ef11b7de..ffed65f7676e 100644 --- a/compiler/src/dotty/tools/dotc/transform/TransformWildcards.scala +++ b/compiler/src/dotty/tools/dotc/transform/TransformWildcards.scala @@ -14,7 +14,9 @@ import ast.tpd class TransformWildcards extends MiniPhase with IdentityDenotTransformer { import tpd._ - override def phaseName: String = "transformWildcards" + override def phaseName: String = TransformWildcards.name + + override def description: String = TransformWildcards.description override def checkPostCondition(tree: Tree)(using Context): Unit = tree match { @@ -26,3 +28,7 @@ class TransformWildcards extends MiniPhase with IdentityDenotTransformer { if (ctx.owner.isClass) tree else cpy.ValDef(tree)(rhs = tree.rhs.wildcardToDefault) } + +object TransformWildcards: + val name: String = "transformWildcards" + val description: String = "replace wildcards with default values" diff --git a/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala b/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala index 6be58352e6dc..34971911bc7d 100644 --- a/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala +++ b/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala @@ -42,7 +42,9 @@ import dotty.tools.dotc.util.Spans.Span class TryCatchPatterns extends MiniPhase { import dotty.tools.dotc.ast.tpd._ - def phaseName: String = "tryCatchPatterns" + override def phaseName: String = TryCatchPatterns.name + + override def description: String = TryCatchPatterns.description override def runsAfter: Set[String] = Set(ElimRepeated.name) @@ -98,3 +100,6 @@ class TryCatchPatterns extends MiniPhase { } } +object TryCatchPatterns: + val name: String = "tryCatchPatterns" + val description: String = "compile cases in try/catch" diff --git a/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala b/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala index 73e75597c2b3..d7705111444f 100644 --- a/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala +++ b/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala @@ -21,7 +21,9 @@ import scala.annotation.tailrec class TupleOptimizations extends MiniPhase with IdentityDenotTransformer { import tpd._ - def phaseName: String = "genericTuples" + override def phaseName: String = TupleOptimizations.name + + override def description: String = TupleOptimizations.description override def transformApply(tree: tpd.Apply)(using Context): tpd.Tree = if (!tree.symbol.exists || tree.symbol.owner != defn.RuntimeTuplesModuleClass) tree @@ -218,3 +220,6 @@ class TupleOptimizations extends MiniPhase with IdentityDenotTransformer { (0 until size).map(i => tup.select(nme.selectorName(i))).toList } +object TupleOptimizations: + val name: String = "genericTuples" + val description: String = "optimize generic operations on tuples" diff --git a/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala b/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala index 958fce04da77..29f9e68aa7fa 100644 --- a/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala +++ b/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala @@ -15,6 +15,7 @@ import ast.tpd object UncacheGivenAliases: val name: String = "uncacheGivenAliases" + val description: String = "avoid caching RHS of simple parameterless given aliases" /** This phase optimizes alias givens represented as lazy vals to be uncached * if that does not change runtime behavior. A definition does not need to be @@ -30,6 +31,8 @@ class UncacheGivenAliases extends MiniPhase with IdentityDenotTransformer: override def phaseName: String = UncacheGivenAliases.name + override def description: String = UncacheGivenAliases.description + private def needsCache(sym: Symbol, rhs: Tree)(using Context): Boolean = rhs.tpe match case rhsTpe @ TermRef(NoPrefix, _) if rhsTpe.isStable => false diff --git a/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala b/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala index 629868e2426d..d63e2d453b44 100644 --- a/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala +++ b/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala @@ -27,6 +27,8 @@ class UninitializedDefs extends MiniPhase: override def phaseName: String = UninitializedDefs.name + override def description: String = UninitializedDefs.description + override def transformValDef(tree: ValDef)(using Context): Tree = if !hasUninitializedRHS(tree) then tree else cpy.ValDef(tree)(rhs = cpy.Ident(tree.rhs)(nme.WILDCARD).withType(tree.tpt.tpe)) @@ -46,4 +48,5 @@ end UninitializedDefs object UninitializedDefs: val name: String = "uninitializedDefs" + val description: String = "replaces `compiletime.uninitialized` by `_`" end UninitializedDefs diff --git a/compiler/src/dotty/tools/dotc/transform/VCElideAllocations.scala b/compiler/src/dotty/tools/dotc/transform/VCElideAllocations.scala index d9fb4567e169..879a885d626e 100644 --- a/compiler/src/dotty/tools/dotc/transform/VCElideAllocations.scala +++ b/compiler/src/dotty/tools/dotc/transform/VCElideAllocations.scala @@ -18,7 +18,9 @@ import TreeExtractors._, ValueClasses._ class VCElideAllocations extends MiniPhase with IdentityDenotTransformer { import tpd._ - override def phaseName: String = "vcElideAllocations" + override def phaseName: String = VCElideAllocations.name + + override def description: String = VCElideAllocations.description override def runsAfter: Set[String] = Set(ElimErasedValueType.name) @@ -47,3 +49,7 @@ class VCElideAllocations extends MiniPhase with IdentityDenotTransformer { tree } } + +object VCElideAllocations: + val name: String = "vcElideAllocations" + val description: String = "peep-hole optimization to eliminate unnecessary value class allocations" diff --git a/compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala b/compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala index a777a570da27..219945d4ebb1 100644 --- a/compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala +++ b/compiler/src/dotty/tools/dotc/transform/VCInlineMethods.scala @@ -42,7 +42,9 @@ import ExtensionMethods._, ValueClasses._ class VCInlineMethods extends MiniPhase with IdentityDenotTransformer { import tpd._ - override def phaseName: String = "vcInlineMethods" + override def phaseName: String = VCInlineMethods.name + + override def description: String = VCInlineMethods.description override def runsAfter: Set[String] = Set(ExtensionMethods.name, PatternMatcher.name) @@ -105,3 +107,7 @@ class VCInlineMethods extends MiniPhase with IdentityDenotTransformer { override def transformApply(tree: Apply)(using Context): Tree = rewireIfNeeded(tree) } + +object VCInlineMethods: + val name: String = "vcInlineMethods" + val description: String = "inlines calls to value class methods" diff --git a/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala b/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala index 44655e3bead3..fb0731198a98 100644 --- a/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala +++ b/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala @@ -14,7 +14,9 @@ import dotty.tools.dotc.util.SourceFile class YCheckPositions extends Phase { import tpd._ - def phaseName: String = "inlinedPositions" + override def phaseName: String = YCheckPositions.name + + override def description: String = YCheckPositions.description override def run(using Context): Unit = () // YCheck only @@ -63,3 +65,6 @@ class YCheckPositions extends Phase { } +object YCheckPositions: + val name: String = "inlinedPositions" + val description: String = "check inlined positions" diff --git a/compiler/src/dotty/tools/dotc/transform/init/Checker.scala b/compiler/src/dotty/tools/dotc/transform/init/Checker.scala index 2aba63052c1d..9d95951cb36c 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Checker.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Checker.scala @@ -22,7 +22,9 @@ import Semantic._ class Checker extends Phase { - val phaseName = "initChecker" + override def phaseName: String = Checker.name + + override def description: String = Checker.description override val runsAfter = Set(Pickler.name) @@ -78,3 +80,7 @@ class Checker extends Phase { instantiable && cls.enclosingPackageClass != defn.StdLibPatchesPackage.moduleClass } } + +object Checker: + val name: String = "initChecker" + val description: String = "check initialization of objects" diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala index 90b2b4f4cabf..741803d41a66 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala @@ -24,7 +24,9 @@ import dotty.tools.dotc.typer.ConstFold class StringInterpolatorOpt extends MiniPhase { import tpd._ - override def phaseName: String = "stringInterpolatorOpt" + override def phaseName: String = StringInterpolatorOpt.name + + override def description: String = StringInterpolatorOpt.description override def checkPostCondition(tree: tpd.Tree)(using Context): Unit = { tree match { @@ -178,3 +180,7 @@ class StringInterpolatorOpt extends MiniPhase { } } + +object StringInterpolatorOpt: + val name: String = "stringInterpolatorOpt" + val description: String = "optimize raw and s string interpolators" diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala b/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala index 483622c2fb0c..da4c57afb3e6 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala @@ -54,6 +54,8 @@ class AddLocalJSFakeNews extends MiniPhase { thisPhase => override def phaseName: String = AddLocalJSFakeNews.name + override def description: String = AddLocalJSFakeNews.description + override def isEnabled(using Context): Boolean = ctx.settings.scalajs.value @@ -96,4 +98,5 @@ class AddLocalJSFakeNews extends MiniPhase { thisPhase => object AddLocalJSFakeNews { val name: String = "addLocalJSFakeNews" + val description: String = "adds fake new invocations to local JS classes in calls to `createLocalJSClass`" } diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala b/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala index d714151c66d5..c2685ee3c431 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala @@ -239,6 +239,8 @@ class ExplicitJSClasses extends MiniPhase with InfoTransformer { thisPhase => override def phaseName: String = ExplicitJSClasses.name + override def description: String = ExplicitJSClasses.description + private var MyState: Store.Location[MyState] = _ private def myState(using Context) = ctx.store(MyState) @@ -720,6 +722,7 @@ class ExplicitJSClasses extends MiniPhase with InfoTransformer { thisPhase => object ExplicitJSClasses { val name: String = "explicitJSClasses" + val description: String = "make all JS classes explicit" val LocalJSClassValueName: UniqueNameKind = new UniqueNameKind("$jsclass") diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala b/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala index 8f8fae6ffad2..c6f1feba5e98 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala @@ -111,7 +111,9 @@ class JUnitBootstrappers extends MiniPhase { import JUnitBootstrappers._ import ast.tpd._ - def phaseName: String = "junitBootstrappers" + override def phaseName: String = JUnitBootstrappers.name + + override def description: String = JUnitBootstrappers.description override def isEnabled(using Context): Boolean = super.isEnabled && ctx.settings.scalajs.value @@ -312,6 +314,8 @@ class JUnitBootstrappers extends MiniPhase { } object JUnitBootstrappers { + val name: String = "junitBootstrappers" + val description: String = "generate JUnit-specific bootstrapper classes for Scala.js" private object junitNme { val beforeClass: TermName = termName("beforeClass") diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala b/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala index cf4edef45b08..c9cf71554bc6 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala @@ -64,6 +64,8 @@ class PrepJSInterop extends MacroTransform with IdentityDenotTransformer { thisP override def phaseName: String = PrepJSInterop.name + override def description: String = PrepJSInterop.description + override def isEnabled(using Context): Boolean = ctx.settings.scalajs.value @@ -993,6 +995,7 @@ class PrepJSInterop extends MacroTransform with IdentityDenotTransformer { thisP object PrepJSInterop { val name: String = "prepjsinterop" + val description: String = "additional checks and transformations for Scala.js" private final class OwnerKind private (private val baseKinds: Int) extends AnyVal { import OwnerKind._ diff --git a/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala b/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala index 5a48da34d87f..970b771623f6 100644 --- a/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/CrossVersionChecks.scala @@ -13,7 +13,9 @@ import ast.tpd class CrossVersionChecks extends MiniPhase: import tpd.* - def phaseName = "crossVersionChecks" + override def phaseName: String = CrossVersionChecks.name + + override def description: String = CrossVersionChecks.description override def runsAfterGroupsOf: Set[String] = Set(FirstTransform.name) // We assume all type trees except TypeTree have been eliminated @@ -207,4 +209,8 @@ class CrossVersionChecks extends MiniPhase: tree } -end CrossVersionChecks \ No newline at end of file +end CrossVersionChecks + +object CrossVersionChecks: + val name: String = "crossVersionChecks" + val description: String = "check issues related to deprecated and experimental" diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala index 9ababe3e5f07..834cfba2a8a0 100644 --- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala @@ -28,6 +28,7 @@ object RefChecks { import tpd._ val name: String = "refchecks" + val description: String = "checks related to abstract members and overriding" private val defaultMethodFilter = new NameFilter { def apply(pre: Type, name: Name)(using Context): Boolean = name.is(DefaultGetterName) @@ -1091,6 +1092,8 @@ class RefChecks extends MiniPhase { thisPhase => override def phaseName: String = RefChecks.name + override def description: String = RefChecks.description + override def runsAfter: Set[String] = Set(ElimRepeated.name) // Needs to run after ElimRepeated for override checks involving varargs methods diff --git a/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala b/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala index a8a2ff95687a..070bf9fff12f 100644 --- a/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala +++ b/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala @@ -26,7 +26,11 @@ import ast.Trees._ class TyperPhase(addRootImports: Boolean = true) extends Phase { override def phaseName: String = TyperPhase.name + + override def description: String = TyperPhase.description + override def isTyper: Boolean = true + import ast.tpd override def allowsImplicitSearch: Boolean = true @@ -98,6 +102,7 @@ class TyperPhase(addRootImports: Boolean = true) extends Phase { object TyperPhase { val name: String = "typer" + val description: String = "type the trees" } @deprecated(message = "FrontEnd has been split into TyperPhase and Parser. Refer to one or the other.") From 44aae2a9835240580646583108095ac6fa62285e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wro=C5=84ski?= Date: Tue, 1 Feb 2022 18:26:07 +0100 Subject: [PATCH 1121/1244] Fix - after cleanup run checkout to back to repo directory --- .github/workflows/releases.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 2bb6d3e49282..820843778428 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -20,5 +20,8 @@ jobs: - name: Cleanup run: .github/workflows/cleanup.sh + - name: Git Checkout + uses: actions/checkout@v2 + - name: Publish to SDKMAN run: .github/workflows/scripts/publish-sdkman.sh From 8073e52106190939677353eb80e41ddcf92136fd Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 2 Feb 2022 11:21:57 +0100 Subject: [PATCH 1122/1244] Rename master branch to main in CI --- .github/workflows/ci.yaml | 2 +- .github/workflows/scaladoc.yaml | 4 ++-- README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 405225011cdd..2847bfd578b9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -122,7 +122,7 @@ jobs: runs-on: [self-hosted, Windows] if: "( github.event_name == 'push' - && github.ref != 'refs/heads/master' + && github.ref != 'refs/heads/main' ) || ( github.event_name == 'pull_request' diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml index 080b77fcb054..50c8009f3e8e 100644 --- a/.github/workflows/scaladoc.yaml +++ b/.github/workflows/scaladoc.yaml @@ -13,7 +13,7 @@ jobs: && !contains(github.event.pull_request.body, '[skip docs]') ) || contains(github.event.ref, 'scaladoc') - || contains(github.event.ref, 'master')" + || contains(github.event.ref, 'main')" steps: - name: Git Checkout @@ -82,7 +82,7 @@ jobs: ) || contains(github.event.ref, 'scaladoc') || contains(github.event.ref, 'scala3doc') - || contains(github.event.ref, 'master'))" + || contains(github.event.ref, 'main'))" steps: - name: Git Checkout diff --git a/README.md b/README.md index 991d6842acdc..fa564654fb38 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Dotty ===== -[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amaster) +[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amain) [![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://discord.com/invite/scala) * [Homepage](https://dotty.epfl.ch) From bd6ce7011de30809bf2a4544a4947f1d4964fc28 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 2 Feb 2022 11:23:24 +0100 Subject: [PATCH 1123/1244] Rename master branch to main in scaladoc tasks --- project/Build.scala | 6 +++--- project/scripts/cmdScaladocTests | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 000dfb8e2b6e..e91849fdd1d3 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1394,10 +1394,10 @@ object Build { def generateDocTask = generateDocumentation( - roots, "Scala 3", dest.getAbsolutePath, "master", + roots, "Scala 3", dest.getAbsolutePath, "main", Seq( "-comment-syntax", "wiki", - s"-source-links:docs=github://lampepfl/dotty/master#docs", + s"-source-links:docs=github://lampepfl/dotty/main#docs", "-doc-root-content", docRootFile.toString, "-versions-dictionary-url", "https://scala-lang.org/api/versions.json", @@ -1420,7 +1420,7 @@ object Build { (Test / Build.testcasesOutputDir).value, "scaladoc testcases", "scaladoc/output/testcases", - "master", + "main", Seq("-usejavacp", "-snippet-compiler:scaladoc-testcases/docs=compile", "-siteroot", "scaladoc-testcases/docs") ) }.value, diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index e2eb8fd65470..ce8d310fb248 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -38,6 +38,6 @@ dist/target/pack/bin/scaladoc \ -siteroot scaladoc-testcases/docs \ -project-footer "Copyright (c) 2002-2022, LAMP/EPFL" \ -default-template static-site-main \ - -author -groups -revision master -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ + -author -groups -revision main -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts" diff -rq "$OUT1" "scaladoc/output/testcases" From f745fa6eaee28edaa46ab045a166815ca2bf1bff Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 2 Feb 2022 11:25:08 +0100 Subject: [PATCH 1124/1244] Rename master branch to main in benchmark profiles --- bench/profiles/compiletime.yml | 10 +++++----- bench/profiles/empty.yml | 6 +++--- bench/profiles/exhaustivity.yml | 18 +++++++++--------- bench/profiles/implicits.yml | 8 ++++---- bench/profiles/misc.yml | 4 ++-- bench/profiles/projects.yml | 2 +- bench/profiles/quotes.yml | 6 +++--- bench/profiles/tuples.yml | 14 +++++++------- bench/profiles/typing.yml | 2 +- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/bench/profiles/compiletime.yml b/bench/profiles/compiletime.yml index df85424c8f56..fd77df7dfe9a 100644 --- a/bench/profiles/compiletime.yml +++ b/bench/profiles/compiletime.yml @@ -1,31 +1,31 @@ charts: - name: "Compile-time sums of constant integer types (generated)" - url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala lines: - key: compiletime-sum-constants label: bootstrapped - name: "Compile-time sums of term reference types (generated)" - url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala lines: - key: compiletime-sum-termrefs label: bootstrapped - name: "Sums of term references, result type inferred (generated)" - url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala lines: - key: compiletime-sum-termrefs-terms label: bootstrapped - name: "Compile-time sums of type applications (generated)" - url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala lines: - key: compiletime-sum-applications label: bootstrapped - name: "Compile-time additions inside multiplications (generated)" - url: https://github.com/lampepfl/dotty/blob/master/bench/src/main/scala/generateBenchmarks.scala + url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala lines: - key: compiletime-distribute label: bootstrapped diff --git a/bench/profiles/empty.yml b/bench/profiles/empty.yml index ef878e07f50d..ac571e64e831 100644 --- a/bench/profiles/empty.yml +++ b/bench/profiles/empty.yml @@ -1,19 +1,19 @@ charts: - name: "empty class" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/empty-class.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-class.scala lines: - key: empty-class label: bootstrapped - name: "empty object" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/empty-object.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-object.scala lines: - key: empty-object label: bootstrapped - name: "empty file" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/empty-file.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/empty-file.scala lines: - key: empty-file label: bootstrapped diff --git a/bench/profiles/exhaustivity.yml b/bench/profiles/exhaustivity.yml index 1dd4f78c5aa8..af6eb4041f6c 100644 --- a/bench/profiles/exhaustivity.yml +++ b/bench/profiles/exhaustivity.yml @@ -1,54 +1,54 @@ charts: - name: "exhaustivity check" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/patmatexhaust.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/patmatexhaust.scala lines: - key: patmatexhaust label: bootstrapped - name: "exhaustivity I" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-I.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-I.scala lines: - key: exhaustivity-I label: bootstrapped - name: "exhaustivity S" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-S.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-S.scala lines: - key: exhaustivity-S label: bootstrapped - name: "exhaustivity T" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-T.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-T.scala lines: - key: exhaustivity-T label: bootstrapped - name: "exhaustivity V" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/exhaustivity-V.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/exhaustivity-V.scala lines: - key: exhaustivity-V label: bootstrapped - name: "exhaustivity MIPS" - url: https://github.com/lampepfl/dotty/blob/master/tests/patmat/i7186.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i7186.scala lines: - key: exhaustivity-mips label: bootstrapped - name: "exhaustivity i12241" - url: https://github.com/lampepfl/dotty/blob/master/tests/patmat/i12241.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i12241.scala lines: - key: exhaustivity-i12241 label: bootstrapped - name: "exhaustivity i12358" - url: https://github.com/lampepfl/dotty/blob/master/tests/patmat/i12358.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/patmat/i12358.scala lines: - key: exhaustivity-i12358 label: bootstrapped - name: "exhaustivity i13565" - url: https://github.com/lampepfl/dotty/blob/master/tests/pos/i13565.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/pos/i13565.scala lines: - key: exhaustivity-i13565 label: bootstrapped diff --git a/bench/profiles/implicits.yml b/bench/profiles/implicits.yml index d20a99c26461..3e944b5be28b 100644 --- a/bench/profiles/implicits.yml +++ b/bench/profiles/implicits.yml @@ -1,6 +1,6 @@ charts: - name: "implicit cache I" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/implicit_cache.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicit_cache.scala lines: - key: implicit-cache label: bootstrapped @@ -8,7 +8,7 @@ charts: label: from tasty - name: "implicit cache II" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/implicitNums.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicitNums.scala lines: - key: implicitNums label: bootstrapped @@ -16,13 +16,13 @@ charts: label: from tasty - name: "implicit scope loop" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/implicit-scope-loop.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/implicit-scope-loop.scala lines: - key: implicit-scope-loop label: bootstrapped - name: "inductive implicits" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/inductive-implicits.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/inductive-implicits.scala lines: - key: inductive-implicits label: bootstrapped diff --git a/bench/profiles/misc.yml b/bench/profiles/misc.yml index 80172fc791ed..668f8e60c176 100644 --- a/bench/profiles/misc.yml +++ b/bench/profiles/misc.yml @@ -1,13 +1,13 @@ charts: - name: "issue #1535" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/i1535.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/i1535.scala lines: - key: i1535 label: bootstrapped - name: "issue #1687" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/i1687.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/i1687.scala lines: - key: i1687 label: bootstrapped diff --git a/bench/profiles/projects.yml b/bench/profiles/projects.yml index 2d96fb732910..e012d36b0b01 100644 --- a/bench/profiles/projects.yml +++ b/bench/profiles/projects.yml @@ -18,7 +18,7 @@ charts: label: bootstrapped - name: re2 - url: https://github.com/lampepfl/bench/blob/master/tests/re2s + url: https://github.com/lampepfl/bench/blob/main/tests/re2s lines: - key: re2s label: bootstrapped diff --git a/bench/profiles/quotes.yml b/bench/profiles/quotes.yml index 9cb0d44e2304..afd970543aa1 100644 --- a/bench/profiles/quotes.yml +++ b/bench/profiles/quotes.yml @@ -1,18 +1,18 @@ charts: - name: "Inline a quote" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/power-macro/PowerInlined-1.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/power-macro/PowerInlined-1.scala lines: - key: power-macro-power-inlined-1 label: bootstrapped - name: "Inline 1k quotes" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/power-macro/PowerInlined-1k.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/power-macro/PowerInlined-1k.scala lines: - key: power-macro-power-inlined-1k label: bootstrapped - name: "Quote String interpolation matching" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/string-interpolation-macro/Test.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/string-interpolation-macro/Test.scala lines: - key: quote-string-interpolation-matching label: bootstrapped diff --git a/bench/profiles/tuples.yml b/bench/profiles/tuples.yml index eaa2f302a885..5e41ecf7c80d 100644 --- a/bench/profiles/tuples.yml +++ b/bench/profiles/tuples.yml @@ -1,42 +1,42 @@ charts: - name: "Tuple22 creation with Tuple22.apply" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/tuple22-creation-apply.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-creation-apply.scala lines: - key: tuple22-creation-apply label: bootstrapped - name: "Tuple22 creation with *:" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/tuple22-creation-cons.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-creation-cons.scala lines: - key: tuple22-creation-cons label: bootstrapped - name: "Tuple22.tail" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/tuple22-tails.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-tails.scala lines: - key: tuple22-tails label: bootstrapped - name: "Tuple22.apply" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/tuple22-apply.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-apply.scala lines: - key: tuple22-apply label: bootstrapped - name: "Tuple22.size" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/tuple22-size.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/tuple22-size.scala lines: - key: tuple22-size label: bootstrapped - name: "Tuple reverse (Runtime)" - url: https://github.com/lampepfl/dotty/blob/master/bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala#L59 + url: https://github.com/lampepfl/dotty/blob/main/bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala#L59 lines: - key: tuple-reverse label: bootstrapped - name: "Tuple flatMap (Runtime)" - url: https://github.com/lampepfl/dotty/blob/master/bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala#L64 + url: https://github.com/lampepfl/dotty/blob/main/bench-run/src/main/scala/dotty/tools/benchmarks/tuples/TupleOps.scala#L64 lines: - key: tuple-flatMap label: bootstrapped diff --git a/bench/profiles/typing.yml b/bench/profiles/typing.yml index 4df33da49d32..f6476bca7006 100644 --- a/bench/profiles/typing.yml +++ b/bench/profiles/typing.yml @@ -1,6 +1,6 @@ charts: - name: "Find Ref" - url: https://github.com/lampepfl/dotty/blob/master/tests/bench/FindRef.scala + url: https://github.com/lampepfl/dotty/blob/main/tests/bench/FindRef.scala lines: - key: find-ref label: bootstrapped From e281a87486120d917be4d6e5e8e14fc44dd4856b Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 2 Feb 2022 11:27:02 +0100 Subject: [PATCH 1125/1244] Rename master branch to main in the documentation --- .../2019-06-11-16th-dotty-milestone-release.md | 2 +- .../2019-12-20-21th-dotty-milestone-release.md | 2 +- .../2020-04-29-24th-dotty-milestone-release.md | 2 +- .../2020-06-22-25th-dotty-milestone-release.md | 2 +- .../2020-07-27-26th-dotty-milestone-release.md | 2 +- .../2020-08-31-27th-dotty-milestone-release.md | 2 +- docs/blog/_posts/2020-11-09-scala3-m1.md | 2 +- docs/blog/_posts/2020-12-18-scala3-m3.md | 2 +- docs/blog/_posts/2021-03-31-scala3-rc2.md | 2 +- docs/blog/_posts/2021-04-21-scala3-rc3.md | 2 +- .../_posts/2021-06-07-scala3.0.1-rc1-release.md | 2 +- docs/blog/_posts/2021-06-25-scala301-rc2.md | 2 +- docs/docs/contributing/debugging.md | 2 +- docs/docs/contributing/getting-started.md | 2 +- docs/docs/internals/overall-structure.md | 14 +++++++------- docs/docs/internals/type-system.md | 6 +++--- .../changed-features/structural-types-spec.md | 2 +- .../reference/contextual/multiversal-equality.md | 4 ++-- docs/docs/reference/enums/enums.md | 2 +- docs/docs/reference/experimental/explicit-nulls.md | 2 +- .../new-types/dependent-function-types-spec.md | 4 ++-- .../reference/new-types/intersection-types-spec.md | 2 +- 22 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md b/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md index e3d81f6c3df5..41194df26625 100644 --- a/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md +++ b/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md @@ -156,7 +156,7 @@ enum B(val gravity: Double) extends java.lang.Enum[B] { } ``` -For more information please check the [test case](https://github.com/lampepfl/dotty/tree/master/tests/run/enum-java) and +For more information please check the [test case](https://github.com/lampepfl/dotty/tree/main/tests/run/enum-java) and also the relevant PRs [#6602](https://github.com/lampepfl/dotty/pull/6602) and [#6629](https://github.com/lampepfl/dotty/pull/6629). diff --git a/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md b/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md index 6b5d28c35254..94d8ee61bec9 100644 --- a/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md +++ b/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md @@ -48,7 +48,7 @@ It means that we can now put the Scala 3 compiler under heavy load, getting it ready for industrial strength applications. At the moment we have 23 projects on our community projects and we expect this number to go up! -> https://github.com/lampepfl/dotty/tree/master/community-build/community-projects +> https://github.com/lampepfl/dotty/tree/main/community-build/community-projects This project contains tests to build and test a corpus of open sources Scala 2.x projects against Scala 3. diff --git a/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md b/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md index d4f34446e5c4..e32df8cacc55 100644 --- a/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md +++ b/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md @@ -134,7 +134,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md b/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md index 8989a2f7b410..dd5def04bfe9 100644 --- a/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md +++ b/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md @@ -98,7 +98,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md b/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md index 06a76455e433..b0d153dded7e 100644 --- a/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md +++ b/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md @@ -128,7 +128,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md b/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md index 641db674abb6..e42e98a1385b 100644 --- a/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md +++ b/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md @@ -109,7 +109,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2020-11-09-scala3-m1.md b/docs/blog/_posts/2020-11-09-scala3-m1.md index 5292ad0e8344..ffef5618f9ff 100644 --- a/docs/blog/_posts/2020-11-09-scala3-m1.md +++ b/docs/blog/_posts/2020-11-09-scala3-m1.md @@ -199,7 +199,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2020-12-18-scala3-m3.md b/docs/blog/_posts/2020-12-18-scala3-m3.md index e0cba2b144d8..41cfa76c0265 100644 --- a/docs/blog/_posts/2020-12-18-scala3-m3.md +++ b/docs/blog/_posts/2020-12-18-scala3-m3.md @@ -231,7 +231,7 @@ We are looking forward to having you join the team of contributors. ## Library authors: Join our community build -Scala 3 is regularly tested against a sample of libraries known as the "community build". You can add your library to the [community build](https://github.com/lampepfl/dotty/tree/master/community-build) by submitting a PR. +Scala 3 is regularly tested against a sample of libraries known as the "community build". You can add your library to the [community build](https://github.com/lampepfl/dotty/tree/main/community-build) by submitting a PR. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2021-03-31-scala3-rc2.md b/docs/blog/_posts/2021-03-31-scala3-rc2.md index 8e4439037be5..178dfabfbffc 100644 --- a/docs/blog/_posts/2021-03-31-scala3-rc2.md +++ b/docs/blog/_posts/2021-03-31-scala3-rc2.md @@ -116,7 +116,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2021-04-21-scala3-rc3.md b/docs/blog/_posts/2021-04-21-scala3-rc3.md index 532bcb4060cb..8651730da93a 100644 --- a/docs/blog/_posts/2021-04-21-scala3-rc3.md +++ b/docs/blog/_posts/2021-04-21-scala3-rc3.md @@ -49,7 +49,7 @@ We are looking forward to having you join the team of contributors. Dotty now has a set of widely-used community libraries that are built against every nightly Dotty snapshot. Currently, this includes shapeless, ScalaPB, algebra, scalatest, scopt and squants. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md b/docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md index d4b7ef88df41..e9fac2d0447c 100644 --- a/docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md +++ b/docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md @@ -147,7 +147,7 @@ According to `git shortlog -sn --no-merges 3.0.0-RC2..3.0.1-RC1`† these are: ## Library authors: Join our community build Scala 3 now has a set of widely-used community libraries that are built against every nightly Scala 3 snapshot. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/blog/_posts/2021-06-25-scala301-rc2.md b/docs/blog/_posts/2021-06-25-scala301-rc2.md index 136b43928d45..76257d1a8664 100644 --- a/docs/blog/_posts/2021-06-25-scala301-rc2.md +++ b/docs/blog/_posts/2021-06-25-scala301-rc2.md @@ -29,7 +29,7 @@ According to `git shortlog -sn --no-merges 3.0.1-RC1..3.0.1-RC2` these are: ## Library authors: Join our community build Scala 3 now has a set of widely-used community libraries that are built against every nightly Scala 3 snapshot. -Join our [community build](https://github.com/lampepfl/dotty/tree/master/community-build) +Join our [community build](https://github.com/lampepfl/dotty/tree/main/community-build) to make sure that our regression suite includes your library. [Scastie]: https://scastie.scala-lang.org/?target=dotty diff --git a/docs/docs/contributing/debugging.md b/docs/docs/contributing/debugging.md index 84f6937f628f..959ad6706290 100644 --- a/docs/docs/contributing/debugging.md +++ b/docs/docs/contributing/debugging.md @@ -164,7 +164,7 @@ val YshowVarBounds = BooleanSetting("-Yshow-var-bounds" , "Print type varia val YtestPickler = BooleanSetting("-Ytest-pickler" , "self-test for pickling functionality; should be used with -Ystop-after:pickler") ``` -They are defined in [ScalaSettings.scala](https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala). E.g. `YprintPos` is defined as: +They are defined in [ScalaSettings.scala](https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala). E.g. `YprintPos` is defined as: ```scala val YprintPos: Setting[Boolean] = BooleanSetting("-Yprint-pos", "show tree positions.") diff --git a/docs/docs/contributing/getting-started.md b/docs/docs/contributing/getting-started.md index 8b617c04f6c4..c842fd0a49d0 100644 --- a/docs/docs/contributing/getting-started.md +++ b/docs/docs/contributing/getting-started.md @@ -89,7 +89,7 @@ $ sbt For more information, see `scaladoc/README.md`. Before contributing to Dotty, we invite you to consult the -[Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/master/CONTRIBUTING.md). +[Dotty Developer Guidelines](https://github.com/lampepfl/dotty/blob/main/CONTRIBUTING.md). Community diff --git a/docs/docs/internals/overall-structure.md b/docs/docs/internals/overall-structure.md index 73964977ba42..f50ab6bf03a7 100644 --- a/docs/docs/internals/overall-structure.md +++ b/docs/docs/internals/overall-structure.md @@ -233,10 +233,10 @@ Phases fall into four categories: * Code generators: These map the transformed trees to Java classfiles or .sjsir files. -[dotty.tools]: https://github.com/lampepfl/dotty/tree/master/compiler/src/dotty/tools -[dotc]: https://github.com/lampepfl/dotty/tree/master/compiler/src/dotty/tools/dotc -[Main]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Main.scala -[Driver]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Driver.scala -[Compiler]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Compiler.scala -[Run]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/Run.scala -[Context]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/Contexts.scala +[dotty.tools]: https://github.com/lampepfl/dotty/tree/main/compiler/src/dotty/tools +[dotc]: https://github.com/lampepfl/dotty/tree/main/compiler/src/dotty/tools/dotc +[Main]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Main.scala +[Driver]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Driver.scala +[Compiler]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Compiler.scala +[Run]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/Run.scala +[Context]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/Contexts.scala diff --git a/docs/docs/internals/type-system.md b/docs/docs/internals/type-system.md index 7c5f8bf827d9..8fa8912a7118 100644 --- a/docs/docs/internals/type-system.md +++ b/docs/docs/internals/type-system.md @@ -132,8 +132,8 @@ TODO ## Type inference via constraint solving ## TODO -[1]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/Types.scala +[1]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/Types.scala [2]: https://github.com/samuelgruetter/dotty/blob/classdiagrampdf/dotty-types.pdf [3]: https://github.com/samuelgruetter/scaladiagrams/tree/print-descendants -[4]: https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/TypeComparer.scala -[5]: https://github.com/lampepfl/dotty/blob/master/tests/pos/refinedSubtyping.scala +[4]: https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +[5]: https://github.com/lampepfl/dotty/blob/main/tests/pos/refinedSubtyping.scala diff --git a/docs/docs/reference/changed-features/structural-types-spec.md b/docs/docs/reference/changed-features/structural-types-spec.md index 5c99afbcc1bb..290189a67eda 100644 --- a/docs/docs/reference/changed-features/structural-types-spec.md +++ b/docs/docs/reference/changed-features/structural-types-spec.md @@ -16,7 +16,7 @@ RefineStat ::= ‘val’ VarDcl | ‘def’ DefDcl | ‘type’ {nl} TypeDcl ## Implementation of Structural Types The standard library defines a universal marker trait -[`scala.Selectable`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/Selectable.scala): +[`scala.Selectable`](https://github.com/lampepfl/dotty/blob/main/library/src/scala/Selectable.scala): ```scala trait Selectable extends Any diff --git a/docs/docs/reference/contextual/multiversal-equality.md b/docs/docs/reference/contextual/multiversal-equality.md index 1af1786374bc..f01b64d2e444 100644 --- a/docs/docs/reference/contextual/multiversal-equality.md +++ b/docs/docs/reference/contextual/multiversal-equality.md @@ -25,7 +25,7 @@ the program will still typecheck, since values of all types can be compared with But it will probably give unexpected results and fail at runtime. Multiversal equality is an opt-in way to make universal equality safer. -It uses a binary type class [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/CanEqual.scala) +It uses a binary type class [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/main/library/src/scala/CanEqual.scala) to indicate that values of two given types can be compared with each other. The example above would not typecheck if `S` or `T` was a class that derives `CanEqual`, e.g. @@ -70,7 +70,7 @@ given CanEqual[A, B] = CanEqual.derived given CanEqual[B, A] = CanEqual.derived ``` -The [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/master/library/src/scala/CanEqual.scala) +The [`scala.CanEqual`](https://github.com/lampepfl/dotty/blob/main/library/src/scala/CanEqual.scala) object defines a number of `CanEqual` given instances that together define a rule book for what standard types can be compared (more details below). diff --git a/docs/docs/reference/enums/enums.md b/docs/docs/reference/enums/enums.md index e68f54fa0dd1..fda03d2dee81 100644 --- a/docs/docs/reference/enums/enums.md +++ b/docs/docs/reference/enums/enums.md @@ -152,7 +152,7 @@ scala> Color.Red.compareTo(Color.Green) val res15: Int = -1 ``` -For a more in-depth example of using Scala 3 enums from Java, see [this test](https://github.com/lampepfl/dotty/tree/master/tests/run/enum-java). In the test, the enums are defined in the `MainScala.scala` file and used from a Java source, `Test.java`. +For a more in-depth example of using Scala 3 enums from Java, see [this test](https://github.com/lampepfl/dotty/tree/main/tests/run/enum-java). In the test, the enums are defined in the `MainScala.scala` file and used from a Java source, `Test.java`. ### Implementation diff --git a/docs/docs/reference/experimental/explicit-nulls.md b/docs/docs/reference/experimental/explicit-nulls.md index 1ee404a44cec..ebdb3356d99e 100644 --- a/docs/docs/reference/experimental/explicit-nulls.md +++ b/docs/docs/reference/experimental/explicit-nulls.md @@ -426,7 +426,7 @@ When dealing with local mutable variables, there are two questions: x = null ``` -See [more examples](https://github.com/lampepfl/dotty/blob/master/tests/explicit-nulls/neg/flow-varref-in-closure.scala). +See [more examples](https://github.com/lampepfl/dotty/blob/main/tests/explicit-nulls/neg/flow-varref-in-closure.scala). Currently, we are unable to track paths with a mutable variable prefix. For example, `x.a` if `x` is mutable. diff --git a/docs/docs/reference/new-types/dependent-function-types-spec.md b/docs/docs/reference/new-types/dependent-function-types-spec.md index aeca72fbe302..c3915ba9b8ac 100644 --- a/docs/docs/reference/new-types/dependent-function-types-spec.md +++ b/docs/docs/reference/new-types/dependent-function-types-spec.md @@ -46,7 +46,7 @@ same way that other functions do, see The example below defines a trait `C` and the two dependent function types `DF` and `IDF` and prints the results of the respective function applications: -[depfuntype.scala]: https://github.com/lampepfl/dotty/blob/master/tests/pos/depfuntype.scala +[depfuntype.scala]: https://github.com/lampepfl/dotty/blob/main/tests/pos/depfuntype.scala ```scala trait C { type M; val m: M } @@ -70,7 +70,7 @@ type IDF = (x: C) ?=> x.M In the following example the depend type `f.Eff` refers to the effect type `CanThrow`: -[eff-dependent.scala]: https://github.com/lampepfl/dotty/blob/master/tests/run/eff-dependent.scala +[eff-dependent.scala]: https://github.com/lampepfl/dotty/blob/main/tests/run/eff-dependent.scala ```scala trait Effect diff --git a/docs/docs/reference/new-types/intersection-types-spec.md b/docs/docs/reference/new-types/intersection-types-spec.md index 4d236c37dcc3..8ed9305e1486 100644 --- a/docs/docs/reference/new-types/intersection-types-spec.md +++ b/docs/docs/reference/new-types/intersection-types-spec.md @@ -98,7 +98,7 @@ glb(A, _) = A // use first In the above, `|T|` means the erased type of `T`, `JArray` refers to the type of Java Array. -See also: [`TypeErasure#erasedGlb`](https://github.com/lampepfl/dotty/blob/master/compiler/src/dotty/tools/dotc/core/TypeErasure.scala#L289). +See also: [`TypeErasure#erasedGlb`](https://github.com/lampepfl/dotty/blob/main/compiler/src/dotty/tools/dotc/core/TypeErasure.scala#L289). ## Relationship with Compound Type (`with`) From 106b0d8007be6fe78dd35ead0a47f5c28ce524c0 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 25 Nov 2021 13:28:19 +0100 Subject: [PATCH 1126/1244] Show inlined positions with source code This gives more context to the users on what happen and where the code came from. --- .../dotc/reporting/MessageRendering.scala | 183 +++++++++++++----- .../dotty/tools/dotc/transform/Splicer.scala | 2 +- .../src/dotty/tools/dotc/typer/Inliner.scala | 2 +- compiler/test-resources/repl/i9227 | 1 - tests/neg-macros/delegate-match-1.check | 1 - tests/neg-macros/delegate-match-2.check | 1 - tests/neg-macros/delegate-match-3.check | 1 - tests/neg-macros/i11386.check | 18 +- tests/neg-macros/i13991.check | 16 ++ tests/neg-macros/i13991/Macro_1.scala | 10 + tests/neg-macros/i13991/Test_2.scala | 6 + tests/neg-macros/i6432.check | 3 - tests/neg-macros/i6432b.check | 3 - tests/neg-macros/i6976.check | 8 +- tests/neg-macros/i9014.check | 1 - tests/neg-macros/ill-abort.check | 8 +- .../neg-macros/macro-class-not-found-1.check | 8 +- .../neg-macros/macro-class-not-found-2.check | 8 +- .../neg-macros/macros-in-same-project-6.check | 1 - tests/neg-scalajs/js-enums.check | 6 +- tests/neg/cannot-reduce-inline-match.check | 10 +- tests/neg/i11225.check | 8 +- tests/neg/i13044.check | 166 +++++++++++++--- tests/neg/i13570.check | 11 +- tests/neg/i13991.check | 15 ++ tests/neg/i13991.scala | 11 ++ tests/neg/inline-error-pos.check | 9 +- tests/neg/summonInline.check | 16 +- 28 files changed, 422 insertions(+), 111 deletions(-) create mode 100644 tests/neg-macros/i13991.check create mode 100644 tests/neg-macros/i13991/Macro_1.scala create mode 100644 tests/neg-macros/i13991/Test_2.scala create mode 100644 tests/neg/i13991.check create mode 100644 tests/neg/i13991.scala mode change 100755 => 100644 tests/neg/summonInline.check diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala index f5b566f3ba60..1cc98cf75898 100644 --- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala +++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala @@ -16,6 +16,8 @@ import scala.annotation.switch import scala.collection.mutable trait MessageRendering { + import Highlight.* + import Offsets.* /** Remove ANSI coloring from `str`, useful for getting real length of * strings @@ -25,15 +27,9 @@ trait MessageRendering { def stripColor(str: String): String = str.replaceAll("\u001b\\[.*?m", "") - /** When inlining a method call, if there's an error we'd like to get the - * outer context and the `pos` at which the call was inlined. - * - * @return a list of strings with inline locations - */ - def outer(pos: SourcePosition, prefix: String)(using Context): List[String] = - if (pos.outer.exists) - i"$prefix| This location contains code that was inlined from $pos" :: - outer(pos.outer, prefix) + /** List of all the inline calls that surround the position */ + def inlinePosStack(pos: SourcePosition): List[SourcePosition] = + if pos.outer != null && pos.outer.exists then pos :: inlinePosStack(pos.outer) else Nil /** Get the sourcelines before and after the position, as well as the offset @@ -41,15 +37,15 @@ trait MessageRendering { * * @return (lines before error, lines after error, line numbers offset) */ - def sourceLines(pos: SourcePosition, diagnosticLevel: String)(using Context): (List[String], List[String], Int) = { + private def sourceLines(pos: SourcePosition)(using Context, Level, Offset): (List[String], List[String], Int) = { assert(pos.exists && pos.source.file.exists) var maxLen = Int.MinValue def render(offsetAndLine: (Int, String)): String = { - val (offset, line) = offsetAndLine - val lineNbr = pos.source.offsetToLine(offset) - val prefix = s"${lineNbr + 1} |" + val (offset1, line) = offsetAndLine + val lineNbr = (pos.source.offsetToLine(offset1) + 1).toString + val prefix = String.format(s"%${offset - 2}s |", lineNbr) maxLen = math.max(maxLen, prefix.length) - val lnum = hl(diagnosticLevel)(" " * math.max(0, maxLen - prefix.length) + prefix) + val lnum = hl(" " * math.max(0, maxLen - prefix.length - 1) + prefix) lnum + line.stripLineEnd } @@ -77,23 +73,75 @@ trait MessageRendering { ) } - /** The column markers aligned under the error */ - def columnMarker(pos: SourcePosition, offset: Int, diagnosticLevel: String)(using Context): String = { - val prefix = " " * (offset - 1) + /** Generate box containing the report title + * + * ``` + * -- Error: source.scala --------------------- + * ``` + */ + private def boxTitle(title: String)(using Context, Level, Offset): String = + val pageWidth = ctx.settings.pageWidth.value + val line = "-" * (pageWidth - title.length - 4) + hl(s"-- $title $line") + + /** The position markers aligned under the error + * + * ``` + * | ^^^^^ + * ``` + */ + private def positionMarker(pos: SourcePosition)(using Context, Level, Offset): String = { val padding = pos.startColumnPadding - val carets = hl(diagnosticLevel) { + val carets = if (pos.startLine == pos.endLine) "^" * math.max(1, pos.endColumn - pos.startColumn) else "^" - } - s"$prefix|$padding$carets" + hl(s"$offsetBox$padding$carets") } + /** The horizontal line with the given offset + * + * ``` + * | + * ``` + */ + private def offsetBox(using Context, Level, Offset): String = + val prefix = " " * (offset - 1) + hl(s"$prefix|") + + /** The end of a box section + * + * ``` + * |--------------- + * ``` + * Or if there `soft` is true, + * ``` + * |··············· + * ``` + */ + private def newBox(soft: Boolean = false)(using Context, Level, Offset): String = + val pageWidth = ctx.settings.pageWidth.value + val prefix = " " * (offset - 1) + val line = (if soft then "·" else "-") * (pageWidth - offset) + hl(s"$prefix|$line") + + /** The end of a box section + * + * ``` + * ·---------------- + * ``` + */ + private def endBox(using Context, Level, Offset): String = + val pageWidth = ctx.settings.pageWidth.value + val prefix = " " * (offset - 1) + val line = "-" * (pageWidth - offset) + hl(s"${prefix}·$line") + /** The error message (`msg`) aligned under `pos` * * @return aligned error message */ - def errorMsg(pos: SourcePosition, msg: String, offset: Int)(using Context): String = { + private def errorMsg(pos: SourcePosition, msg: String)(using Context, Level, Offset): String = { val padding = msg.linesIterator.foldLeft(pos.startColumnPadding) { (pad, line) => val lineLength = stripColor(line).length val maxPad = math.max(0, ctx.settings.pageWidth.value - offset - lineLength) - offset @@ -103,12 +151,12 @@ trait MessageRendering { } msg.linesIterator - .map { line => " " * (offset - 1) + "|" + (if line.isEmpty then "" else padding + line) } + .map { line => offsetBox + (if line.isEmpty then "" else padding + line) } .mkString(EOL) } /** The source file path, line and column numbers from the given SourcePosition */ - def posFileStr(pos: SourcePosition): String = + protected def posFileStr(pos: SourcePosition): String = val path = pos.source.file.path if pos.exists then s"$path:${pos.line + 1}:${pos.column}" else path @@ -116,22 +164,22 @@ trait MessageRendering { * * @return separator containing error location and kind */ - def posStr(pos: SourcePosition, diagnosticLevel: String, message: Message)(using Context): String = - if (pos.source != NoSourcePosition.source) hl(diagnosticLevel)({ - val fileAndPos = posFileStr(pos.nonInlined) - val file = if fileAndPos.isEmpty || fileAndPos.endsWith(" ") then fileAndPos else s"$fileAndPos " + private def posStr(pos: SourcePosition, message: Message, diagnosticString: String)(using Context, Level, Offset): String = + if (pos.source != NoSourcePosition.source) hl({ + val realPos = pos.nonInlined + val fileAndPos = posFileStr(realPos) val errId = if (message.errorId ne ErrorMessageID.NoExplanationID) { val errorNumber = message.errorId.errorNumber s"[E${"0" * (3 - errorNumber.toString.length) + errorNumber}] " } else "" val kind = - if (message.kind == "") diagnosticLevel - else s"${message.kind} $diagnosticLevel" - val prefix = s"-- ${errId}${kind}: $file" - - prefix + - ("-" * math.max(ctx.settings.pageWidth.value - stripColor(prefix).length, 0)) + if (message.kind == "") diagnosticString + else s"${message.kind} $diagnosticString" + val title = + if fileAndPos.isEmpty then s"$errId$kind:" // this happens in dotty.tools.repl.ScriptedTests // TODO add name of source or remove `:` (and update test files) + else s"$errId$kind: $fileAndPos" + boxTitle(title) }) else "" /** Explanation rendered under "Explanation" header */ @@ -146,7 +194,7 @@ trait MessageRendering { sb.toString } - def appendFilterHelp(dia: Diagnostic, sb: mutable.StringBuilder): Unit = + private def appendFilterHelp(dia: Diagnostic, sb: mutable.StringBuilder): Unit = import dia._ val hasId = msg.errorId.errorNumber >= 0 val category = dia match { @@ -166,17 +214,34 @@ trait MessageRendering { /** The whole message rendered from `msg` */ def messageAndPos(dia: Diagnostic)(using Context): String = { import dia._ - val levelString = diagnosticLevel(dia) + val pos1 = pos.nonInlined + val inlineStack = inlinePosStack(pos).filter(_ != pos1) + val maxLineNumber = + if pos.exists then (pos1 :: inlineStack).map(_.endLine).max + 1 + else 0 + given Level = Level(level) + given Offset = Offset(maxLineNumber.toString.length + 2) val sb = mutable.StringBuilder() - val posString = posStr(pos, levelString, msg) + val posString = posStr(pos, msg, diagnosticLevel(dia)) if (posString.nonEmpty) sb.append(posString).append(EOL) if (pos.exists) { val pos1 = pos.nonInlined if (pos1.exists && pos1.source.file.exists) { - val (srcBefore, srcAfter, offset) = sourceLines(pos1, levelString) - val marker = columnMarker(pos1, offset, levelString) - val err = errorMsg(pos1, msg.message, offset) - sb.append((srcBefore ::: marker :: err :: outer(pos, " " * (offset - 1)) ::: srcAfter).mkString(EOL)) + val (srcBefore, srcAfter, offset) = sourceLines(pos1) + val marker = positionMarker(pos1) + val err = errorMsg(pos1, msg.message) + sb.append((srcBefore ::: marker :: err :: srcAfter).mkString(EOL)) + + if inlineStack.nonEmpty then + sb.append(EOL).append(newBox()) + sb.append(EOL).append(offsetBox).append(i"Inline stack trace") + for inlinedPos <- inlineStack if inlinedPos != pos1 do + val (srcBefore, srcAfter, offset) = sourceLines(inlinedPos) + val marker = positionMarker(inlinedPos) + sb.append(EOL).append(newBox(soft = true)) + sb.append(EOL).append(offsetBox).append(i"This location contains code that was inlined from $pos") + sb.append(EOL).append((srcBefore ::: marker :: srcAfter).mkString(EOL)) + sb.append(EOL).append(endBox) } else sb.append(msg.message) } @@ -186,15 +251,13 @@ trait MessageRendering { sb.toString } - def hl(diagnosticLevel: String)(str: String)(using Context): String = diagnosticLevel match { - case "Info" => Blue(str).show - case "Error" => Red(str).show - case _ => - assert(diagnosticLevel.contains("Warning")) - Yellow(str).show - } + private def hl(str: String)(using Context, Level): String = + summon[Level].value match + case interfaces.Diagnostic.ERROR => Red(str).show + case interfaces.Diagnostic.WARNING => Yellow(str).show + case interfaces.Diagnostic.INFO => Blue(str).show - def diagnosticLevel(dia: Diagnostic): String = + private def diagnosticLevel(dia: Diagnostic): String = dia match { case dia: FeatureWarning => "Feature Warning" case dia: DeprecationWarning => "Deprecation Warning" @@ -205,4 +268,28 @@ trait MessageRendering { case interfaces.Diagnostic.WARNING => "Warning" case interfaces.Diagnostic.INFO => "Info" } + +} + +private object Highlight { + opaque type Level = Int + extension (level: Level) def value: Int = level + object Level: + def apply(level: Int): Level = level +} + +/** Size of the left offset added by the box + * + * ``` + * -- Error: ... ------------ + * 4 | foo + * | ^^^ + * ^^^ // size of this offset + * ``` + */ +private object Offsets { + opaque type Offset = Int + def offset(using o: Offset): Int = o + object Offset: + def apply(level: Int): Offset = level } diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala index 49b6f5564620..dcd5b8d8c4b5 100644 --- a/compiler/src/dotty/tools/dotc/transform/Splicer.scala +++ b/compiler/src/dotty/tools/dotc/transform/Splicer.scala @@ -49,7 +49,7 @@ object Splicer { val oldContextClassLoader = Thread.currentThread().getContextClassLoader Thread.currentThread().setContextClassLoader(classLoader) try { - val interpreter = new Interpreter(spliceExpansionPos, classLoader) + val interpreter = new Interpreter(splicePos, classLoader) // Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree val interpretedExpr = interpreter.interpret[Quotes => scala.quoted.Expr[Any]](tree) diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index 722e3abfec85..c99ccbd24428 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -853,7 +853,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { evidence.tpe match case fail: Implicits.SearchFailureType => val msg = evTyper.missingArgMsg(evidence, tpt.tpe, "") - errorTree(tpt, em"$msg") + errorTree(call, em"$msg") case _ => evidence return searchImplicit(callTypeArgs.head) diff --git a/compiler/test-resources/repl/i9227 b/compiler/test-resources/repl/i9227 index 45d1731dae39..40f9248898a2 100644 --- a/compiler/test-resources/repl/i9227 +++ b/compiler/test-resources/repl/i9227 @@ -3,5 +3,4 @@ scala> import scala.quoted._; inline def myMacro[T]: Unit = ${ myMacroImpl[T] }; 1 | import scala.quoted._; inline def myMacro[T]: Unit = ${ myMacroImpl[T] }; def myMacroImpl[T](using Quotes): Expr[Unit] = '{}; println(myMacro[Int]) | ^^^^^^^^^^^^ | Cannot call macro method myMacroImpl defined in the same source file - | This location contains code that was inlined from rs$line$1:1 1 error found diff --git a/tests/neg-macros/delegate-match-1.check b/tests/neg-macros/delegate-match-1.check index 6d88d021416f..93b20beba183 100644 --- a/tests/neg-macros/delegate-match-1.check +++ b/tests/neg-macros/delegate-match-1.check @@ -4,4 +4,3 @@ | ^ | AmbiguousImplicits | both value a1 in class Test1 and value a2 in class Test1 match type A - | This location contains code that was inlined from Test_2.scala:6 diff --git a/tests/neg-macros/delegate-match-2.check b/tests/neg-macros/delegate-match-2.check index 112e5ee00474..e26742452b5b 100644 --- a/tests/neg-macros/delegate-match-2.check +++ b/tests/neg-macros/delegate-match-2.check @@ -4,4 +4,3 @@ | ^ | DivergingImplicit | method a1 in class Test produces a diverging implicit search when trying to match type A - | This location contains code that was inlined from Test_2.scala:5 diff --git a/tests/neg-macros/delegate-match-3.check b/tests/neg-macros/delegate-match-3.check index 278aa92a4117..2b6fda278fda 100644 --- a/tests/neg-macros/delegate-match-3.check +++ b/tests/neg-macros/delegate-match-3.check @@ -4,4 +4,3 @@ | ^ | NoMatchingImplicits | no implicit values were found that match type A - | This location contains code that was inlined from Test_2.scala:3 diff --git a/tests/neg-macros/i11386.check b/tests/neg-macros/i11386.check index 0377ca6389db..1cce199159a5 100644 --- a/tests/neg-macros/i11386.check +++ b/tests/neg-macros/i11386.check @@ -3,11 +3,21 @@ 6 | dummy(0) // error | ^ | test - | This location contains code that was inlined from Test_2.scala:6 - | This location contains code that was inlined from Macro_1.scala:7 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Test_2.scala:6 +7 | notNull(i) + | ^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- -- Error: tests/neg-macros/i11386/Test_2.scala:8:20 -------------------------------------------------------------------- 8 | dummy(int2String(0)) // error | ^^^^^^^^^^^^^ | test - | This location contains code that was inlined from Test_2.scala:8 - | This location contains code that was inlined from Macro_1.scala:7 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Test_2.scala:8 +7 | notNull(i) + | ^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/i13991.check b/tests/neg-macros/i13991.check new file mode 100644 index 000000000000..15f45af227e5 --- /dev/null +++ b/tests/neg-macros/i13991.check @@ -0,0 +1,16 @@ + +-- Error: tests/neg-macros/i13991/Test_2.scala:6:5 --------------------------------------------------------------------- +6 | v2 // error + | ^^ + | Error + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Test_2.scala:3 +3 | inline def v2 = InlineMac.sample("foo") + | ^^^^^ + |····················································································································· + |This location contains code that was inlined from Test_2.scala:3 +3 | inline def v2 = InlineMac.sample("foo") + | ^^^^^^^^^^^^^^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/i13991/Macro_1.scala b/tests/neg-macros/i13991/Macro_1.scala new file mode 100644 index 000000000000..76cfa93cdde5 --- /dev/null +++ b/tests/neg-macros/i13991/Macro_1.scala @@ -0,0 +1,10 @@ +import scala.quoted.* + +object InlineMac: + + inline def sample(inline expr: String): Int = + ${ sampleImpl('expr) } + + def sampleImpl(expr: Expr[String])(using Quotes): Expr[Int] = + import quotes.reflect.* + report.errorAndAbort("Error", expr) diff --git a/tests/neg-macros/i13991/Test_2.scala b/tests/neg-macros/i13991/Test_2.scala new file mode 100644 index 000000000000..572ad324b129 --- /dev/null +++ b/tests/neg-macros/i13991/Test_2.scala @@ -0,0 +1,6 @@ +object Main: + def main(args: Array[String]): Unit = + inline def v2 = InlineMac.sample("foo") + inline def v1 = v2 + + v2 // error diff --git a/tests/neg-macros/i6432.check b/tests/neg-macros/i6432.check index 0e01f99be404..2ea6f3ba0300 100644 --- a/tests/neg-macros/i6432.check +++ b/tests/neg-macros/i6432.check @@ -3,14 +3,11 @@ 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error | ^^^ | abc - | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432/Test_2.scala:4:17 --------------------------------------------------------------------- 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error | ^^^ | xyz - | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432/Test_2.scala:4:28 --------------------------------------------------------------------- 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error | ^^^ | fgh - | This location contains code that was inlined from Test_2.scala:4 diff --git a/tests/neg-macros/i6432b.check b/tests/neg-macros/i6432b.check index 4dd1be84fa3c..395d089c92e9 100644 --- a/tests/neg-macros/i6432b.check +++ b/tests/neg-macros/i6432b.check @@ -3,14 +3,11 @@ 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error | ^^^ | abc - | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432b/Test_2.scala:4:19 -------------------------------------------------------------------- 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error | ^^^ | xyz - | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432b/Test_2.scala:4:30 -------------------------------------------------------------------- 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error | ^^^ | fgh - | This location contains code that was inlined from Test_2.scala:4 diff --git a/tests/neg-macros/i6976.check b/tests/neg-macros/i6976.check index 2057e55550b4..b67f05960a79 100644 --- a/tests/neg-macros/i6976.check +++ b/tests/neg-macros/i6976.check @@ -6,4 +6,10 @@ | scala.MatchError: Inlined(EmptyTree,List(),Literal(Constant(2))) (of class dotty.tools.dotc.ast.Trees$Inlined) | at playground.macros$.mcrImpl(Macro_1.scala:10) | - | This location contains code that was inlined from Test_2.scala:5 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Macro_1.scala:6 +6 | inline def mcr(x: => Any) = ${mcrImpl('x)} + | ^^^^^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/i9014.check b/tests/neg-macros/i9014.check index 509eac067fc8..c0d08a42ef2a 100644 --- a/tests/neg-macros/i9014.check +++ b/tests/neg-macros/i9014.check @@ -3,4 +3,3 @@ 1 |val tests = summon[Bar] // error | ^ | Failed to expand! - | This location contains code that was inlined from Test_2.scala:1 diff --git a/tests/neg-macros/ill-abort.check b/tests/neg-macros/ill-abort.check index 25d7654b1b69..2aa9d3396e53 100644 --- a/tests/neg-macros/ill-abort.check +++ b/tests/neg-macros/ill-abort.check @@ -3,4 +3,10 @@ 1 |def test = fail() // error | ^^^^^^ |Macro expansion was aborted by the macro without any errors reported. Macros should issue errors to end-users to facilitate debugging when aborting a macro expansion. - | This location contains code that was inlined from quoted_1.scala:3 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from quoted_1.scala:3 +3 |inline def fail(): Unit = ${ impl } + | ^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/macro-class-not-found-1.check b/tests/neg-macros/macro-class-not-found-1.check index 445523c6ade2..08ba5b99f0b8 100644 --- a/tests/neg-macros/macro-class-not-found-1.check +++ b/tests/neg-macros/macro-class-not-found-1.check @@ -5,4 +5,10 @@ | java.lang.NoClassDefFoundError | at Foo$.aMacroImplementation(Foo.scala:8) | - | This location contains code that was inlined from Bar.scala:4 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Foo.scala:5 +5 | inline def myMacro(): Unit = ${ aMacroImplementation } + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/macro-class-not-found-2.check b/tests/neg-macros/macro-class-not-found-2.check index 3cb7506e6bb2..d4ed8f222ba0 100644 --- a/tests/neg-macros/macro-class-not-found-2.check +++ b/tests/neg-macros/macro-class-not-found-2.check @@ -5,4 +5,10 @@ | java.lang.NoClassDefFoundError: this.is.not.a.Class | at Foo$.aMacroImplementation(Foo.scala:8) | - | This location contains code that was inlined from Bar.scala:4 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Foo.scala:5 +5 | inline def myMacro(): Unit = ${ aMacroImplementation } + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/macros-in-same-project-6.check b/tests/neg-macros/macros-in-same-project-6.check index 485f5062db92..17f696508259 100644 --- a/tests/neg-macros/macros-in-same-project-6.check +++ b/tests/neg-macros/macros-in-same-project-6.check @@ -2,4 +2,3 @@ 4 | Foo.myMacro() // error | ^^^^^^^^^^^^^ | some error - | This location contains code that was inlined from Bar.scala:4 diff --git a/tests/neg-scalajs/js-enums.check b/tests/neg-scalajs/js-enums.check index eb358f16e57a..e54b2a5af2da 100644 --- a/tests/neg-scalajs/js-enums.check +++ b/tests/neg-scalajs/js-enums.check @@ -4,9 +4,9 @@ |MyEnum extends scala.reflect.Enum which does not extend js.Any. 5 | case Foo -- Error: tests/neg-scalajs/js-enums.scala:9:5 ------------------------------------------------------------------------- -7 |@js.native -8 |@JSGlobal -9 |enum MyEnumNative extends js.Object: // error + 7 |@js.native + 8 |@JSGlobal + 9 |enum MyEnumNative extends js.Object: // error |^ |MyEnumNative extends scala.reflect.Enum which does not extend js.Any. 10 | case Bar diff --git a/tests/neg/cannot-reduce-inline-match.check b/tests/neg/cannot-reduce-inline-match.check index ceca40a74cbd..e35066949333 100644 --- a/tests/neg/cannot-reduce-inline-match.check +++ b/tests/neg/cannot-reduce-inline-match.check @@ -4,4 +4,12 @@ | cannot reduce inline match with | scrutinee: "f" : ("f" : String) | patterns : case _:Int - | This location contains code that was inlined from cannot-reduce-inline-match.scala:3 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from cannot-reduce-inline-match.scala:3 +3 | inline x match { + | ^ +4 | case _: Int => +5 | } + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i11225.check b/tests/neg/i11225.check index 60805a27b22d..0aa5f720e24b 100644 --- a/tests/neg/i11225.check +++ b/tests/neg/i11225.check @@ -42,4 +42,10 @@ 30 | var x7: Int = uni // error | ^^^ | `uninitialized` can only be used as the right hand side of a mutable field definition - | This location contains code that was inlined from i11225.scala:25 + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from i11225.scala:25 +25 | transparent inline def uni = uninitialized + | ^^^^^^^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13044.check b/tests/neg/i13044.check index 87b8a1fe9ae2..b3e278792148 100644 --- a/tests/neg/i13044.check +++ b/tests/neg/i13044.check @@ -4,41 +4,143 @@ | given instance gen is declared as `inline`, but was not inlined | | Try increasing `-Xmax-inlines` above 32 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:18 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +18 | builder :: recurse[ts] + | ^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- -- Error: tests/neg/i13044.scala:50:40 --------------------------------------------------------------------------------- 50 | implicit def typeSchema: Schema[A] = Schema.gen // error // error | ^^^^^^^^^^ | method recurse is declared as `inline`, but was not inlined | | Try increasing `-Xmax-inlines` above 32 - | This location contains code that was inlined from i13044.scala:18 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:18 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +18 | builder :: recurse[ts] + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +18 | builder :: recurse[ts] + | ^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13570.check b/tests/neg/i13570.check index 90e29476b7b1..cf1649b5f4a6 100644 --- a/tests/neg/i13570.check +++ b/tests/neg/i13570.check @@ -6,4 +6,13 @@ | patterns : case s @ _:Seq[Int] if s.isEmpty | case s @ _:Seq[Int] | case _ - | This location contains code that was inlined from i13570.scala:3 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from i13570.scala:3 +3 | inline seq match + | ^ +4 | case s: Seq[Int] if s.isEmpty => println("seq is empty") +5 | case s: Seq[Int] => println("seq is not empty") +6 | case _ => println("somthing hinky happened") + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13991.check b/tests/neg/i13991.check new file mode 100644 index 000000000000..fd092b759c2b --- /dev/null +++ b/tests/neg/i13991.check @@ -0,0 +1,15 @@ +-- Error: tests/neg/i13991.scala:5:7 ----------------------------------------------------------------------------------- + 5 | first[String] // error // before line 10 to test alignment of the error message `|` + | ^^^^^^^^^^^^^ + | no implicit argument of type Foo[String] was found + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from i13991.scala:8 + 8 | compiletime.summonInline[Foo[A]].foo + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13991.scala:8 +11 | second[A] + 42 // after line 10 to test alignment of the error message `|` + | ^^^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13991.scala b/tests/neg/i13991.scala new file mode 100644 index 000000000000..af15891e82d3 --- /dev/null +++ b/tests/neg/i13991.scala @@ -0,0 +1,11 @@ +trait Foo[X]: + def foo: Int + +def foo = + first[String] // error // before line 10 to test alignment of the error message `|` + +inline def second[A]: Int = + compiletime.summonInline[Foo[A]].foo + +inline def first[A]: Int = + second[A] + 42 // after line 10 to test alignment of the error message `|` diff --git a/tests/neg/inline-error-pos.check b/tests/neg/inline-error-pos.check index 121684fe14d6..1d65175c6c39 100644 --- a/tests/neg/inline-error-pos.check +++ b/tests/neg/inline-error-pos.check @@ -4,4 +4,11 @@ | cannot reduce inline match with | scrutinee: 2 : (2 : Int) | patterns : case 1 - | This location contains code that was inlined from inline-error-pos.scala:3 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from inline-error-pos.scala:3 +3 | inline x match + | ^ +4 | case 1 => 9 + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/summonInline.check b/tests/neg/summonInline.check old mode 100755 new mode 100644 index d118299d6dc5..db9b6968ee43 --- a/tests/neg/summonInline.check +++ b/tests/neg/summonInline.check @@ -2,9 +2,21 @@ 19 |val missing1 = summonInlineCheck(1) // error | ^^^^^^^^^^^^^^^^^^^^ | Missing One - | This location contains code that was inlined from summonInline.scala:15 + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from summonInline.scala:15 +15 | case 1 => summonInline[Missing1] + | ^^^^^^^^^^^^^^^^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- -- Error: tests/neg/summonInline.scala:20:32 --------------------------------------------------------------------------- 20 |val missing2 = summonInlineCheck(2) // error | ^^^^^^^^^^^^^^^^^^^^ | Missing Two - | This location contains code that was inlined from summonInline.scala:16 + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from summonInline.scala:16 +16 | case 2 => summonInline[Missing2] + | ^^^^^^^^^^^^^^^^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- From a504e15a616a3d542a1be656183e1ccf7ceb6b7c Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Tue, 1 Feb 2022 19:35:49 +0100 Subject: [PATCH 1127/1244] Keep softness when widening unions --- compiler/src/dotty/tools/dotc/core/Types.scala | 6 +++--- tests/pos/widen-union.scala | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 769defc3e42c..0f7e87213d08 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -3263,10 +3263,10 @@ object Types { if myUnionPeriod != ctx.period then myUnion = if isSoft then - TypeComparer.lub(tp1.widenUnionWithoutNull, tp2.widenUnionWithoutNull, canConstrain = true) match + TypeComparer.lub(tp1.widenUnionWithoutNull, tp2.widenUnionWithoutNull, canConstrain = true, isSoft = isSoft) match case union: OrType => union.join case res => res - else derivedOrType(tp1.widenUnionWithoutNull, tp2.widenUnionWithoutNull) + else derivedOrType(tp1.widenUnionWithoutNull, tp2.widenUnionWithoutNull, soft = isSoft) if !isProvisional then myUnionPeriod = ctx.period myUnion @@ -3282,7 +3282,7 @@ object Types { else tp1.atoms | tp2.atoms val tp1w = tp1.widenSingletons val tp2w = tp2.widenSingletons - myWidened = if ((tp1 eq tp1w) && (tp2 eq tp2w)) this else tp1w | tp2w + myWidened = if ((tp1 eq tp1w) && (tp2 eq tp2w)) this else TypeComparer.lub(tp1w, tp2w, isSoft = isSoft) atomsRunId = ctx.runId override def atoms(using Context): Atoms = diff --git a/tests/pos/widen-union.scala b/tests/pos/widen-union.scala index b0b64f0dc6c6..ec58f3da1941 100644 --- a/tests/pos/widen-union.scala +++ b/tests/pos/widen-union.scala @@ -5,6 +5,11 @@ object Test1: val z: Int | String = y object Test2: + val x: 3 | "a" = 3 + val y = x + val z: Int | String = y + +object Test3: type Sig = Int | String def consistent(x: Sig, y: Sig): Boolean = ???// x == y @@ -12,7 +17,7 @@ object Test2: xs.corresponds(ys)(consistent) // OK || xs.corresponds(ys)(consistent(_, _)) // error, found: Any, required: Int | String -object Test3: +object Test4: def g[X](x: X | String): Int = ??? def y: Boolean | String = ??? From 7e12ed596eeb4c99fedba685e9458bdb791c820a Mon Sep 17 00:00:00 2001 From: Xavientois Date: Wed, 2 Feb 2022 08:53:10 -0500 Subject: [PATCH 1128/1244] Add special case to init checker to always allow certain methods Closes #14275 - Treats mehtods `ne`, `eq`, `isInstanceOf`, and `asInstanceOf` as safe to call, regardless of initialization Signed the CLA - @Xavientois Review by @liufengyun --- .../tools/dotc/transform/init/Semantic.scala | 7 ++++++ .../as-instance-of-cold-field-access.scala | 7 ++++++ tests/init/pos/eq-ne-always-valid.scala | 13 +++++++++++ tests/init/pos/instance-of-always-valid.scala | 22 +++++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 tests/init/neg/as-instance-of-cold-field-access.scala create mode 100644 tests/init/pos/eq-ne-always-valid.scala create mode 100644 tests/init/pos/instance-of-always-valid.scala diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala index 417da68a3380..c1e7d6ab9f2a 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala @@ -596,8 +596,15 @@ object Semantic { && meth.owner.is(Flags.Module) && meth.owner.companionClass.is(Flags.Case) + def isAlwaysSafe(meth: Symbol) = + (meth eq defn.Object_eq) + || (meth eq defn.Object_ne) + || (meth eq defn.Any_isInstanceOf) + // fast track if the current object is already initialized if promoted.isCurrentObjectPromoted then Result(Hot, Nil) + else if isAlwaysSafe(meth) then Result(Hot, Nil) + else if meth eq defn.Any_asInstanceOf then Result(value, Nil) else value match { case Hot => if isSyntheticApply(meth) then diff --git a/tests/init/neg/as-instance-of-cold-field-access.scala b/tests/init/neg/as-instance-of-cold-field-access.scala new file mode 100644 index 000000000000..ec567326b4eb --- /dev/null +++ b/tests/init/neg/as-instance-of-cold-field-access.scala @@ -0,0 +1,7 @@ +final class MyAsInstanceOfClass(o: MyAsInstanceOfClass) { + val other: MyAsInstanceOfClass = { + if (o.asInstanceOf[MyAsInstanceOfClass].oRef ne null) o // error + else new MyAsInstanceOfClass(this) + } + val oRef = o +} diff --git a/tests/init/pos/eq-ne-always-valid.scala b/tests/init/pos/eq-ne-always-valid.scala new file mode 100644 index 000000000000..8f1348e69587 --- /dev/null +++ b/tests/init/pos/eq-ne-always-valid.scala @@ -0,0 +1,13 @@ +final class MyNeClass(o: MyNeClass) { + val other: MyNeClass = { + if (o ne null) o // o is cold, but ne is always valid + else new MyNeClass(this) + } +} + +final class MyEqClass(o: MyEqClass) { + val other: MyEqClass = { + if (o eq null) new MyEqClass(this) // o is cold, but eq is always valid + else o + } +} diff --git a/tests/init/pos/instance-of-always-valid.scala b/tests/init/pos/instance-of-always-valid.scala new file mode 100644 index 000000000000..5f6f71c5335c --- /dev/null +++ b/tests/init/pos/instance-of-always-valid.scala @@ -0,0 +1,22 @@ +final class MyIsInstanceOfClass(o: MyIsInstanceOfClass) { + val other: MyIsInstanceOfClass = { + if (!o.isInstanceOf[Object]) new MyIsInstanceOfClass(this) // o is cold, but isInstanceOf is always valid + else o + } +} + +final class MyAsInstanceOfClass(o: MyAsInstanceOfClass) { + val other: MyAsInstanceOfClass = { + if (o.asInstanceOf[Object] ne null) o // o is cold, but ne and AsInstanceOf is always valid + else new MyAsInstanceOfClass(this) + } +} + +final class MyAsInstanceOfFieldClass(o: MyAsInstanceOfFieldClass) { + val oRef = o + val other: MyAsInstanceOfFieldClass = { + if (this.asInstanceOf[MyAsInstanceOfFieldClass].oRef ne null) oRef // o is cold, but ne and AsInstanceOf is always valid + else new MyAsInstanceOfFieldClass(this) + } +} + From 7262f10fe8b9fd8e3a32787ccf66c79644e5b3fb Mon Sep 17 00:00:00 2001 From: Ruslan Shevchenko Date: Tue, 1 Feb 2022 10:55:05 +0200 Subject: [PATCH 1129/1244] fix #14393 --- library/src/scala/quoted/Quotes.scala | 2 ++ tests/pos-macros/i14393/Macro_1.scala | 20 ++++++++++++++++++++ tests/pos-macros/i14393/Test_2.scala | 11 +++++++++++ 3 files changed, 33 insertions(+) create mode 100644 tests/pos-macros/i14393/Macro_1.scala create mode 100644 tests/pos-macros/i14393/Test_2.scala diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala index 88eecad65485..a9e2db108f40 100644 --- a/library/src/scala/quoted/Quotes.scala +++ b/library/src/scala/quoted/Quotes.scala @@ -4391,6 +4391,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching => foldTree(x, tpt)(owner) case Typed(expr, tpt) => foldTree(foldTree(x, expr)(owner), tpt)(owner) + case TypedOrTest(expr, tpt) => + foldTree(foldTree(x, expr)(owner), tpt)(owner) case NamedArg(_, arg) => foldTree(x, arg)(owner) case Assign(lhs, rhs) => diff --git a/tests/pos-macros/i14393/Macro_1.scala b/tests/pos-macros/i14393/Macro_1.scala new file mode 100644 index 000000000000..16ce1e4d4d72 --- /dev/null +++ b/tests/pos-macros/i14393/Macro_1.scala @@ -0,0 +1,20 @@ +package i14393 +import scala.quoted.* + +object M { + + inline def useFoldTree[X](inline x:X):X = ${ + useFoldTreeImpl('x) + } + + def useFoldTreeImpl[X:Type](x:Expr[X])(using Quotes):Expr[X] = { + import quotes.reflect.* + val search = new TreeAccumulator[Int] { + def foldTree(s:Int, tree: Tree)(owner: Symbol): Int = + foldOverTree(s,tree)(owner) + } + search.foldTree(0,x.asTerm)(Symbol.spliceOwner) + x + } + +} diff --git a/tests/pos-macros/i14393/Test_2.scala b/tests/pos-macros/i14393/Test_2.scala new file mode 100644 index 000000000000..911e82da0424 --- /dev/null +++ b/tests/pos-macros/i14393/Test_2.scala @@ -0,0 +1,11 @@ +package i14393 + +def thing() = + M.useFoldTree { + + Option("") match + case None => + case Some(_) => + ??? + + } From 064e46d8f0c23c6a60a44219f9e4c8f3c8f6c47a Mon Sep 17 00:00:00 2001 From: Alexander Ioffe Date: Sun, 30 Jan 2022 02:36:03 -0500 Subject: [PATCH 1130/1244] Update protoquill to latest build --- community-build/community-projects/protoquill | 2 +- .../src/scala/dotty/communitybuild/projects.scala | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/community-build/community-projects/protoquill b/community-build/community-projects/protoquill index 5ed25aac9440..5f45b0048624 160000 --- a/community-build/community-projects/protoquill +++ b/community-build/community-projects/protoquill @@ -1 +1 @@ -Subproject commit 5ed25aac9440eb0fcca5d9cd828dc85728fee422 +Subproject commit 5f45b00486240c5dcffff563299b989e7169be30 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index f91bf89ca363..a6068241b973 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -714,9 +714,10 @@ object projects: lazy val protoquill = SbtCommunityProject( project = "protoquill", - sbtTestCommand = "test", + extraSbtArgs = List("-Dcommunity=true", "-DcommunityRemote=true", "-Dquill.macro.stdout=true"), + sbtTestCommand = "runCommunityBuild", sbtPublishCommand = "publishLocal", - dependencies = () => List(), // TODO add scalatest and pprint (see protoquill/build.sbt) + dependencies = () => List(scalatest), scalacOptions = List("-language:implicitConversions"), // disabled -Ysafe-init, due to bug in macro ) From 434fc6c7d40bb2d4da7803c2f63ce4751da7380d Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 21 Jan 2022 13:53:03 -0800 Subject: [PATCH 1131/1244] community build: update stdLib213 to current 2.13.x head --- community-build/community-projects/stdLib213 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/stdLib213 b/community-build/community-projects/stdLib213 index 9747730b5dc2..2c742834cf16 160000 --- a/community-build/community-projects/stdLib213 +++ b/community-build/community-projects/stdLib213 @@ -1 +1 @@ -Subproject commit 9747730b5dc2a41e89fbf525637dd8f28a0a088a +Subproject commit 2c742834cf162ab89e914bbc0a8b975874a2c3c2 From 84eb1624f19685f22db52762fb0dddb461b5213f Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Sat, 5 Feb 2022 18:52:25 +0100 Subject: [PATCH 1132/1244] Revert "Show inlined positions with source code" This temporarily reverts commit e523c8d455a0ec13c12551141b80eaed4426f844 to fix the CI, see #14406. --- .../dotc/reporting/MessageRendering.scala | 183 +++++------------- .../dotty/tools/dotc/transform/Splicer.scala | 2 +- .../src/dotty/tools/dotc/typer/Inliner.scala | 2 +- compiler/test-resources/repl/i9227 | 1 + tests/neg-macros/delegate-match-1.check | 1 + tests/neg-macros/delegate-match-2.check | 1 + tests/neg-macros/delegate-match-3.check | 1 + tests/neg-macros/i11386.check | 18 +- tests/neg-macros/i13991.check | 16 -- tests/neg-macros/i13991/Macro_1.scala | 10 - tests/neg-macros/i13991/Test_2.scala | 6 - tests/neg-macros/i6432.check | 3 + tests/neg-macros/i6432b.check | 3 + tests/neg-macros/i6976.check | 8 +- tests/neg-macros/i9014.check | 1 + tests/neg-macros/ill-abort.check | 8 +- .../neg-macros/macro-class-not-found-1.check | 8 +- .../neg-macros/macro-class-not-found-2.check | 8 +- .../neg-macros/macros-in-same-project-6.check | 1 + tests/neg-scalajs/js-enums.check | 6 +- tests/neg/cannot-reduce-inline-match.check | 10 +- tests/neg/i11225.check | 8 +- tests/neg/i13044.check | 166 +++------------- tests/neg/i13570.check | 11 +- tests/neg/i13991.check | 15 -- tests/neg/i13991.scala | 11 -- tests/neg/inline-error-pos.check | 9 +- tests/neg/summonInline.check | 16 +- 28 files changed, 111 insertions(+), 422 deletions(-) delete mode 100644 tests/neg-macros/i13991.check delete mode 100644 tests/neg-macros/i13991/Macro_1.scala delete mode 100644 tests/neg-macros/i13991/Test_2.scala delete mode 100644 tests/neg/i13991.check delete mode 100644 tests/neg/i13991.scala mode change 100644 => 100755 tests/neg/summonInline.check diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala index 1cc98cf75898..f5b566f3ba60 100644 --- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala +++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala @@ -16,8 +16,6 @@ import scala.annotation.switch import scala.collection.mutable trait MessageRendering { - import Highlight.* - import Offsets.* /** Remove ANSI coloring from `str`, useful for getting real length of * strings @@ -27,9 +25,15 @@ trait MessageRendering { def stripColor(str: String): String = str.replaceAll("\u001b\\[.*?m", "") - /** List of all the inline calls that surround the position */ - def inlinePosStack(pos: SourcePosition): List[SourcePosition] = - if pos.outer != null && pos.outer.exists then pos :: inlinePosStack(pos.outer) + /** When inlining a method call, if there's an error we'd like to get the + * outer context and the `pos` at which the call was inlined. + * + * @return a list of strings with inline locations + */ + def outer(pos: SourcePosition, prefix: String)(using Context): List[String] = + if (pos.outer.exists) + i"$prefix| This location contains code that was inlined from $pos" :: + outer(pos.outer, prefix) else Nil /** Get the sourcelines before and after the position, as well as the offset @@ -37,15 +41,15 @@ trait MessageRendering { * * @return (lines before error, lines after error, line numbers offset) */ - private def sourceLines(pos: SourcePosition)(using Context, Level, Offset): (List[String], List[String], Int) = { + def sourceLines(pos: SourcePosition, diagnosticLevel: String)(using Context): (List[String], List[String], Int) = { assert(pos.exists && pos.source.file.exists) var maxLen = Int.MinValue def render(offsetAndLine: (Int, String)): String = { - val (offset1, line) = offsetAndLine - val lineNbr = (pos.source.offsetToLine(offset1) + 1).toString - val prefix = String.format(s"%${offset - 2}s |", lineNbr) + val (offset, line) = offsetAndLine + val lineNbr = pos.source.offsetToLine(offset) + val prefix = s"${lineNbr + 1} |" maxLen = math.max(maxLen, prefix.length) - val lnum = hl(" " * math.max(0, maxLen - prefix.length - 1) + prefix) + val lnum = hl(diagnosticLevel)(" " * math.max(0, maxLen - prefix.length) + prefix) lnum + line.stripLineEnd } @@ -73,75 +77,23 @@ trait MessageRendering { ) } - /** Generate box containing the report title - * - * ``` - * -- Error: source.scala --------------------- - * ``` - */ - private def boxTitle(title: String)(using Context, Level, Offset): String = - val pageWidth = ctx.settings.pageWidth.value - val line = "-" * (pageWidth - title.length - 4) - hl(s"-- $title $line") - - /** The position markers aligned under the error - * - * ``` - * | ^^^^^ - * ``` - */ - private def positionMarker(pos: SourcePosition)(using Context, Level, Offset): String = { + /** The column markers aligned under the error */ + def columnMarker(pos: SourcePosition, offset: Int, diagnosticLevel: String)(using Context): String = { + val prefix = " " * (offset - 1) val padding = pos.startColumnPadding - val carets = + val carets = hl(diagnosticLevel) { if (pos.startLine == pos.endLine) "^" * math.max(1, pos.endColumn - pos.startColumn) else "^" - hl(s"$offsetBox$padding$carets") + } + s"$prefix|$padding$carets" } - /** The horizontal line with the given offset - * - * ``` - * | - * ``` - */ - private def offsetBox(using Context, Level, Offset): String = - val prefix = " " * (offset - 1) - hl(s"$prefix|") - - /** The end of a box section - * - * ``` - * |--------------- - * ``` - * Or if there `soft` is true, - * ``` - * |··············· - * ``` - */ - private def newBox(soft: Boolean = false)(using Context, Level, Offset): String = - val pageWidth = ctx.settings.pageWidth.value - val prefix = " " * (offset - 1) - val line = (if soft then "·" else "-") * (pageWidth - offset) - hl(s"$prefix|$line") - - /** The end of a box section - * - * ``` - * ·---------------- - * ``` - */ - private def endBox(using Context, Level, Offset): String = - val pageWidth = ctx.settings.pageWidth.value - val prefix = " " * (offset - 1) - val line = "-" * (pageWidth - offset) - hl(s"${prefix}·$line") - /** The error message (`msg`) aligned under `pos` * * @return aligned error message */ - private def errorMsg(pos: SourcePosition, msg: String)(using Context, Level, Offset): String = { + def errorMsg(pos: SourcePosition, msg: String, offset: Int)(using Context): String = { val padding = msg.linesIterator.foldLeft(pos.startColumnPadding) { (pad, line) => val lineLength = stripColor(line).length val maxPad = math.max(0, ctx.settings.pageWidth.value - offset - lineLength) - offset @@ -151,12 +103,12 @@ trait MessageRendering { } msg.linesIterator - .map { line => offsetBox + (if line.isEmpty then "" else padding + line) } + .map { line => " " * (offset - 1) + "|" + (if line.isEmpty then "" else padding + line) } .mkString(EOL) } /** The source file path, line and column numbers from the given SourcePosition */ - protected def posFileStr(pos: SourcePosition): String = + def posFileStr(pos: SourcePosition): String = val path = pos.source.file.path if pos.exists then s"$path:${pos.line + 1}:${pos.column}" else path @@ -164,22 +116,22 @@ trait MessageRendering { * * @return separator containing error location and kind */ - private def posStr(pos: SourcePosition, message: Message, diagnosticString: String)(using Context, Level, Offset): String = - if (pos.source != NoSourcePosition.source) hl({ - val realPos = pos.nonInlined - val fileAndPos = posFileStr(realPos) + def posStr(pos: SourcePosition, diagnosticLevel: String, message: Message)(using Context): String = + if (pos.source != NoSourcePosition.source) hl(diagnosticLevel)({ + val fileAndPos = posFileStr(pos.nonInlined) + val file = if fileAndPos.isEmpty || fileAndPos.endsWith(" ") then fileAndPos else s"$fileAndPos " val errId = if (message.errorId ne ErrorMessageID.NoExplanationID) { val errorNumber = message.errorId.errorNumber s"[E${"0" * (3 - errorNumber.toString.length) + errorNumber}] " } else "" val kind = - if (message.kind == "") diagnosticString - else s"${message.kind} $diagnosticString" - val title = - if fileAndPos.isEmpty then s"$errId$kind:" // this happens in dotty.tools.repl.ScriptedTests // TODO add name of source or remove `:` (and update test files) - else s"$errId$kind: $fileAndPos" - boxTitle(title) + if (message.kind == "") diagnosticLevel + else s"${message.kind} $diagnosticLevel" + val prefix = s"-- ${errId}${kind}: $file" + + prefix + + ("-" * math.max(ctx.settings.pageWidth.value - stripColor(prefix).length, 0)) }) else "" /** Explanation rendered under "Explanation" header */ @@ -194,7 +146,7 @@ trait MessageRendering { sb.toString } - private def appendFilterHelp(dia: Diagnostic, sb: mutable.StringBuilder): Unit = + def appendFilterHelp(dia: Diagnostic, sb: mutable.StringBuilder): Unit = import dia._ val hasId = msg.errorId.errorNumber >= 0 val category = dia match { @@ -214,34 +166,17 @@ trait MessageRendering { /** The whole message rendered from `msg` */ def messageAndPos(dia: Diagnostic)(using Context): String = { import dia._ - val pos1 = pos.nonInlined - val inlineStack = inlinePosStack(pos).filter(_ != pos1) - val maxLineNumber = - if pos.exists then (pos1 :: inlineStack).map(_.endLine).max + 1 - else 0 - given Level = Level(level) - given Offset = Offset(maxLineNumber.toString.length + 2) + val levelString = diagnosticLevel(dia) val sb = mutable.StringBuilder() - val posString = posStr(pos, msg, diagnosticLevel(dia)) + val posString = posStr(pos, levelString, msg) if (posString.nonEmpty) sb.append(posString).append(EOL) if (pos.exists) { val pos1 = pos.nonInlined if (pos1.exists && pos1.source.file.exists) { - val (srcBefore, srcAfter, offset) = sourceLines(pos1) - val marker = positionMarker(pos1) - val err = errorMsg(pos1, msg.message) - sb.append((srcBefore ::: marker :: err :: srcAfter).mkString(EOL)) - - if inlineStack.nonEmpty then - sb.append(EOL).append(newBox()) - sb.append(EOL).append(offsetBox).append(i"Inline stack trace") - for inlinedPos <- inlineStack if inlinedPos != pos1 do - val (srcBefore, srcAfter, offset) = sourceLines(inlinedPos) - val marker = positionMarker(inlinedPos) - sb.append(EOL).append(newBox(soft = true)) - sb.append(EOL).append(offsetBox).append(i"This location contains code that was inlined from $pos") - sb.append(EOL).append((srcBefore ::: marker :: srcAfter).mkString(EOL)) - sb.append(EOL).append(endBox) + val (srcBefore, srcAfter, offset) = sourceLines(pos1, levelString) + val marker = columnMarker(pos1, offset, levelString) + val err = errorMsg(pos1, msg.message, offset) + sb.append((srcBefore ::: marker :: err :: outer(pos, " " * (offset - 1)) ::: srcAfter).mkString(EOL)) } else sb.append(msg.message) } @@ -251,13 +186,15 @@ trait MessageRendering { sb.toString } - private def hl(str: String)(using Context, Level): String = - summon[Level].value match - case interfaces.Diagnostic.ERROR => Red(str).show - case interfaces.Diagnostic.WARNING => Yellow(str).show - case interfaces.Diagnostic.INFO => Blue(str).show + def hl(diagnosticLevel: String)(str: String)(using Context): String = diagnosticLevel match { + case "Info" => Blue(str).show + case "Error" => Red(str).show + case _ => + assert(diagnosticLevel.contains("Warning")) + Yellow(str).show + } - private def diagnosticLevel(dia: Diagnostic): String = + def diagnosticLevel(dia: Diagnostic): String = dia match { case dia: FeatureWarning => "Feature Warning" case dia: DeprecationWarning => "Deprecation Warning" @@ -268,28 +205,4 @@ trait MessageRendering { case interfaces.Diagnostic.WARNING => "Warning" case interfaces.Diagnostic.INFO => "Info" } - -} - -private object Highlight { - opaque type Level = Int - extension (level: Level) def value: Int = level - object Level: - def apply(level: Int): Level = level -} - -/** Size of the left offset added by the box - * - * ``` - * -- Error: ... ------------ - * 4 | foo - * | ^^^ - * ^^^ // size of this offset - * ``` - */ -private object Offsets { - opaque type Offset = Int - def offset(using o: Offset): Int = o - object Offset: - def apply(level: Int): Offset = level } diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala index dcd5b8d8c4b5..49b6f5564620 100644 --- a/compiler/src/dotty/tools/dotc/transform/Splicer.scala +++ b/compiler/src/dotty/tools/dotc/transform/Splicer.scala @@ -49,7 +49,7 @@ object Splicer { val oldContextClassLoader = Thread.currentThread().getContextClassLoader Thread.currentThread().setContextClassLoader(classLoader) try { - val interpreter = new Interpreter(splicePos, classLoader) + val interpreter = new Interpreter(spliceExpansionPos, classLoader) // Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree val interpretedExpr = interpreter.interpret[Quotes => scala.quoted.Expr[Any]](tree) diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index c99ccbd24428..722e3abfec85 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -853,7 +853,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { evidence.tpe match case fail: Implicits.SearchFailureType => val msg = evTyper.missingArgMsg(evidence, tpt.tpe, "") - errorTree(call, em"$msg") + errorTree(tpt, em"$msg") case _ => evidence return searchImplicit(callTypeArgs.head) diff --git a/compiler/test-resources/repl/i9227 b/compiler/test-resources/repl/i9227 index 40f9248898a2..45d1731dae39 100644 --- a/compiler/test-resources/repl/i9227 +++ b/compiler/test-resources/repl/i9227 @@ -3,4 +3,5 @@ scala> import scala.quoted._; inline def myMacro[T]: Unit = ${ myMacroImpl[T] }; 1 | import scala.quoted._; inline def myMacro[T]: Unit = ${ myMacroImpl[T] }; def myMacroImpl[T](using Quotes): Expr[Unit] = '{}; println(myMacro[Int]) | ^^^^^^^^^^^^ | Cannot call macro method myMacroImpl defined in the same source file + | This location contains code that was inlined from rs$line$1:1 1 error found diff --git a/tests/neg-macros/delegate-match-1.check b/tests/neg-macros/delegate-match-1.check index 93b20beba183..6d88d021416f 100644 --- a/tests/neg-macros/delegate-match-1.check +++ b/tests/neg-macros/delegate-match-1.check @@ -4,3 +4,4 @@ | ^ | AmbiguousImplicits | both value a1 in class Test1 and value a2 in class Test1 match type A + | This location contains code that was inlined from Test_2.scala:6 diff --git a/tests/neg-macros/delegate-match-2.check b/tests/neg-macros/delegate-match-2.check index e26742452b5b..112e5ee00474 100644 --- a/tests/neg-macros/delegate-match-2.check +++ b/tests/neg-macros/delegate-match-2.check @@ -4,3 +4,4 @@ | ^ | DivergingImplicit | method a1 in class Test produces a diverging implicit search when trying to match type A + | This location contains code that was inlined from Test_2.scala:5 diff --git a/tests/neg-macros/delegate-match-3.check b/tests/neg-macros/delegate-match-3.check index 2b6fda278fda..278aa92a4117 100644 --- a/tests/neg-macros/delegate-match-3.check +++ b/tests/neg-macros/delegate-match-3.check @@ -4,3 +4,4 @@ | ^ | NoMatchingImplicits | no implicit values were found that match type A + | This location contains code that was inlined from Test_2.scala:3 diff --git a/tests/neg-macros/i11386.check b/tests/neg-macros/i11386.check index 1cce199159a5..0377ca6389db 100644 --- a/tests/neg-macros/i11386.check +++ b/tests/neg-macros/i11386.check @@ -3,21 +3,11 @@ 6 | dummy(0) // error | ^ | test - |--------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |····················································································································· - |This location contains code that was inlined from Test_2.scala:6 -7 | notNull(i) - | ^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from Test_2.scala:6 + | This location contains code that was inlined from Macro_1.scala:7 -- Error: tests/neg-macros/i11386/Test_2.scala:8:20 -------------------------------------------------------------------- 8 | dummy(int2String(0)) // error | ^^^^^^^^^^^^^ | test - |--------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |····················································································································· - |This location contains code that was inlined from Test_2.scala:8 -7 | notNull(i) - | ^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from Test_2.scala:8 + | This location contains code that was inlined from Macro_1.scala:7 diff --git a/tests/neg-macros/i13991.check b/tests/neg-macros/i13991.check deleted file mode 100644 index 15f45af227e5..000000000000 --- a/tests/neg-macros/i13991.check +++ /dev/null @@ -1,16 +0,0 @@ - --- Error: tests/neg-macros/i13991/Test_2.scala:6:5 --------------------------------------------------------------------- -6 | v2 // error - | ^^ - | Error - |--------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |····················································································································· - |This location contains code that was inlined from Test_2.scala:3 -3 | inline def v2 = InlineMac.sample("foo") - | ^^^^^ - |····················································································································· - |This location contains code that was inlined from Test_2.scala:3 -3 | inline def v2 = InlineMac.sample("foo") - | ^^^^^^^^^^^^^^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/i13991/Macro_1.scala b/tests/neg-macros/i13991/Macro_1.scala deleted file mode 100644 index 76cfa93cdde5..000000000000 --- a/tests/neg-macros/i13991/Macro_1.scala +++ /dev/null @@ -1,10 +0,0 @@ -import scala.quoted.* - -object InlineMac: - - inline def sample(inline expr: String): Int = - ${ sampleImpl('expr) } - - def sampleImpl(expr: Expr[String])(using Quotes): Expr[Int] = - import quotes.reflect.* - report.errorAndAbort("Error", expr) diff --git a/tests/neg-macros/i13991/Test_2.scala b/tests/neg-macros/i13991/Test_2.scala deleted file mode 100644 index 572ad324b129..000000000000 --- a/tests/neg-macros/i13991/Test_2.scala +++ /dev/null @@ -1,6 +0,0 @@ -object Main: - def main(args: Array[String]): Unit = - inline def v2 = InlineMac.sample("foo") - inline def v1 = v2 - - v2 // error diff --git a/tests/neg-macros/i6432.check b/tests/neg-macros/i6432.check index 2ea6f3ba0300..0e01f99be404 100644 --- a/tests/neg-macros/i6432.check +++ b/tests/neg-macros/i6432.check @@ -3,11 +3,14 @@ 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error | ^^^ | abc + | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432/Test_2.scala:4:17 --------------------------------------------------------------------- 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error | ^^^ | xyz + | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432/Test_2.scala:4:28 --------------------------------------------------------------------- 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error | ^^^ | fgh + | This location contains code that was inlined from Test_2.scala:4 diff --git a/tests/neg-macros/i6432b.check b/tests/neg-macros/i6432b.check index 395d089c92e9..4dd1be84fa3c 100644 --- a/tests/neg-macros/i6432b.check +++ b/tests/neg-macros/i6432b.check @@ -3,11 +3,14 @@ 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error | ^^^ | abc + | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432b/Test_2.scala:4:19 -------------------------------------------------------------------- 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error | ^^^ | xyz + | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432b/Test_2.scala:4:30 -------------------------------------------------------------------- 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error | ^^^ | fgh + | This location contains code that was inlined from Test_2.scala:4 diff --git a/tests/neg-macros/i6976.check b/tests/neg-macros/i6976.check index b67f05960a79..2057e55550b4 100644 --- a/tests/neg-macros/i6976.check +++ b/tests/neg-macros/i6976.check @@ -6,10 +6,4 @@ | scala.MatchError: Inlined(EmptyTree,List(),Literal(Constant(2))) (of class dotty.tools.dotc.ast.Trees$Inlined) | at playground.macros$.mcrImpl(Macro_1.scala:10) | - |--------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |····················································································································· - |This location contains code that was inlined from Macro_1.scala:6 -6 | inline def mcr(x: => Any) = ${mcrImpl('x)} - | ^^^^^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from Test_2.scala:5 diff --git a/tests/neg-macros/i9014.check b/tests/neg-macros/i9014.check index c0d08a42ef2a..509eac067fc8 100644 --- a/tests/neg-macros/i9014.check +++ b/tests/neg-macros/i9014.check @@ -3,3 +3,4 @@ 1 |val tests = summon[Bar] // error | ^ | Failed to expand! + | This location contains code that was inlined from Test_2.scala:1 diff --git a/tests/neg-macros/ill-abort.check b/tests/neg-macros/ill-abort.check index 2aa9d3396e53..25d7654b1b69 100644 --- a/tests/neg-macros/ill-abort.check +++ b/tests/neg-macros/ill-abort.check @@ -3,10 +3,4 @@ 1 |def test = fail() // error | ^^^^^^ |Macro expansion was aborted by the macro without any errors reported. Macros should issue errors to end-users to facilitate debugging when aborting a macro expansion. - |--------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |····················································································································· - |This location contains code that was inlined from quoted_1.scala:3 -3 |inline def fail(): Unit = ${ impl } - | ^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from quoted_1.scala:3 diff --git a/tests/neg-macros/macro-class-not-found-1.check b/tests/neg-macros/macro-class-not-found-1.check index 08ba5b99f0b8..445523c6ade2 100644 --- a/tests/neg-macros/macro-class-not-found-1.check +++ b/tests/neg-macros/macro-class-not-found-1.check @@ -5,10 +5,4 @@ | java.lang.NoClassDefFoundError | at Foo$.aMacroImplementation(Foo.scala:8) | - |--------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |····················································································································· - |This location contains code that was inlined from Foo.scala:5 -5 | inline def myMacro(): Unit = ${ aMacroImplementation } - | ^^^^^^^^^^^^^^^^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from Bar.scala:4 diff --git a/tests/neg-macros/macro-class-not-found-2.check b/tests/neg-macros/macro-class-not-found-2.check index d4ed8f222ba0..3cb7506e6bb2 100644 --- a/tests/neg-macros/macro-class-not-found-2.check +++ b/tests/neg-macros/macro-class-not-found-2.check @@ -5,10 +5,4 @@ | java.lang.NoClassDefFoundError: this.is.not.a.Class | at Foo$.aMacroImplementation(Foo.scala:8) | - |--------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |····················································································································· - |This location contains code that was inlined from Foo.scala:5 -5 | inline def myMacro(): Unit = ${ aMacroImplementation } - | ^^^^^^^^^^^^^^^^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from Bar.scala:4 diff --git a/tests/neg-macros/macros-in-same-project-6.check b/tests/neg-macros/macros-in-same-project-6.check index 17f696508259..485f5062db92 100644 --- a/tests/neg-macros/macros-in-same-project-6.check +++ b/tests/neg-macros/macros-in-same-project-6.check @@ -2,3 +2,4 @@ 4 | Foo.myMacro() // error | ^^^^^^^^^^^^^ | some error + | This location contains code that was inlined from Bar.scala:4 diff --git a/tests/neg-scalajs/js-enums.check b/tests/neg-scalajs/js-enums.check index e54b2a5af2da..eb358f16e57a 100644 --- a/tests/neg-scalajs/js-enums.check +++ b/tests/neg-scalajs/js-enums.check @@ -4,9 +4,9 @@ |MyEnum extends scala.reflect.Enum which does not extend js.Any. 5 | case Foo -- Error: tests/neg-scalajs/js-enums.scala:9:5 ------------------------------------------------------------------------- - 7 |@js.native - 8 |@JSGlobal - 9 |enum MyEnumNative extends js.Object: // error +7 |@js.native +8 |@JSGlobal +9 |enum MyEnumNative extends js.Object: // error |^ |MyEnumNative extends scala.reflect.Enum which does not extend js.Any. 10 | case Bar diff --git a/tests/neg/cannot-reduce-inline-match.check b/tests/neg/cannot-reduce-inline-match.check index e35066949333..ceca40a74cbd 100644 --- a/tests/neg/cannot-reduce-inline-match.check +++ b/tests/neg/cannot-reduce-inline-match.check @@ -4,12 +4,4 @@ | cannot reduce inline match with | scrutinee: "f" : ("f" : String) | patterns : case _:Int - |--------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |····················································································································· - |This location contains code that was inlined from cannot-reduce-inline-match.scala:3 -3 | inline x match { - | ^ -4 | case _: Int => -5 | } - ·--------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from cannot-reduce-inline-match.scala:3 diff --git a/tests/neg/i11225.check b/tests/neg/i11225.check index 0aa5f720e24b..60805a27b22d 100644 --- a/tests/neg/i11225.check +++ b/tests/neg/i11225.check @@ -42,10 +42,4 @@ 30 | var x7: Int = uni // error | ^^^ | `uninitialized` can only be used as the right hand side of a mutable field definition - |-------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |···················································································································· - |This location contains code that was inlined from i11225.scala:25 -25 | transparent inline def uni = uninitialized - | ^^^^^^^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from i11225.scala:25 diff --git a/tests/neg/i13044.check b/tests/neg/i13044.check index b3e278792148..87b8a1fe9ae2 100644 --- a/tests/neg/i13044.check +++ b/tests/neg/i13044.check @@ -4,143 +4,41 @@ | given instance gen is declared as `inline`, but was not inlined | | Try increasing `-Xmax-inlines` above 32 - |-------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] - | ^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -31 | lazy val fields = recurse[m.MirroredElemTypes] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -37 | inline given gen[A]: Schema[A] = derived - | ^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] - | ^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -31 | lazy val fields = recurse[m.MirroredElemTypes] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -37 | inline given gen[A]: Schema[A] = derived - | ^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] - | ^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -31 | lazy val fields = recurse[m.MirroredElemTypes] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -37 | inline given gen[A]: Schema[A] = derived - | ^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] - | ^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -31 | lazy val fields = recurse[m.MirroredElemTypes] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -37 | inline given gen[A]: Schema[A] = derived - | ^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] - | ^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -18 | builder :: recurse[ts] - | ^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -31 | lazy val fields = recurse[m.MirroredElemTypes] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:17 -37 | inline given gen[A]: Schema[A] = derived - | ^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:18 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 -- Error: tests/neg/i13044.scala:50:40 --------------------------------------------------------------------------------- 50 | implicit def typeSchema: Schema[A] = Schema.gen // error // error | ^^^^^^^^^^ | method recurse is declared as `inline`, but was not inlined | | Try increasing `-Xmax-inlines` above 32 - |-------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -18 | builder :: recurse[ts] - | ^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -31 | lazy val fields = recurse[m.MirroredElemTypes] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -37 | inline given gen[A]: Schema[A] = derived - | ^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] - | ^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -31 | lazy val fields = recurse[m.MirroredElemTypes] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -37 | inline given gen[A]: Schema[A] = derived - | ^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] - | ^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -31 | lazy val fields = recurse[m.MirroredElemTypes] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -37 | inline given gen[A]: Schema[A] = derived - | ^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] - | ^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -31 | lazy val fields = recurse[m.MirroredElemTypes] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -37 | inline given gen[A]: Schema[A] = derived - | ^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] - | ^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -18 | builder :: recurse[ts] - | ^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -31 | lazy val fields = recurse[m.MirroredElemTypes] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13044.scala:18 -37 | inline given gen[A]: Schema[A] = derived - | ^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from i13044.scala:18 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 + | This location contains code that was inlined from i13044.scala:17 + | This location contains code that was inlined from i13044.scala:18 + | This location contains code that was inlined from i13044.scala:31 + | This location contains code that was inlined from i13044.scala:37 diff --git a/tests/neg/i13570.check b/tests/neg/i13570.check index cf1649b5f4a6..90e29476b7b1 100644 --- a/tests/neg/i13570.check +++ b/tests/neg/i13570.check @@ -6,13 +6,4 @@ | patterns : case s @ _:Seq[Int] if s.isEmpty | case s @ _:Seq[Int] | case _ - |--------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |····················································································································· - |This location contains code that was inlined from i13570.scala:3 -3 | inline seq match - | ^ -4 | case s: Seq[Int] if s.isEmpty => println("seq is empty") -5 | case s: Seq[Int] => println("seq is not empty") -6 | case _ => println("somthing hinky happened") - ·--------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from i13570.scala:3 diff --git a/tests/neg/i13991.check b/tests/neg/i13991.check deleted file mode 100644 index fd092b759c2b..000000000000 --- a/tests/neg/i13991.check +++ /dev/null @@ -1,15 +0,0 @@ --- Error: tests/neg/i13991.scala:5:7 ----------------------------------------------------------------------------------- - 5 | first[String] // error // before line 10 to test alignment of the error message `|` - | ^^^^^^^^^^^^^ - | no implicit argument of type Foo[String] was found - |-------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |···················································································································· - |This location contains code that was inlined from i13991.scala:8 - 8 | compiletime.summonInline[Foo[A]].foo - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· - |This location contains code that was inlined from i13991.scala:8 -11 | second[A] + 42 // after line 10 to test alignment of the error message `|` - | ^^^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13991.scala b/tests/neg/i13991.scala deleted file mode 100644 index af15891e82d3..000000000000 --- a/tests/neg/i13991.scala +++ /dev/null @@ -1,11 +0,0 @@ -trait Foo[X]: - def foo: Int - -def foo = - first[String] // error // before line 10 to test alignment of the error message `|` - -inline def second[A]: Int = - compiletime.summonInline[Foo[A]].foo - -inline def first[A]: Int = - second[A] + 42 // after line 10 to test alignment of the error message `|` diff --git a/tests/neg/inline-error-pos.check b/tests/neg/inline-error-pos.check index 1d65175c6c39..121684fe14d6 100644 --- a/tests/neg/inline-error-pos.check +++ b/tests/neg/inline-error-pos.check @@ -4,11 +4,4 @@ | cannot reduce inline match with | scrutinee: 2 : (2 : Int) | patterns : case 1 - |--------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |····················································································································· - |This location contains code that was inlined from inline-error-pos.scala:3 -3 | inline x match - | ^ -4 | case 1 => 9 - ·--------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from inline-error-pos.scala:3 diff --git a/tests/neg/summonInline.check b/tests/neg/summonInline.check old mode 100644 new mode 100755 index db9b6968ee43..d118299d6dc5 --- a/tests/neg/summonInline.check +++ b/tests/neg/summonInline.check @@ -2,21 +2,9 @@ 19 |val missing1 = summonInlineCheck(1) // error | ^^^^^^^^^^^^^^^^^^^^ | Missing One - |-------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |···················································································································· - |This location contains code that was inlined from summonInline.scala:15 -15 | case 1 => summonInline[Missing1] - | ^^^^^^^^^^^^^^^^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from summonInline.scala:15 -- Error: tests/neg/summonInline.scala:20:32 --------------------------------------------------------------------------- 20 |val missing2 = summonInlineCheck(2) // error | ^^^^^^^^^^^^^^^^^^^^ | Missing Two - |-------------------------------------------------------------------------------------------------------------------- - |Inline stack trace - |···················································································································· - |This location contains code that was inlined from summonInline.scala:16 -16 | case 2 => summonInline[Missing2] - | ^^^^^^^^^^^^^^^^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + | This location contains code that was inlined from summonInline.scala:16 From d020b9f449318fef9fb11916bc096607f148ae07 Mon Sep 17 00:00:00 2001 From: Kacper Korban Date: Fri, 28 Jan 2022 13:36:11 +0100 Subject: [PATCH 1133/1244] Scaladoc: Unescaped special characters in Quotes documentation closes #13746 --- scaladoc-testcases/src/tests/markdowncode.scala | 5 +++++ .../src/dotty/tools/scaladoc/renderers/DocRenderer.scala | 2 +- .../signatures/TranslatableSignaturesTestCases.scala | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 scaladoc-testcases/src/tests/markdowncode.scala diff --git a/scaladoc-testcases/src/tests/markdowncode.scala b/scaladoc-testcases/src/tests/markdowncode.scala new file mode 100644 index 000000000000..ac8238b7f0f6 --- /dev/null +++ b/scaladoc-testcases/src/tests/markdowncode.scala @@ -0,0 +1,5 @@ +package tests.markdowncode + +/** Some text `{ ; }` */ +val aVal: Float + = 1.2f diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala index 19e7e8a86995..a2c653208a83 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala @@ -86,7 +86,7 @@ class DocRender(signatureRenderer: SignatureRenderer)(using DocContext): case Subscript(text) => span(cls:="subscript")(renderElement(text)) // TODO implement style case Link(target, body) => renderLink(target, default => body.fold[TagArg](default)(renderElement)) - case Text(text) => raw(text) + case Text(text) => raw(text.escapeReservedTokens) case Summary(text) => renderElement(text) case HtmlTag(content) => raw(content) diff --git a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala index e56b741f5fee..699aff7b6cf6 100644 --- a/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala +++ b/scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala @@ -92,3 +92,5 @@ class FBoundedTypeParameters extends SignatureTest("fboundedTypeParameters", Sig class Exports extends SignatureTest("exports2", SignatureTest.all, sourceFiles = List("exports1", "exports2")) class ContextFunctions extends SignatureTest("contextfunctions", SignatureTest.all) + +class MarkdownCode extends SignatureTest("markdowncode", SignatureTest.all) From 2d8e4a513bd3b95a62cc3b48215be6fe9b83069f Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 4 Feb 2022 09:41:39 +0100 Subject: [PATCH 1134/1244] Add draft as regression tests Draft higher order quoted expressions. --- .../neg/higher-order-quoted-expressions.scala | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 tests/neg/higher-order-quoted-expressions.scala diff --git a/tests/neg/higher-order-quoted-expressions.scala b/tests/neg/higher-order-quoted-expressions.scala new file mode 100644 index 000000000000..440a364a0803 --- /dev/null +++ b/tests/neg/higher-order-quoted-expressions.scala @@ -0,0 +1,44 @@ +// Draft of higher order expressions +// --------------------------------- +// A higher order expression is a an expression that may contain unbound variables. +// Unbound variables are listed as arguments of the type lambda of the expression. +// Splicing can only be done on Expr[_ <: Any]. +// `apply methods on higher order expression provide a way to replace the unbound variables. + +// This can be used for HOAS quoted patterns to not return a lambda. +// The use would be the same as each higher order expression would have an apply method. +// But as it would be an expression, the expression would showable. +// The expression could also be directly transformed into a Term of the reflection API. + +// Question: How to extend this to allow unbound type (Type) in the expression? + +class Expr[+T <: AnyKind] +object Expr: + extension [T, R](hoe: Expr[[_ >: T <: T] =>> R]) def apply(x1: Expr[T]): Expr[R] = ??? + extension [T1, T2, R](hoe: Expr[[_ >: T1 <: T1, _ >: T2 <: T2] =>> R]) def apply(x1: Expr[T1], x2: Expr[T2]): Expr[R] = ??? + // Are lower bounds in lambda parameters necessary? + // How could this be generalized to n arguments? + + +def `'`[T](e: T): Expr[T] = ??? +def `$`[T](e: Expr[T]): T = ??? + +def f(): Unit = + val e: Expr[Int] = ??? + val hoe1: Expr[[T >: Int <: Int] =>> Int] = ??? // assumed to come from HOAS pattern with one unbound variable of type Int + val hoe2: Expr[[T1 >: Int <: Int, T2 >: Int <: Int] =>> Int] = ??? // assumed to come from HOAS pattern with 2 unbound variables of type Int + val e2: Expr[Int] = hoe1(e) + val e3: Expr[Int] = hoe2(e, e) + + { + `$`{e} + `$`{e2} + `$`{e3} + `$`{hoe1(e)} + `$`{hoe2(e, e)} + `$`{hoe1} // error: Found: Expr[[T >: Int <: Int] =>> Int]), Required: Expr[Any] // may contain references to 1 unbound variable + `$`{hoe2} // error // may contain references to 2 unbound variables + } + `'`{1} + `'`{`$`{e}} + `'`{??? : ([T >: Int <: Int] =>> Int)} // error: Missing type parameter for [T >: Int <: Int] =>> Int // not a valid quote literal expression From bf18a57e0708d08d1bc5452c31d1500af750e8b1 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 4 Feb 2022 16:46:01 +0100 Subject: [PATCH 1135/1244] Update higher-order-quoted-expressions.scala --- tests/neg/higher-order-quoted-expressions.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/neg/higher-order-quoted-expressions.scala b/tests/neg/higher-order-quoted-expressions.scala index 440a364a0803..a5d137ff8fc5 100644 --- a/tests/neg/higher-order-quoted-expressions.scala +++ b/tests/neg/higher-order-quoted-expressions.scala @@ -5,7 +5,7 @@ // Splicing can only be done on Expr[_ <: Any]. // `apply methods on higher order expression provide a way to replace the unbound variables. -// This can be used for HOAS quoted patterns to not return a lambda. +// This can be used for HOAS quoted patterns to not return a lambda (see HOAS patterns section in https://infoscience.epfl.ch/record/288718?ln=en). // The use would be the same as each higher order expression would have an apply method. // But as it would be an expression, the expression would showable. // The expression could also be directly transformed into a Term of the reflection API. From d39dbcf44162ac623b91923be15b1da6f4d1a765 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 7 Feb 2022 11:04:25 +0000 Subject: [PATCH 1136/1244] Fix invariant quote type holes --- .../src/scala/quoted/runtime/impl/QuotesImpl.scala | 5 +++-- tests/pos-macros/i12343/Macro.scala | 13 +++++++++++++ tests/pos-macros/i12343/Test.scala | 7 +++++++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 tests/pos-macros/i12343/Macro.scala create mode 100644 tests/pos-macros/i12343/Test.scala diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala index ae3067a894d7..000f84199c27 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala @@ -3056,8 +3056,9 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler // that we have found, seal them in a quoted.Type and add them to the result def typeHoleApproximation(sym: Symbol) = val fromAboveAnnot = sym.hasAnnotation(dotc.core.Symbols.defn.QuotedRuntimePatterns_fromAboveAnnot) - val approx = ctx1.gadt.approximation(sym, !fromAboveAnnot) - reflect.TypeReprMethods.asType(approx) + val fullBounds = ctx1.gadt.fullBounds(sym) + val tp = if fromAboveAnnot then fullBounds.hi else fullBounds.lo + reflect.TypeReprMethods.asType(tp) matchings.map { tup => Tuple.fromIArray(typeHoles.map(typeHoleApproximation).toArray.asInstanceOf[IArray[Object]]) ++ tup } diff --git a/tests/pos-macros/i12343/Macro.scala b/tests/pos-macros/i12343/Macro.scala new file mode 100644 index 000000000000..03642dd1f4af --- /dev/null +++ b/tests/pos-macros/i12343/Macro.scala @@ -0,0 +1,13 @@ +package test + +import scala.quoted.* + +object Macro: + def covImpl(arg: Expr[Any])(using Quotes): Expr[Any] = arg match // Covariant (List) + case '{ $h : List[h] } => '{ $h : List[h] } + + def invImpl(arg: Expr[Any])(using Quotes): Expr[Any] = arg match // Invariant (Set) + case '{ $h : Set[h] } => '{ $h : Set[h] } + + transparent inline def cov(inline arg: Any): Any = ${ covImpl('arg) } + transparent inline def inv(inline arg: Any): Any = ${ invImpl('arg) } diff --git a/tests/pos-macros/i12343/Test.scala b/tests/pos-macros/i12343/Test.scala new file mode 100644 index 000000000000..ef23a9c16725 --- /dev/null +++ b/tests/pos-macros/i12343/Test.scala @@ -0,0 +1,7 @@ +package test + +object Test: + val cov1: List[Boolean] = Macro.cov(List(true)) + val inv1: Set[Boolean] = Macro.inv(Set(true)) + def cov2[X](a: List[X]): List[X] = Macro.cov(a) + def inv2[X](a: Set[X]): Set[X] = Macro.inv(a) // doesn't compile; Set[Nothing] is inferred From a9891377b08e0c435ceb2ef62d2f74dc07aeb32b Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 7 Feb 2022 16:58:02 +0100 Subject: [PATCH 1137/1244] Revert "Revert "Show inlined positions with source code"" This reverts commit 4bcd23b0ba8ae7cfa79b8a12bd462246abaa0857. --- .../dotc/reporting/MessageRendering.scala | 183 +++++++++++++----- .../dotty/tools/dotc/transform/Splicer.scala | 2 +- .../src/dotty/tools/dotc/typer/Inliner.scala | 2 +- compiler/test-resources/repl/i9227 | 1 - tests/neg-macros/delegate-match-1.check | 1 - tests/neg-macros/delegate-match-2.check | 1 - tests/neg-macros/delegate-match-3.check | 1 - tests/neg-macros/i11386.check | 18 +- tests/neg-macros/i13991.check | 16 ++ tests/neg-macros/i13991/Macro_1.scala | 10 + tests/neg-macros/i13991/Test_2.scala | 6 + tests/neg-macros/i6432.check | 3 - tests/neg-macros/i6432b.check | 3 - tests/neg-macros/i6976.check | 8 +- tests/neg-macros/i9014.check | 1 - tests/neg-macros/ill-abort.check | 8 +- .../neg-macros/macro-class-not-found-1.check | 8 +- .../neg-macros/macro-class-not-found-2.check | 8 +- .../neg-macros/macros-in-same-project-6.check | 1 - tests/neg-scalajs/js-enums.check | 6 +- tests/neg/cannot-reduce-inline-match.check | 10 +- tests/neg/i11225.check | 8 +- tests/neg/i13044.check | 166 +++++++++++++--- tests/neg/i13570.check | 11 +- tests/neg/i13991.check | 15 ++ tests/neg/i13991.scala | 11 ++ tests/neg/inline-error-pos.check | 9 +- tests/neg/summonInline.check | 16 +- 28 files changed, 422 insertions(+), 111 deletions(-) create mode 100644 tests/neg-macros/i13991.check create mode 100644 tests/neg-macros/i13991/Macro_1.scala create mode 100644 tests/neg-macros/i13991/Test_2.scala create mode 100644 tests/neg/i13991.check create mode 100644 tests/neg/i13991.scala mode change 100755 => 100644 tests/neg/summonInline.check diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala index f5b566f3ba60..1cc98cf75898 100644 --- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala +++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala @@ -16,6 +16,8 @@ import scala.annotation.switch import scala.collection.mutable trait MessageRendering { + import Highlight.* + import Offsets.* /** Remove ANSI coloring from `str`, useful for getting real length of * strings @@ -25,15 +27,9 @@ trait MessageRendering { def stripColor(str: String): String = str.replaceAll("\u001b\\[.*?m", "") - /** When inlining a method call, if there's an error we'd like to get the - * outer context and the `pos` at which the call was inlined. - * - * @return a list of strings with inline locations - */ - def outer(pos: SourcePosition, prefix: String)(using Context): List[String] = - if (pos.outer.exists) - i"$prefix| This location contains code that was inlined from $pos" :: - outer(pos.outer, prefix) + /** List of all the inline calls that surround the position */ + def inlinePosStack(pos: SourcePosition): List[SourcePosition] = + if pos.outer != null && pos.outer.exists then pos :: inlinePosStack(pos.outer) else Nil /** Get the sourcelines before and after the position, as well as the offset @@ -41,15 +37,15 @@ trait MessageRendering { * * @return (lines before error, lines after error, line numbers offset) */ - def sourceLines(pos: SourcePosition, diagnosticLevel: String)(using Context): (List[String], List[String], Int) = { + private def sourceLines(pos: SourcePosition)(using Context, Level, Offset): (List[String], List[String], Int) = { assert(pos.exists && pos.source.file.exists) var maxLen = Int.MinValue def render(offsetAndLine: (Int, String)): String = { - val (offset, line) = offsetAndLine - val lineNbr = pos.source.offsetToLine(offset) - val prefix = s"${lineNbr + 1} |" + val (offset1, line) = offsetAndLine + val lineNbr = (pos.source.offsetToLine(offset1) + 1).toString + val prefix = String.format(s"%${offset - 2}s |", lineNbr) maxLen = math.max(maxLen, prefix.length) - val lnum = hl(diagnosticLevel)(" " * math.max(0, maxLen - prefix.length) + prefix) + val lnum = hl(" " * math.max(0, maxLen - prefix.length - 1) + prefix) lnum + line.stripLineEnd } @@ -77,23 +73,75 @@ trait MessageRendering { ) } - /** The column markers aligned under the error */ - def columnMarker(pos: SourcePosition, offset: Int, diagnosticLevel: String)(using Context): String = { - val prefix = " " * (offset - 1) + /** Generate box containing the report title + * + * ``` + * -- Error: source.scala --------------------- + * ``` + */ + private def boxTitle(title: String)(using Context, Level, Offset): String = + val pageWidth = ctx.settings.pageWidth.value + val line = "-" * (pageWidth - title.length - 4) + hl(s"-- $title $line") + + /** The position markers aligned under the error + * + * ``` + * | ^^^^^ + * ``` + */ + private def positionMarker(pos: SourcePosition)(using Context, Level, Offset): String = { val padding = pos.startColumnPadding - val carets = hl(diagnosticLevel) { + val carets = if (pos.startLine == pos.endLine) "^" * math.max(1, pos.endColumn - pos.startColumn) else "^" - } - s"$prefix|$padding$carets" + hl(s"$offsetBox$padding$carets") } + /** The horizontal line with the given offset + * + * ``` + * | + * ``` + */ + private def offsetBox(using Context, Level, Offset): String = + val prefix = " " * (offset - 1) + hl(s"$prefix|") + + /** The end of a box section + * + * ``` + * |--------------- + * ``` + * Or if there `soft` is true, + * ``` + * |··············· + * ``` + */ + private def newBox(soft: Boolean = false)(using Context, Level, Offset): String = + val pageWidth = ctx.settings.pageWidth.value + val prefix = " " * (offset - 1) + val line = (if soft then "·" else "-") * (pageWidth - offset) + hl(s"$prefix|$line") + + /** The end of a box section + * + * ``` + * ·---------------- + * ``` + */ + private def endBox(using Context, Level, Offset): String = + val pageWidth = ctx.settings.pageWidth.value + val prefix = " " * (offset - 1) + val line = "-" * (pageWidth - offset) + hl(s"${prefix}·$line") + /** The error message (`msg`) aligned under `pos` * * @return aligned error message */ - def errorMsg(pos: SourcePosition, msg: String, offset: Int)(using Context): String = { + private def errorMsg(pos: SourcePosition, msg: String)(using Context, Level, Offset): String = { val padding = msg.linesIterator.foldLeft(pos.startColumnPadding) { (pad, line) => val lineLength = stripColor(line).length val maxPad = math.max(0, ctx.settings.pageWidth.value - offset - lineLength) - offset @@ -103,12 +151,12 @@ trait MessageRendering { } msg.linesIterator - .map { line => " " * (offset - 1) + "|" + (if line.isEmpty then "" else padding + line) } + .map { line => offsetBox + (if line.isEmpty then "" else padding + line) } .mkString(EOL) } /** The source file path, line and column numbers from the given SourcePosition */ - def posFileStr(pos: SourcePosition): String = + protected def posFileStr(pos: SourcePosition): String = val path = pos.source.file.path if pos.exists then s"$path:${pos.line + 1}:${pos.column}" else path @@ -116,22 +164,22 @@ trait MessageRendering { * * @return separator containing error location and kind */ - def posStr(pos: SourcePosition, diagnosticLevel: String, message: Message)(using Context): String = - if (pos.source != NoSourcePosition.source) hl(diagnosticLevel)({ - val fileAndPos = posFileStr(pos.nonInlined) - val file = if fileAndPos.isEmpty || fileAndPos.endsWith(" ") then fileAndPos else s"$fileAndPos " + private def posStr(pos: SourcePosition, message: Message, diagnosticString: String)(using Context, Level, Offset): String = + if (pos.source != NoSourcePosition.source) hl({ + val realPos = pos.nonInlined + val fileAndPos = posFileStr(realPos) val errId = if (message.errorId ne ErrorMessageID.NoExplanationID) { val errorNumber = message.errorId.errorNumber s"[E${"0" * (3 - errorNumber.toString.length) + errorNumber}] " } else "" val kind = - if (message.kind == "") diagnosticLevel - else s"${message.kind} $diagnosticLevel" - val prefix = s"-- ${errId}${kind}: $file" - - prefix + - ("-" * math.max(ctx.settings.pageWidth.value - stripColor(prefix).length, 0)) + if (message.kind == "") diagnosticString + else s"${message.kind} $diagnosticString" + val title = + if fileAndPos.isEmpty then s"$errId$kind:" // this happens in dotty.tools.repl.ScriptedTests // TODO add name of source or remove `:` (and update test files) + else s"$errId$kind: $fileAndPos" + boxTitle(title) }) else "" /** Explanation rendered under "Explanation" header */ @@ -146,7 +194,7 @@ trait MessageRendering { sb.toString } - def appendFilterHelp(dia: Diagnostic, sb: mutable.StringBuilder): Unit = + private def appendFilterHelp(dia: Diagnostic, sb: mutable.StringBuilder): Unit = import dia._ val hasId = msg.errorId.errorNumber >= 0 val category = dia match { @@ -166,17 +214,34 @@ trait MessageRendering { /** The whole message rendered from `msg` */ def messageAndPos(dia: Diagnostic)(using Context): String = { import dia._ - val levelString = diagnosticLevel(dia) + val pos1 = pos.nonInlined + val inlineStack = inlinePosStack(pos).filter(_ != pos1) + val maxLineNumber = + if pos.exists then (pos1 :: inlineStack).map(_.endLine).max + 1 + else 0 + given Level = Level(level) + given Offset = Offset(maxLineNumber.toString.length + 2) val sb = mutable.StringBuilder() - val posString = posStr(pos, levelString, msg) + val posString = posStr(pos, msg, diagnosticLevel(dia)) if (posString.nonEmpty) sb.append(posString).append(EOL) if (pos.exists) { val pos1 = pos.nonInlined if (pos1.exists && pos1.source.file.exists) { - val (srcBefore, srcAfter, offset) = sourceLines(pos1, levelString) - val marker = columnMarker(pos1, offset, levelString) - val err = errorMsg(pos1, msg.message, offset) - sb.append((srcBefore ::: marker :: err :: outer(pos, " " * (offset - 1)) ::: srcAfter).mkString(EOL)) + val (srcBefore, srcAfter, offset) = sourceLines(pos1) + val marker = positionMarker(pos1) + val err = errorMsg(pos1, msg.message) + sb.append((srcBefore ::: marker :: err :: srcAfter).mkString(EOL)) + + if inlineStack.nonEmpty then + sb.append(EOL).append(newBox()) + sb.append(EOL).append(offsetBox).append(i"Inline stack trace") + for inlinedPos <- inlineStack if inlinedPos != pos1 do + val (srcBefore, srcAfter, offset) = sourceLines(inlinedPos) + val marker = positionMarker(inlinedPos) + sb.append(EOL).append(newBox(soft = true)) + sb.append(EOL).append(offsetBox).append(i"This location contains code that was inlined from $pos") + sb.append(EOL).append((srcBefore ::: marker :: srcAfter).mkString(EOL)) + sb.append(EOL).append(endBox) } else sb.append(msg.message) } @@ -186,15 +251,13 @@ trait MessageRendering { sb.toString } - def hl(diagnosticLevel: String)(str: String)(using Context): String = diagnosticLevel match { - case "Info" => Blue(str).show - case "Error" => Red(str).show - case _ => - assert(diagnosticLevel.contains("Warning")) - Yellow(str).show - } + private def hl(str: String)(using Context, Level): String = + summon[Level].value match + case interfaces.Diagnostic.ERROR => Red(str).show + case interfaces.Diagnostic.WARNING => Yellow(str).show + case interfaces.Diagnostic.INFO => Blue(str).show - def diagnosticLevel(dia: Diagnostic): String = + private def diagnosticLevel(dia: Diagnostic): String = dia match { case dia: FeatureWarning => "Feature Warning" case dia: DeprecationWarning => "Deprecation Warning" @@ -205,4 +268,28 @@ trait MessageRendering { case interfaces.Diagnostic.WARNING => "Warning" case interfaces.Diagnostic.INFO => "Info" } + +} + +private object Highlight { + opaque type Level = Int + extension (level: Level) def value: Int = level + object Level: + def apply(level: Int): Level = level +} + +/** Size of the left offset added by the box + * + * ``` + * -- Error: ... ------------ + * 4 | foo + * | ^^^ + * ^^^ // size of this offset + * ``` + */ +private object Offsets { + opaque type Offset = Int + def offset(using o: Offset): Int = o + object Offset: + def apply(level: Int): Offset = level } diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala index 49b6f5564620..dcd5b8d8c4b5 100644 --- a/compiler/src/dotty/tools/dotc/transform/Splicer.scala +++ b/compiler/src/dotty/tools/dotc/transform/Splicer.scala @@ -49,7 +49,7 @@ object Splicer { val oldContextClassLoader = Thread.currentThread().getContextClassLoader Thread.currentThread().setContextClassLoader(classLoader) try { - val interpreter = new Interpreter(spliceExpansionPos, classLoader) + val interpreter = new Interpreter(splicePos, classLoader) // Some parts of the macro are evaluated during the unpickling performed in quotedExprToTree val interpretedExpr = interpreter.interpret[Quotes => scala.quoted.Expr[Any]](tree) diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index 722e3abfec85..c99ccbd24428 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -853,7 +853,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { evidence.tpe match case fail: Implicits.SearchFailureType => val msg = evTyper.missingArgMsg(evidence, tpt.tpe, "") - errorTree(tpt, em"$msg") + errorTree(call, em"$msg") case _ => evidence return searchImplicit(callTypeArgs.head) diff --git a/compiler/test-resources/repl/i9227 b/compiler/test-resources/repl/i9227 index 45d1731dae39..40f9248898a2 100644 --- a/compiler/test-resources/repl/i9227 +++ b/compiler/test-resources/repl/i9227 @@ -3,5 +3,4 @@ scala> import scala.quoted._; inline def myMacro[T]: Unit = ${ myMacroImpl[T] }; 1 | import scala.quoted._; inline def myMacro[T]: Unit = ${ myMacroImpl[T] }; def myMacroImpl[T](using Quotes): Expr[Unit] = '{}; println(myMacro[Int]) | ^^^^^^^^^^^^ | Cannot call macro method myMacroImpl defined in the same source file - | This location contains code that was inlined from rs$line$1:1 1 error found diff --git a/tests/neg-macros/delegate-match-1.check b/tests/neg-macros/delegate-match-1.check index 6d88d021416f..93b20beba183 100644 --- a/tests/neg-macros/delegate-match-1.check +++ b/tests/neg-macros/delegate-match-1.check @@ -4,4 +4,3 @@ | ^ | AmbiguousImplicits | both value a1 in class Test1 and value a2 in class Test1 match type A - | This location contains code that was inlined from Test_2.scala:6 diff --git a/tests/neg-macros/delegate-match-2.check b/tests/neg-macros/delegate-match-2.check index 112e5ee00474..e26742452b5b 100644 --- a/tests/neg-macros/delegate-match-2.check +++ b/tests/neg-macros/delegate-match-2.check @@ -4,4 +4,3 @@ | ^ | DivergingImplicit | method a1 in class Test produces a diverging implicit search when trying to match type A - | This location contains code that was inlined from Test_2.scala:5 diff --git a/tests/neg-macros/delegate-match-3.check b/tests/neg-macros/delegate-match-3.check index 278aa92a4117..2b6fda278fda 100644 --- a/tests/neg-macros/delegate-match-3.check +++ b/tests/neg-macros/delegate-match-3.check @@ -4,4 +4,3 @@ | ^ | NoMatchingImplicits | no implicit values were found that match type A - | This location contains code that was inlined from Test_2.scala:3 diff --git a/tests/neg-macros/i11386.check b/tests/neg-macros/i11386.check index 0377ca6389db..1cce199159a5 100644 --- a/tests/neg-macros/i11386.check +++ b/tests/neg-macros/i11386.check @@ -3,11 +3,21 @@ 6 | dummy(0) // error | ^ | test - | This location contains code that was inlined from Test_2.scala:6 - | This location contains code that was inlined from Macro_1.scala:7 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Test_2.scala:6 +7 | notNull(i) + | ^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- -- Error: tests/neg-macros/i11386/Test_2.scala:8:20 -------------------------------------------------------------------- 8 | dummy(int2String(0)) // error | ^^^^^^^^^^^^^ | test - | This location contains code that was inlined from Test_2.scala:8 - | This location contains code that was inlined from Macro_1.scala:7 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Test_2.scala:8 +7 | notNull(i) + | ^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/i13991.check b/tests/neg-macros/i13991.check new file mode 100644 index 000000000000..15f45af227e5 --- /dev/null +++ b/tests/neg-macros/i13991.check @@ -0,0 +1,16 @@ + +-- Error: tests/neg-macros/i13991/Test_2.scala:6:5 --------------------------------------------------------------------- +6 | v2 // error + | ^^ + | Error + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Test_2.scala:3 +3 | inline def v2 = InlineMac.sample("foo") + | ^^^^^ + |····················································································································· + |This location contains code that was inlined from Test_2.scala:3 +3 | inline def v2 = InlineMac.sample("foo") + | ^^^^^^^^^^^^^^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/i13991/Macro_1.scala b/tests/neg-macros/i13991/Macro_1.scala new file mode 100644 index 000000000000..76cfa93cdde5 --- /dev/null +++ b/tests/neg-macros/i13991/Macro_1.scala @@ -0,0 +1,10 @@ +import scala.quoted.* + +object InlineMac: + + inline def sample(inline expr: String): Int = + ${ sampleImpl('expr) } + + def sampleImpl(expr: Expr[String])(using Quotes): Expr[Int] = + import quotes.reflect.* + report.errorAndAbort("Error", expr) diff --git a/tests/neg-macros/i13991/Test_2.scala b/tests/neg-macros/i13991/Test_2.scala new file mode 100644 index 000000000000..572ad324b129 --- /dev/null +++ b/tests/neg-macros/i13991/Test_2.scala @@ -0,0 +1,6 @@ +object Main: + def main(args: Array[String]): Unit = + inline def v2 = InlineMac.sample("foo") + inline def v1 = v2 + + v2 // error diff --git a/tests/neg-macros/i6432.check b/tests/neg-macros/i6432.check index 0e01f99be404..2ea6f3ba0300 100644 --- a/tests/neg-macros/i6432.check +++ b/tests/neg-macros/i6432.check @@ -3,14 +3,11 @@ 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error | ^^^ | abc - | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432/Test_2.scala:4:17 --------------------------------------------------------------------- 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error | ^^^ | xyz - | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432/Test_2.scala:4:28 --------------------------------------------------------------------- 4 | foo"abc${"123"}xyz${"456"}fgh" // error // error // error | ^^^ | fgh - | This location contains code that was inlined from Test_2.scala:4 diff --git a/tests/neg-macros/i6432b.check b/tests/neg-macros/i6432b.check index 4dd1be84fa3c..395d089c92e9 100644 --- a/tests/neg-macros/i6432b.check +++ b/tests/neg-macros/i6432b.check @@ -3,14 +3,11 @@ 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error | ^^^ | abc - | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432b/Test_2.scala:4:19 -------------------------------------------------------------------- 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error | ^^^ | xyz - | This location contains code that was inlined from Test_2.scala:4 -- Error: tests/neg-macros/i6432b/Test_2.scala:4:30 -------------------------------------------------------------------- 4 | foo"""abc${"123"}xyz${"456"}fgh""" // error // error // error | ^^^ | fgh - | This location contains code that was inlined from Test_2.scala:4 diff --git a/tests/neg-macros/i6976.check b/tests/neg-macros/i6976.check index 2057e55550b4..b67f05960a79 100644 --- a/tests/neg-macros/i6976.check +++ b/tests/neg-macros/i6976.check @@ -6,4 +6,10 @@ | scala.MatchError: Inlined(EmptyTree,List(),Literal(Constant(2))) (of class dotty.tools.dotc.ast.Trees$Inlined) | at playground.macros$.mcrImpl(Macro_1.scala:10) | - | This location contains code that was inlined from Test_2.scala:5 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Macro_1.scala:6 +6 | inline def mcr(x: => Any) = ${mcrImpl('x)} + | ^^^^^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/i9014.check b/tests/neg-macros/i9014.check index 509eac067fc8..c0d08a42ef2a 100644 --- a/tests/neg-macros/i9014.check +++ b/tests/neg-macros/i9014.check @@ -3,4 +3,3 @@ 1 |val tests = summon[Bar] // error | ^ | Failed to expand! - | This location contains code that was inlined from Test_2.scala:1 diff --git a/tests/neg-macros/ill-abort.check b/tests/neg-macros/ill-abort.check index 25d7654b1b69..2aa9d3396e53 100644 --- a/tests/neg-macros/ill-abort.check +++ b/tests/neg-macros/ill-abort.check @@ -3,4 +3,10 @@ 1 |def test = fail() // error | ^^^^^^ |Macro expansion was aborted by the macro without any errors reported. Macros should issue errors to end-users to facilitate debugging when aborting a macro expansion. - | This location contains code that was inlined from quoted_1.scala:3 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from quoted_1.scala:3 +3 |inline def fail(): Unit = ${ impl } + | ^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/macro-class-not-found-1.check b/tests/neg-macros/macro-class-not-found-1.check index 445523c6ade2..08ba5b99f0b8 100644 --- a/tests/neg-macros/macro-class-not-found-1.check +++ b/tests/neg-macros/macro-class-not-found-1.check @@ -5,4 +5,10 @@ | java.lang.NoClassDefFoundError | at Foo$.aMacroImplementation(Foo.scala:8) | - | This location contains code that was inlined from Bar.scala:4 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Foo.scala:5 +5 | inline def myMacro(): Unit = ${ aMacroImplementation } + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/macro-class-not-found-2.check b/tests/neg-macros/macro-class-not-found-2.check index 3cb7506e6bb2..d4ed8f222ba0 100644 --- a/tests/neg-macros/macro-class-not-found-2.check +++ b/tests/neg-macros/macro-class-not-found-2.check @@ -5,4 +5,10 @@ | java.lang.NoClassDefFoundError: this.is.not.a.Class | at Foo$.aMacroImplementation(Foo.scala:8) | - | This location contains code that was inlined from Bar.scala:4 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from Foo.scala:5 +5 | inline def myMacro(): Unit = ${ aMacroImplementation } + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/macros-in-same-project-6.check b/tests/neg-macros/macros-in-same-project-6.check index 485f5062db92..17f696508259 100644 --- a/tests/neg-macros/macros-in-same-project-6.check +++ b/tests/neg-macros/macros-in-same-project-6.check @@ -2,4 +2,3 @@ 4 | Foo.myMacro() // error | ^^^^^^^^^^^^^ | some error - | This location contains code that was inlined from Bar.scala:4 diff --git a/tests/neg-scalajs/js-enums.check b/tests/neg-scalajs/js-enums.check index eb358f16e57a..e54b2a5af2da 100644 --- a/tests/neg-scalajs/js-enums.check +++ b/tests/neg-scalajs/js-enums.check @@ -4,9 +4,9 @@ |MyEnum extends scala.reflect.Enum which does not extend js.Any. 5 | case Foo -- Error: tests/neg-scalajs/js-enums.scala:9:5 ------------------------------------------------------------------------- -7 |@js.native -8 |@JSGlobal -9 |enum MyEnumNative extends js.Object: // error + 7 |@js.native + 8 |@JSGlobal + 9 |enum MyEnumNative extends js.Object: // error |^ |MyEnumNative extends scala.reflect.Enum which does not extend js.Any. 10 | case Bar diff --git a/tests/neg/cannot-reduce-inline-match.check b/tests/neg/cannot-reduce-inline-match.check index ceca40a74cbd..e35066949333 100644 --- a/tests/neg/cannot-reduce-inline-match.check +++ b/tests/neg/cannot-reduce-inline-match.check @@ -4,4 +4,12 @@ | cannot reduce inline match with | scrutinee: "f" : ("f" : String) | patterns : case _:Int - | This location contains code that was inlined from cannot-reduce-inline-match.scala:3 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from cannot-reduce-inline-match.scala:3 +3 | inline x match { + | ^ +4 | case _: Int => +5 | } + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i11225.check b/tests/neg/i11225.check index 60805a27b22d..0aa5f720e24b 100644 --- a/tests/neg/i11225.check +++ b/tests/neg/i11225.check @@ -42,4 +42,10 @@ 30 | var x7: Int = uni // error | ^^^ | `uninitialized` can only be used as the right hand side of a mutable field definition - | This location contains code that was inlined from i11225.scala:25 + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from i11225.scala:25 +25 | transparent inline def uni = uninitialized + | ^^^^^^^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13044.check b/tests/neg/i13044.check index 87b8a1fe9ae2..b3e278792148 100644 --- a/tests/neg/i13044.check +++ b/tests/neg/i13044.check @@ -4,41 +4,143 @@ | given instance gen is declared as `inline`, but was not inlined | | Try increasing `-Xmax-inlines` above 32 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:18 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +18 | builder :: recurse[ts] + | ^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:17 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- -- Error: tests/neg/i13044.scala:50:40 --------------------------------------------------------------------------------- 50 | implicit def typeSchema: Schema[A] = Schema.gen // error // error | ^^^^^^^^^^ | method recurse is declared as `inline`, but was not inlined | | Try increasing `-Xmax-inlines` above 32 - | This location contains code that was inlined from i13044.scala:18 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 - | This location contains code that was inlined from i13044.scala:17 - | This location contains code that was inlined from i13044.scala:18 - | This location contains code that was inlined from i13044.scala:31 - | This location contains code that was inlined from i13044.scala:37 + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +18 | builder :: recurse[ts] + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] + | ^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +18 | builder :: recurse[ts] + | ^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +31 | lazy val fields = recurse[m.MirroredElemTypes] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13044.scala:18 +37 | inline given gen[A]: Schema[A] = derived + | ^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13570.check b/tests/neg/i13570.check index 90e29476b7b1..cf1649b5f4a6 100644 --- a/tests/neg/i13570.check +++ b/tests/neg/i13570.check @@ -6,4 +6,13 @@ | patterns : case s @ _:Seq[Int] if s.isEmpty | case s @ _:Seq[Int] | case _ - | This location contains code that was inlined from i13570.scala:3 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from i13570.scala:3 +3 | inline seq match + | ^ +4 | case s: Seq[Int] if s.isEmpty => println("seq is empty") +5 | case s: Seq[Int] => println("seq is not empty") +6 | case _ => println("somthing hinky happened") + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13991.check b/tests/neg/i13991.check new file mode 100644 index 000000000000..fd092b759c2b --- /dev/null +++ b/tests/neg/i13991.check @@ -0,0 +1,15 @@ +-- Error: tests/neg/i13991.scala:5:7 ----------------------------------------------------------------------------------- + 5 | first[String] // error // before line 10 to test alignment of the error message `|` + | ^^^^^^^^^^^^^ + | no implicit argument of type Foo[String] was found + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from i13991.scala:8 + 8 | compiletime.summonInline[Foo[A]].foo + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |···················································································································· + |This location contains code that was inlined from i13991.scala:8 +11 | second[A] + 42 // after line 10 to test alignment of the error message `|` + | ^^^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13991.scala b/tests/neg/i13991.scala new file mode 100644 index 000000000000..af15891e82d3 --- /dev/null +++ b/tests/neg/i13991.scala @@ -0,0 +1,11 @@ +trait Foo[X]: + def foo: Int + +def foo = + first[String] // error // before line 10 to test alignment of the error message `|` + +inline def second[A]: Int = + compiletime.summonInline[Foo[A]].foo + +inline def first[A]: Int = + second[A] + 42 // after line 10 to test alignment of the error message `|` diff --git a/tests/neg/inline-error-pos.check b/tests/neg/inline-error-pos.check index 121684fe14d6..1d65175c6c39 100644 --- a/tests/neg/inline-error-pos.check +++ b/tests/neg/inline-error-pos.check @@ -4,4 +4,11 @@ | cannot reduce inline match with | scrutinee: 2 : (2 : Int) | patterns : case 1 - | This location contains code that was inlined from inline-error-pos.scala:3 + |--------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |····················································································································· + |This location contains code that was inlined from inline-error-pos.scala:3 +3 | inline x match + | ^ +4 | case 1 => 9 + ·--------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/summonInline.check b/tests/neg/summonInline.check old mode 100755 new mode 100644 index d118299d6dc5..db9b6968ee43 --- a/tests/neg/summonInline.check +++ b/tests/neg/summonInline.check @@ -2,9 +2,21 @@ 19 |val missing1 = summonInlineCheck(1) // error | ^^^^^^^^^^^^^^^^^^^^ | Missing One - | This location contains code that was inlined from summonInline.scala:15 + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from summonInline.scala:15 +15 | case 1 => summonInline[Missing1] + | ^^^^^^^^^^^^^^^^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- -- Error: tests/neg/summonInline.scala:20:32 --------------------------------------------------------------------------- 20 |val missing2 = summonInlineCheck(2) // error | ^^^^^^^^^^^^^^^^^^^^ | Missing Two - | This location contains code that was inlined from summonInline.scala:16 + |-------------------------------------------------------------------------------------------------------------------- + |Inline stack trace + |···················································································································· + |This location contains code that was inlined from summonInline.scala:16 +16 | case 2 => summonInline[Missing2] + | ^^^^^^^^^^^^^^^^^^^^^^ + ·-------------------------------------------------------------------------------------------------------------------- From 2316fc36be561e04aa49eed288361978d8859b49 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 7 Feb 2022 17:19:25 +0100 Subject: [PATCH 1138/1244] Check if source exists for inline positions --- .../src/dotty/tools/dotc/reporting/MessageRendering.scala | 7 ++++--- project/scripts/cmdTests | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala index 1cc98cf75898..b8f2d763fc83 100644 --- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala +++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala @@ -236,11 +236,12 @@ trait MessageRendering { sb.append(EOL).append(newBox()) sb.append(EOL).append(offsetBox).append(i"Inline stack trace") for inlinedPos <- inlineStack if inlinedPos != pos1 do - val (srcBefore, srcAfter, offset) = sourceLines(inlinedPos) - val marker = positionMarker(inlinedPos) sb.append(EOL).append(newBox(soft = true)) sb.append(EOL).append(offsetBox).append(i"This location contains code that was inlined from $pos") - sb.append(EOL).append((srcBefore ::: marker :: srcAfter).mkString(EOL)) + if inlinedPos.source.file.exists then + val (srcBefore, srcAfter, _) = sourceLines(inlinedPos) + val marker = positionMarker(inlinedPos) + sb.append(EOL).append((srcBefore ::: marker :: srcAfter).mkString(EOL)) sb.append(EOL).append(endBox) } else sb.append(msg.message) diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index 659b2808ed07..7eee1439a3a8 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -56,6 +56,7 @@ cp tests/neg/i6371/B_2.scala $OUT/B.scala "$SBT" "scalac $OUT/A.scala -d $OUT1" rm $OUT/A.scala "$SBT" "scalac -classpath $OUT1 -d $OUT1 $OUT/B.scala" > "$tmp" 2>&1 || echo "ok" +cat "$tmp" # for debugging grep -qe "B.scala:2:7" "$tmp" grep -qe "This location contains code that was inlined from A.scala:3" "$tmp" From 03abdedb7105197ca275ad916f784e243955192d Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 7 Feb 2022 17:26:43 +0100 Subject: [PATCH 1139/1244] Re-enable missing cmdTests It might have been disabled by mistake because bootstrapCmdTests was assumed to be the set of tests for the bootstrapped compiler. The second is an extension for the second with tests that can only be run on the bootstrapped compiler. It is now renamed to bootstrappedOnlyCmdTests to make sure we avoid this potential confusion. Fixes #14428 --- .github/workflows/ci.yaml | 6 ++++-- .../scripts/{bootstrapCmdTests => bootstrappedOnlyCmdTests} | 0 tests/pos/i12973.scala | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) rename project/scripts/{bootstrapCmdTests => bootstrappedOnlyCmdTests} (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2847bfd578b9..d9da3baee124 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -112,7 +112,8 @@ jobs: - name: Cmd Tests run: | ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test" - ./project/scripts/bootstrapCmdTests + ./project/scripts/cmdTests + ./project/scripts/bootstrappedOnlyCmdTests - name: MiMa run: | @@ -447,7 +448,8 @@ jobs: - name: Test run: | ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test;sjsCompilerTests/test ;sbt-test/scripted scala2-compat/* ;configureIDE ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test" - ./project/scripts/bootstrapCmdTests + ./project/scripts/cmdTests + ./project/scripts/bootstrappedOnlyCmdTests publish_nightly: runs-on: [self-hosted, Linux] diff --git a/project/scripts/bootstrapCmdTests b/project/scripts/bootstrappedOnlyCmdTests similarity index 100% rename from project/scripts/bootstrapCmdTests rename to project/scripts/bootstrappedOnlyCmdTests diff --git a/tests/pos/i12973.scala b/tests/pos/i12973.scala index 9cda7dbc120b..53c6476d798e 100644 --- a/tests/pos/i12973.scala +++ b/tests/pos/i12973.scala @@ -1,4 +1,4 @@ -// Compiled and placed on the REPL classpath in the bootstrapCmdTests script +// Compiled and placed on the REPL classpath in the bootstrappedOnlyCmdTests script // to test that launching the REPL with `scala -cp ` works (issue #12973) case class Bug12973(): def check = s"$productPrefix is fixed" From ebafbeff22d84d68f5e429bd3d56f391edf55519 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 8 Feb 2022 13:53:13 +0100 Subject: [PATCH 1140/1244] Comment out debug code --- project/scripts/cmdTests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/scripts/cmdTests b/project/scripts/cmdTests index 7eee1439a3a8..6a175db23e99 100755 --- a/project/scripts/cmdTests +++ b/project/scripts/cmdTests @@ -33,7 +33,7 @@ echo "testing that paths SourceFile annotations are relativized" clear_out "$OUT" "$SBT" "scalac -d $OUT/out.jar -sourceroot tests/pos $(pwd)/tests/pos/i10430/lib.scala $(pwd)/tests/pos/i10430/app.scala" "$SBT" "scalac -print-tasty -color:never $OUT/out.jar" > "$tmp" -cat "$tmp" # for debugging +# cat "$tmp" # for debugging grep -q ": i10430/lib.scala" "$tmp" grep -q ": i10430/app.scala" "$tmp" grep -q "[i10430/lib.scala]" "$tmp" From 43d9e10dfb36600127662cecda1b1c97def431ca Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Sat, 20 Mar 2021 15:50:13 -0700 Subject: [PATCH 1141/1244] Port Scala 2 f-interpolator --- .../dotty/tools/dotc/parsing/Scanners.scala | 2 +- .../tools/dotc/printing/PlainPrinter.scala | 2 +- .../transform/localopt/FormatChecker.scala | 247 ++++++++++++++++++ .../FormatInterpolatorTransform.scala | 195 ++++++++++++++ .../localopt/StringContextChecker.scala | 26 +- .../localopt/StringInterpolatorOpt.scala | 12 +- .../runtime/impl/printers/SourceCode.scala | 2 +- .../dotc/transform/FormatCheckerTest.scala | 82 ++++++ tests/neg/f-interpolator-tests.scala | 11 + tests/neg/fEscapes.check | 4 + tests/neg/fEscapes.scala | 5 + tests/run-macros/f-interpolator-tests.scala | 205 +++++++++++++++ tests/run/t6476.check | 13 +- tests/run/t6476.scala | 10 +- 14 files changed, 786 insertions(+), 30 deletions(-) create mode 100644 compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala create mode 100644 compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala create mode 100644 compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala create mode 100644 tests/neg/f-interpolator-tests.scala create mode 100644 tests/neg/fEscapes.check create mode 100644 tests/neg/fEscapes.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index 1a2f3cd3d86a..c2c13e899ef4 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -1251,7 +1251,7 @@ object Scanners { nextChar() } } - val alt = if oct == LF then raw"\n" else f"\u$oct%04x" + val alt = if oct == LF then raw"\n" else f"${"\\"}u$oct%04x" error(s"octal escape literals are unsupported: use $alt instead", start) putChar(oct.toChar) } diff --git a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala index d2efbeff2901..197a2e6ded9c 100644 --- a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -542,7 +542,7 @@ class PlainPrinter(_ctx: Context) extends Printer { case '"' => "\\\"" case '\'' => "\\\'" case '\\' => "\\\\" - case _ => if (ch.isControl) f"\u${ch.toInt}%04x" else String.valueOf(ch) + case _ => if (ch.isControl) f"${"\\"}u${ch.toInt}%04x" else String.valueOf(ch) } def toText(const: Constant): Text = const.tag match { diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala new file mode 100644 index 000000000000..1cbd73db2ba0 --- /dev/null +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala @@ -0,0 +1,247 @@ +package dotty.tools.dotc +package transform.localopt + +import scala.annotation.tailrec +import scala.collection.mutable.{ListBuffer, Stack} +import scala.reflect.{ClassTag, classTag} +import scala.util.chaining.* +import scala.util.matching.Regex.Match + +import java.util.{Calendar, Date, Formattable} + +import StringContextChecker.InterpolationReporter + +/** Formatter string checker. */ +abstract class FormatChecker(using reporter: InterpolationReporter): + + // Pick the first runtime type which the i'th arg can satisfy. + // If conversion is required, implementation must emit it. + def argType(argi: Int, types: ClassTag[?]*): ClassTag[?] + + // count of args, for checking indexes + def argc: Int + + val allFlags = "-#+ 0,(<" + val formatPattern = """%(?:(\d+)\$)?([-#+ 0,(<]+)?(\d+)?(\.\d+)?([tT]?[%a-zA-Z])?""".r + + // ordinal is the regex group index in the format pattern + enum SpecGroup: + case Spec, Index, Flags, Width, Precision, CC + import SpecGroup.* + + /** For N part strings and N-1 args to interpolate, normalize parts and check arg types. + * + * Returns parts, possibly updated with explicit leading "%s", + * and conversions for each arg. + * + * Implementation must emit conversions required by invocations of `argType`. + */ + def checked(parts0: List[String]): (List[String], List[Conversion]) = + val amended = ListBuffer.empty[String] + val convert = ListBuffer.empty[Conversion] + + @tailrec + def loop(parts: List[String], n: Int): Unit = + parts match + case part0 :: more => + def badPart(t: Throwable): String = "".tap(_ => reporter.partError(t.getMessage, index = n, offset = 0)) + val part = try StringContext.processEscapes(part0) catch badPart + val matches = formatPattern.findAllMatchIn(part) + + def insertStringConversion(): Unit = + amended += "%s" + part + convert += Conversion(formatPattern.findAllMatchIn("%s").next(), n) // improve + argType(n-1, classTag[Any]) + def errorLeading(op: Conversion) = op.errorAt(Spec)(s"conversions must follow a splice; ${Conversion.literalHelp}") + def accept(op: Conversion): Unit = + if !op.isLeading then errorLeading(op) + op.accepts(argType(n-1, op.acceptableVariants*)) + amended += part + convert += op + + // after the first part, a leading specifier is required for the interpolated arg; %s is supplied if needed + if n == 0 then amended += part + else if !matches.hasNext then insertStringConversion() + else + val cv = Conversion(matches.next(), n) + if cv.isLiteral then insertStringConversion() + else if cv.isIndexed then + if cv.index.getOrElse(-1) == n then accept(cv) + else + // either some other arg num, or '<' + //c.warning(op.groupPos(Index), "Index is not this arg") + insertStringConversion() + else if !cv.isError then accept(cv) + + // any remaining conversions in this part must be either literals or indexed + while matches.hasNext do + val cv = Conversion(matches.next(), n) + if n == 0 && cv.hasFlag('<') then cv.badFlag('<', "No last arg") + else if !cv.isLiteral && !cv.isIndexed then errorLeading(cv) + + loop(more, n + 1) + case Nil => () + end loop + + loop(parts0, n = 0) + (amended.toList, convert.toList) + end checked + + extension (descriptor: Match) + def at(g: SpecGroup): Int = descriptor.start(g.ordinal) + def offset(g: SpecGroup, i: Int = 0): Int = at(g) + i + def group(g: SpecGroup): Option[String] = Option(descriptor.group(g.ordinal)) + def stringOf(g: SpecGroup): String = group(g).getOrElse("") + def intOf(g: SpecGroup): Option[Int] = group(g).map(_.toInt) + + extension (inline value: Boolean) + inline def or(inline body: => Unit): Boolean = value || { body ; false } + inline def orElse(inline body: => Unit): Boolean = value || { body ; true } + inline def but(inline body: => Unit): Boolean = value && { body ; false } + inline def and(inline body: => Unit): Boolean = value && { body ; true } + + /** A conversion specifier matched in the argi'th string part, + * with `argc` arguments to interpolate. + */ + sealed abstract class Conversion: + // the match for this descriptor + def descriptor: Match + // the part number for reporting errors + def argi: Int + + // the descriptor fields + val index: Option[Int] = descriptor.intOf(Index) + val flags: String = descriptor.stringOf(Flags) + val width: Option[Int] = descriptor.intOf(Width) + val precision: Option[Int] = descriptor.group(Precision).map(_.drop(1).toInt) + val op: String = descriptor.stringOf(CC) + + // the conversion char is the head of the op string (but see DateTimeXn) + val cc: Char = if isError then '?' else op(0) + + def isError: Boolean = false + def isIndexed: Boolean = index.nonEmpty || hasFlag('<') + def isLiteral: Boolean = false + + // descriptor is at index 0 of the part string + def isLeading: Boolean = descriptor.at(Spec) == 0 + + // true if passes. Default checks flags and index + def verify: Boolean = goodFlags && goodIndex + + // is the specifier OK with the given arg + def accepts(arg: ClassTag[?]): Boolean = true + + // what arg type if any does the conversion accept + def acceptableVariants: List[ClassTag[?]] + + // what flags does the conversion accept? defaults to all + protected def okFlags: String = allFlags + + def hasFlag(f: Char) = flags.contains(f) + def hasAnyFlag(fs: String) = fs.exists(hasFlag) + + def badFlag(f: Char, msg: String) = + val i = flags.indexOf(f) match { case -1 => 0 case j => j } + errorAt(Flags, i)(msg) + + def errorAt(g: SpecGroup, i: Int = 0)(msg: String) = reporter.partError(msg, argi, descriptor.offset(g, i)) + def warningAt(g: SpecGroup, i: Int = 0)(msg: String) = reporter.partWarning(msg, argi, descriptor.offset(g, i)) + + def noFlags = flags.isEmpty or errorAt(Flags)("flags not allowed") + def noWidth = width.isEmpty or errorAt(Width)("width not allowed") + def noPrecision = precision.isEmpty or errorAt(Precision)("precision not allowed") + def only_-(msg: String) = + val badFlags = flags.filterNot { case '-' | '<' => true case _ => false } + badFlags.isEmpty or badFlag(badFlags(0), s"Only '-' allowed for $msg") + def goodFlags = + val badFlags = flags.filterNot(okFlags.contains) + for f <- badFlags do badFlag(f, s"Illegal flag '$f'") + badFlags.isEmpty + def goodIndex = + if index.nonEmpty && hasFlag('<') then warningAt(Index)("Argument index ignored if '<' flag is present") + val okRange = index.map(i => i > 0 && i <= argc).getOrElse(true) + okRange || hasFlag('<') or errorAt(Index)("Argument index out of range") + object Conversion: + def apply(m: Match, i: Int): Conversion = + def badCC(msg: String) = ErrorXn(m, i).tap(error => error.errorAt(if (error.op.isEmpty) Spec else CC)(msg)) + def cv(cc: Char) = cc match + case 's' | 'S' => StringXn(m, i) + case 'h' | 'H' => HashXn(m, i) + case 'b' | 'B' => BooleanXn(m, i) + case 'c' | 'C' => CharacterXn(m, i) + case 'd' | 'o' | + 'x' | 'X' => IntegralXn(m, i) + case 'e' | 'E' | + 'f' | + 'g' | 'G' | + 'a' | 'A' => FloatingPointXn(m, i) + case 't' | 'T' => DateTimeXn(m, i) + case '%' | 'n' => LiteralXn(m, i) + case _ => badCC(s"illegal conversion character '$cc'") + end cv + m.group(CC) match + case Some(cc) => cv(cc(0)).tap(_.verify) + case None => badCC(s"Missing conversion operator in '${m.matched}'; $literalHelp") + end apply + val literalHelp = "use %% for literal %, %n for newline" + end Conversion + abstract class GeneralXn extends Conversion + // s | S + class StringXn(val descriptor: Match, val argi: Int) extends GeneralXn: + val acceptableVariants = + if hasFlag('#') then classTag[Formattable] :: Nil + else classTag[Any] :: Nil + override protected def okFlags = "-#<" + // b | B + class BooleanXn(val descriptor: Match, val argi: Int) extends GeneralXn: + val FakeNullTag: ClassTag[?] = null + val acceptableVariants = classTag[Boolean] :: FakeNullTag :: Nil + override def accepts(arg: ClassTag[?]): Boolean = + arg == classTag[Boolean] orElse warningAt(CC)("Boolean format is null test for non-Boolean") + override protected def okFlags = "-<" + // h | H + class HashXn(val descriptor: Match, val argi: Int) extends GeneralXn: + val acceptableVariants = classTag[Any] :: Nil + override protected def okFlags = "-<" + // %% | %n + class LiteralXn(val descriptor: Match, val argi: Int) extends Conversion: + override def isLiteral = true + override def verify = op match + case "%" => super.verify && noPrecision and width.foreach(_ => warningAt(Width)("width ignored on literal")) + case "n" => noFlags && noWidth && noPrecision + override protected val okFlags = "-" + override def acceptableVariants = Nil + class CharacterXn(val descriptor: Match, val argi: Int) extends Conversion: + override def verify = super.verify && noPrecision && only_-("c conversion") + val acceptableVariants = classTag[Char] :: classTag[Byte] :: classTag[Short] :: classTag[Int] :: Nil + class IntegralXn(val descriptor: Match, val argi: Int) extends Conversion: + override def verify = + def d_# = cc == 'd' && hasFlag('#') and badFlag('#', "# not allowed for d conversion") + def x_comma = cc != 'd' && hasFlag(',') and badFlag(',', "',' only allowed for d conversion of integral types") + super.verify && noPrecision && !d_# && !x_comma + val acceptableVariants = classTag[Int] :: classTag[Long] :: classTag[Byte] :: classTag[Short] :: classTag[BigInt] :: Nil + override def accepts(arg: ClassTag[?]): Boolean = + arg == classTag[BigInt] || { + cc match + case 'o' | 'x' | 'X' if hasAnyFlag("+ (") => "+ (".filter(hasFlag).foreach(bad => badFlag(bad, s"only use '$bad' for BigInt conversions to o, x, X")) ; false + case _ => true + } + class FloatingPointXn(val descriptor: Match, val argi: Int) extends Conversion: + override def verify = super.verify && (cc match { + case 'a' | 'A' => + val badFlags = ",(".filter(hasFlag) + noPrecision && badFlags.isEmpty or badFlags.foreach(badf => badFlag(badf, s"'$badf' not allowed for a, A")) + case _ => true + }) + val acceptableVariants = classTag[Double] :: classTag[Float] :: classTag[BigDecimal] :: Nil + class DateTimeXn(val descriptor: Match, val argi: Int) extends Conversion: + override val cc: Char = if op.length > 1 then op(1) else '?' + def hasCC = op.length == 2 or errorAt(CC)("Date/time conversion must have two characters") + def goodCC = "HIklMSLNpzZsQBbhAaCYyjmdeRTrDFc".contains(cc) or errorAt(CC, 1)(s"'$cc' doesn't seem to be a date or time conversion") + override def verify = super.verify && hasCC && goodCC && noPrecision && only_-("date/time conversions") + val acceptableVariants = classTag[Long] :: classTag[Calendar] :: classTag[Date] :: Nil + class ErrorXn(val descriptor: Match, val argi: Int) extends Conversion: + override def isError = true + override def verify = false + override def acceptableVariants = Nil diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala new file mode 100644 index 000000000000..820b42d2c225 --- /dev/null +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala @@ -0,0 +1,195 @@ +package dotty.tools.dotc +package transform.localopt + +import dotty.tools.dotc.ast.Trees._ +import dotty.tools.dotc.ast.tpd +import dotty.tools.dotc.core.Decorators._ +import dotty.tools.dotc.core.Constants.Constant +import dotty.tools.dotc.core.Contexts._ +import dotty.tools.dotc.core.StdNames._ +import dotty.tools.dotc.core.NameKinds._ +import dotty.tools.dotc.core.Symbols._ +import dotty.tools.dotc.core.Types._ +import dotty.tools.dotc.core.Phases.typerPhase +import dotty.tools.dotc.typer.ProtoTypes._ + +import scala.StringContext.processEscapes +import scala.annotation.tailrec +import scala.collection.mutable.{ListBuffer, Stack} +import scala.reflect.{ClassTag, classTag} +import scala.util.chaining._ +import scala.util.matching.Regex.Match + +object FormatInterpolatorTransform: + import tpd._ + import StringContextChecker.InterpolationReporter + + /* + /** This trait defines a tool to report errors/warnings that do not depend on Position. */ + trait InterpolationReporter: + + /** Reports error/warning of size 1 linked with a part of the StringContext. + * + * @param message the message to report as error/warning + * @param index the index of the part inside the list of parts of the StringContext + * @param offset the index in the part String where the error is + * @return an error/warning depending on the function + */ + def partError(message: String, index: Int, offset: Int): Unit + def partWarning(message: String, index: Int, offset: Int): Unit + + /** Reports error linked with an argument to format. + * + * @param message the message to report as error/warning + * @param index the index of the argument inside the list of arguments of the format function + * @return an error depending on the function + */ + def argError(message: String, index: Int): Unit + + /** Reports error linked with the list of arguments or the StringContext. + * + * @param message the message to report in the error + * @return an error + */ + def strCtxError(message: String): Unit + def argsError(message: String): Unit + + /** Claims whether an error or a warning has been reported + * + * @return true if an error/warning has been reported, false + */ + def hasReported: Boolean + + /** Stores the old value of the reported and reset it to false */ + def resetReported(): Unit + + /** Restores the value of the reported boolean that has been reset */ + def restoreReported(): Unit + end InterpolationReporter + */ + class PartsReporter(fun: Tree, args0: Tree, parts: List[Tree], args: List[Tree])(using Context) extends InterpolationReporter: + private var reported = false + private var oldReported = false + private def partPosAt(index: Int, offset: Int) = + val pos = parts(index).sourcePos + pos.withSpan(pos.span.shift(offset)) + def partError(message: String, index: Int, offset: Int): Unit = + reported = true + report.error(message, partPosAt(index, offset)) + def partWarning(message: String, index: Int, offset: Int): Unit = + reported = true + report.warning(message, partPosAt(index, offset)) + def argError(message: String, index: Int): Unit = + reported = true + report.error(message, args(index).srcPos) + def strCtxError(message: String): Unit = + reported = true + report.error(message, fun.srcPos) + def argsError(message: String): Unit = + reported = true + report.error(message, args0.srcPos) + def hasReported: Boolean = reported + def resetReported(): Unit = + oldReported = reported + reported = false + def restoreReported(): Unit = reported = oldReported + end PartsReporter + object tags: + import java.util.{Calendar, Date, Formattable} + val StringTag = classTag[String] + val FormattableTag = classTag[Formattable] + val BigIntTag = classTag[BigInt] + val BigDecimalTag = classTag[BigDecimal] + val CalendarTag = classTag[Calendar] + val DateTag = classTag[Date] + class FormattableTypes(using Context): + val FormattableType = requiredClassRef("java.util.Formattable") + val BigIntType = requiredClassRef("scala.math.BigInt") + val BigDecimalType = requiredClassRef("scala.math.BigDecimal") + val CalendarType = requiredClassRef("java.util.Calendar") + val DateType = requiredClassRef("java.util.Date") + class TypedFormatChecker(val args: List[Tree])(using Context, InterpolationReporter) extends FormatChecker: + val reporter = summon[InterpolationReporter] + val argTypes = args.map(_.tpe) + val actuals = ListBuffer.empty[Tree] + val argc = argTypes.length + def argType(argi: Int, types: Seq[ClassTag[?]]) = + require(argi < argc, s"$argi out of range picking from $types") + val tpe = argTypes(argi) + types.find(t => argConformsTo(argi, tpe, argTypeOf(t))) + .orElse(types.find(t => argConvertsTo(argi, tpe, argTypeOf(t)))) + .getOrElse { + reporter.argError(s"Found: ${tpe.show}, Required: ${types.mkString(", ")}", argi) + actuals += args(argi) + types.head + } + final lazy val fmtTypes = FormattableTypes() + import tags.*, fmtTypes.* + def argConformsTo(argi: Int, arg: Type, target: Type): Boolean = + (arg <:< target).tap(if _ then actuals += args(argi)) + def argConvertsTo(argi: Int, arg: Type, target: Type): Boolean = + import typer.Implicits.SearchSuccess + atPhase(typerPhase) { + ctx.typer.inferView(args(argi), target) match + case SearchSuccess(view, ref, _, _) => actuals += view ; true + case _ => false + } + def argTypeOf(tag: ClassTag[?]): Type = tag match + case StringTag => defn.StringType + case ClassTag.Boolean => defn.BooleanType + case ClassTag.Byte => defn.ByteType + case ClassTag.Char => defn.CharType + case ClassTag.Short => defn.ShortType + case ClassTag.Int => defn.IntType + case ClassTag.Long => defn.LongType + case ClassTag.Float => defn.FloatType + case ClassTag.Double => defn.DoubleType + case ClassTag.Any => defn.AnyType + case ClassTag.AnyRef => defn.AnyRefType + case FormattableTag => FormattableType + case BigIntTag => BigIntType + case BigDecimalTag => BigDecimalType + case CalendarTag => CalendarType + case DateTag => DateType + case null => defn.NullType + case _ => reporter.strCtxError(s"Unknown type for format $tag") + defn.AnyType + end TypedFormatChecker + + /** For f"${arg}%xpart", check format conversions and return (format, args) + * suitable for String.format(format, args). + */ + def checked(fun: Tree, args0: Tree)(using Context): (Tree, Tree) = + val (partsExpr, parts) = fun match + case TypeApply(Select(Apply(_, (parts: SeqLiteral) :: Nil), _), _) => + (parts.elems, parts.elems.map { case Literal(Constant(s: String)) => s }) + case _ => + report.error("Expected statically known StringContext", fun.srcPos) + (Nil, Nil) + val (args, elemtpt) = args0 match + case seqlit: SeqLiteral => (seqlit.elems, seqlit.elemtpt) + case _ => + report.error("Expected statically known argument list", args0.srcPos) + (Nil, EmptyTree) + given reporter: InterpolationReporter = PartsReporter(fun, args0, partsExpr, args) + + def literally(s: String) = Literal(Constant(s)) + inline val skip = false + if parts.lengthIs != args.length + 1 then + reporter.strCtxError { + if parts.isEmpty then "there are no parts" + else s"too ${if parts.lengthIs > args.length + 1 then "few" else "many"} arguments for interpolated string" + } + (literally(""), args0) + else if skip then + val checked = parts.head :: parts.tail.map(p => if p.startsWith("%") then p else "%s" + p) + (literally(checked.mkString), args0) + else + val checker = TypedFormatChecker(args) + val (checked, cvs) = checker.checked(parts) + if reporter.hasReported then (literally(parts.mkString), args0) + else + assert(checker.argc == checker.actuals.size, s"Expected ${checker.argc}, actuals size is ${checker.actuals.size} for [${parts.mkString(", ")}]") + (literally(checked.mkString), tpd.SeqLiteral(checker.actuals.toList, elemtpt)) + end checked +end FormatInterpolatorTransform diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala index fbd09f43b853..18f296af8c4e 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala @@ -49,7 +49,7 @@ object StringContextChecker { * * @return true if an error/warning has been reported, false */ - def hasReported() : Boolean + def hasReported : Boolean /** Stores the old value of the reported and reset it to false */ def resetReported() : Unit @@ -106,7 +106,7 @@ object StringContextChecker { report.error(message, args0.srcPos) } - def hasReported() : Boolean = { + def hasReported : Boolean = { reported } @@ -160,7 +160,7 @@ object StringContextChecker { case p :: parts1 => p :: parts1.map((part : String) => { if (!part.startsWith("%")) { val index = part.indexOf('%') - if (!reporter.hasReported() && index != -1) { + if (!reporter.hasReported && index != -1) { reporter.partError("conversions must follow a splice; use %% for literal %, %n for newline", parts.indexOf(part), index) "%s" + part } else "%s" + part @@ -296,7 +296,7 @@ object StringContextChecker { } //conversion - if((conversion >= l || (!part.charAt(conversion).isLetter && part.charAt(conversion) != '%')) && !reporter.hasReported()) + if((conversion >= l || (!part.charAt(conversion).isLetter && part.charAt(conversion) != '%')) && !reporter.hasReported) reporter.partError("Missing conversion operator in '" + part.substring(pos, conversion) + "'; use %% for literal %, %n for newline", partIndex, pos) val hasWidth = (hasWidth1 && !hasArgumentIndex) || hasWidth2 @@ -337,7 +337,7 @@ object StringContextChecker { if (argumentIndex > maxArgumentIndex || argumentIndex <= 0) reporter.partError("Argument index out of range", partIndex, offset) - if (expected && expectedArgumentIndex != argumentIndex && !reporter.hasReported()) + if (expected && expectedArgumentIndex != argumentIndex && !reporter.hasReported) reporter.partWarning("Index is not this arg", partIndex, offset) } @@ -376,10 +376,10 @@ object StringContextChecker { def checkUniqueFlags(partIndex : Int, flags : List[(Char, Int)], notAllowedFlagOnCondition : List[(Char, Boolean, String)]) = { reporter.resetReported() for {flag <- flags ; (nonAllowedFlag, condition, message) <- notAllowedFlagOnCondition ; if (flag._1 == nonAllowedFlag && condition)} { - if (!reporter.hasReported()) + if (!reporter.hasReported) reporter.partError(message, partIndex, flag._2) } - if (!reporter.hasReported()) + if (!reporter.hasReported) reporter.restoreReported() } @@ -656,7 +656,7 @@ object StringContextChecker { argument match { case Some(argIndex, arg) => { val (hasArgumentIndex, argumentIndex, flags, hasWidth, width, hasPrecision, precision, hasRelative, relativeIndex, conversion) = getFormatSpecifiers(part, argIndex, argIndex + 1, false, formattingStart) - if (!reporter.hasReported()){ + if (!reporter.hasReported){ val conversionWithType = checkFormatSpecifiers(argIndex + 1, hasArgumentIndex, argumentIndex, Some(argIndex + 1), start == 0, maxArgumentIndex, hasRelative, hasWidth, width, hasPrecision, precision, flags, conversion, Some(arg.tpe), part) nextStart = conversion + 1 conversionWithType :: checkPart(part, nextStart, argument, maxArgumentIndex) @@ -668,10 +668,10 @@ object StringContextChecker { reporter.partError("Argument index out of range", 0, argumentIndex) if (hasRelative) reporter.partError("No last arg", 0, relativeIndex) - if (!reporter.hasReported()){ + if (!reporter.hasReported){ val conversionWithType = checkFormatSpecifiers(0, hasArgumentIndex, argumentIndex, None, start == 0, maxArgumentIndex, hasRelative, hasWidth, width, hasPrecision, precision, flags, conversion, None, part) nextStart = conversion + 1 - if (!reporter.hasReported() && part.charAt(conversion) != '%' && part.charAt(conversion) != 'n' && !hasArgumentIndex && !hasRelative) + if (!reporter.hasReported && part.charAt(conversion) != '%' && part.charAt(conversion) != 'n' && !hasArgumentIndex && !hasRelative) reporter.partError("conversions must follow a splice; use %% for literal %, %n for newline", 0, part.indexOf('%')) conversionWithType :: checkPart(part, nextStart, argument, maxArgumentIndex) } else checkPart(part, conversion + 1, argument, maxArgumentIndex) @@ -691,10 +691,10 @@ object StringContextChecker { // add default format val parts = addDefaultFormat(parts0) - if (!parts.isEmpty && !reporter.hasReported()) { + if (!parts.isEmpty && !reporter.hasReported) { if (parts.size == 1 && args.size == 0 && parts.head.size != 0){ val argTypeWithConversion = checkPart(parts.head, 0, None, None) - if (!reporter.hasReported()) + if (!reporter.hasReported) for ((argument, conversionChar, flags) <- argTypeWithConversion) checkArgTypeWithConversion(0, conversionChar, argument, flags, parts.head.indexOf('%')) } else { @@ -702,7 +702,7 @@ object StringContextChecker { for (i <- (0 until args.size)){ val (part, arg) = partWithArgs(i) val argTypeWithConversion = checkPart(part, 0, Some((i, arg)), Some(args.size)) - if (!reporter.hasReported()) + if (!reporter.hasReported) for ((argument, conversionChar, flags) <- argTypeWithConversion) checkArgTypeWithConversion(i + 1, conversionChar, argument, flags, parts(i).indexOf('%')) } diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala index 741803d41a66..e42a98080242 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala @@ -32,7 +32,7 @@ class StringInterpolatorOpt extends MiniPhase { tree match { case tree: RefTree => val sym = tree.symbol - assert(sym != defn.StringContext_raw && sym != defn.StringContext_s, + assert(sym != defn.StringContext_raw && sym != defn.StringContext_s && sym != defn.StringContext_f, i"$tree in ${ctx.owner.showLocated} should have been rewritten by phase $phaseName") case _ => } @@ -122,6 +122,11 @@ class StringInterpolatorOpt extends MiniPhase { (sym.name == nme.raw_ && sym.eq(defn.StringContext_raw)) || (sym.name == nme.f && sym.eq(defn.StringContext_f)) || (sym.name == nme.s && sym.eq(defn.StringContext_s)) + def transformF(fun: Tree, args: Tree): Tree = + val (parts1, args1) = FormatInterpolatorTransform.checked(fun, args) + resolveConstructor(defn.StringOps.typeRef, List(parts1)) + .select(nme.format) + .appliedTo(args1) if (isInterpolatedMethod) (tree: @unchecked) match { case StringContextIntrinsic(strs: List[Literal], elems: List[Tree]) => @@ -138,10 +143,7 @@ class StringInterpolatorOpt extends MiniPhase { } result case Apply(intp, args :: Nil) if sym.eq(defn.StringContext_f) => - val partsStr = StringContextChecker.checkedParts(intp, args).mkString - resolveConstructor(defn.StringOps.typeRef, List(Literal(Constant(partsStr)))) - .select(nme.format) - .appliedTo(args) + transformF(intp, args) // Starting with Scala 2.13, s and raw are macros in the standard // library, so we need to expand them manually. // sc.s(args) --> standardInterpolator(processEscapes, args, sc.parts) diff --git a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala index d92c16cfe54d..b259b3f21b86 100644 --- a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala +++ b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala @@ -1423,7 +1423,7 @@ object SourceCode { case '"' => "\\\"" case '\'' => "\\\'" case '\\' => "\\\\" - case _ => if (ch.isControl) f"\u${ch.toInt}%04x" else String.valueOf(ch) + case _ => if (ch.isControl) f"${"\\"}u${ch.toInt}%04x" else String.valueOf(ch) } private def escapedString(str: String): String = str flatMap escapedChar diff --git a/compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala b/compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala new file mode 100644 index 000000000000..56bc47d172b2 --- /dev/null +++ b/compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala @@ -0,0 +1,82 @@ +package dotty.tools +package dotc.transform + +import org.junit.{Test, Assert}, Assert.{assertEquals, assertFalse, assertTrue} + +import scala.collection.mutable.ListBuffer +import scala.language.implicitConversions +import scala.reflect.{ClassTag, classTag} +import scala.util.chaining._ + +import java.util.{Calendar, Date, Formattable} + +import localopt.{FormatChecker, StringContextChecker} + +// TDD for just the Checker +class FormatCheckerTest: + class TestReporter extends StringContextChecker.InterpolationReporter: + private var reported = false + private var oldReported = false + val reports = ListBuffer.empty[(String, Int, Int)] + + def partError(message: String, index: Int, offset: Int): Unit = + reported = true + reports += ((message, index, offset)) + def partWarning(message: String, index: Int, offset: Int): Unit = + reported = true + reports += ((message, index, offset)) + def argError(message: String, index: Int): Unit = + reported = true + reports += ((message, index, 0)) + def strCtxError(message: String): Unit = + reported = true + reports += ((message, 0, 0)) + def argsError(message: String): Unit = + reports += ((message, 0, 0)) + + def hasReported: Boolean = reported + + def resetReported(): Unit = + oldReported = reported + reported = false + + def restoreReported(): Unit = + reported = oldReported + end TestReporter + given TestReporter = TestReporter() + + /* + enum ArgTypeTag: + case BooleanArg, ByteArg, CharArg, ShortArg, IntArg, LongArg, FloatArg, DoubleArg, AnyArg, + StringArg, FormattableArg, BigIntArg, BigDecimalArg, CalendarArg, DateArg + given Conversion[ArgTypeTag, Int] = _.ordinal + def argTypeString(tag: Int) = + if tag < 0 then "Null" + else if tag >= ArgTypeTag.values.length then throw RuntimeException(s"Bad tag $tag") + else ArgTypeTag.values(tag) + */ + + class TestChecker(args: ClassTag[?]*)(using val reporter: TestReporter) extends FormatChecker: + def argType(argi: Int, types: ClassTag[?]*): ClassTag[?] = types.find(_ == args(argi)).getOrElse(types.head) + val argc = args.length + + def checked(parts: String*)(args: ClassTag[?]*): String = + val checker = TestChecker(args*) + val (amended, _) = checker.checked(parts.toList) + assertFalse(checker.reporter.hasReported) + amended.mkString + def assertChecked(parts: String*)(args: ClassTag[?]*)(p: TestReporter => Boolean = _ => true): Unit = + val checker = TestChecker(args*) + checker.checked(parts.toList) + assertTrue(p(checker.reporter)) + def errorIs(msg: String): (TestReporter => Boolean) = _.reports.head._1.contains(msg) + + @Test def `simple string` = assertEquals("xyz", checked("xyz")()) + @Test def `one string` = assertEquals("xyz%s123", checked("xyz", "123")(classTag[String])) + @Test def `in first part` = assertEquals("x%ny%%z%s123", checked("x%ny%%z", "123")(classTag[String])) + @Test def `one int` = assertEquals("xyz%d123", checked("xyz", "%d123")(classTag[Int])) + //@Test def `one bad int`: Unit = assertChecked("xyz", "%d123")(classTag[String])(errorIs("Type error")) + @Test def `extra descriptor` = assertChecked("xyz", "%s12%d3")(classTag[String])(errorIs("conversions must follow")) + @Test def `bad leader`: Unit = assertChecked("%dxyz")()(_.reports.head._1.contains("conversions must follow")) + @Test def `in second part`: Unit = assertEquals("xyz%s1%n2%%3", checked("xyz", "1%n2%%3")(classTag[String])) + @Test def `something weird`: Unit = assertEquals("xyz%tH123", checked("xyz", "%tH123")(classTag[Calendar])) diff --git a/tests/neg/f-interpolator-tests.scala b/tests/neg/f-interpolator-tests.scala new file mode 100644 index 000000000000..ca4b4ad11e39 --- /dev/null +++ b/tests/neg/f-interpolator-tests.scala @@ -0,0 +1,11 @@ + +trait T { + val s = "um" + def `um uh` = f"$s%d" // error + + // "% y" looks like a format conversion because ' ' is a legal flag + def i11256 = + val x = 42 + val y = 27 + f"x % y = ${x % y}%d" // error: illegal conversion character 'y' +} diff --git a/tests/neg/fEscapes.check b/tests/neg/fEscapes.check new file mode 100644 index 000000000000..29fe1412e075 --- /dev/null +++ b/tests/neg/fEscapes.check @@ -0,0 +1,4 @@ +-- Error: tests/neg/fEscapes.scala:5:18 -------------------------------------------------------------------------------- +5 | val fEscape = f"\u$octal%04x" // error + | ^^ + | invalid unicode escape at index 1 of \u diff --git a/tests/neg/fEscapes.scala b/tests/neg/fEscapes.scala new file mode 100644 index 000000000000..c4a9a6ffb200 --- /dev/null +++ b/tests/neg/fEscapes.scala @@ -0,0 +1,5 @@ + +// f-interpolator wasn't doing any escape processing +class C: + val octal = 8 + val fEscape = f"\u$octal%04x" // error diff --git a/tests/run-macros/f-interpolator-tests.scala b/tests/run-macros/f-interpolator-tests.scala index a50d22a4c022..73ad9b8852fa 100755 --- a/tests/run-macros/f-interpolator-tests.scala +++ b/tests/run-macros/f-interpolator-tests.scala @@ -23,6 +23,7 @@ object Test { dateArgsTests specificLiteralsTests argumentsTests + unitTests } def multilineTests = { @@ -199,5 +200,209 @@ object Test { def argumentsTests = { println(f"${"a"}%s ${"b"}%s % "false", + f"${b_true}%b" -> "true", + + f"${null}%b" -> "false", + f"${false}%b" -> "false", + f"${true}%b" -> "true", + f"${true && false}%b" -> "false", + f"${java.lang.Boolean.valueOf(false)}%b" -> "false", + f"${java.lang.Boolean.valueOf(true)}%b" -> "true", + + f"${null}%B" -> "FALSE", + f"${false}%B" -> "FALSE", + f"${true}%B" -> "TRUE", + f"${java.lang.Boolean.valueOf(false)}%B" -> "FALSE", + f"${java.lang.Boolean.valueOf(true)}%B" -> "TRUE", + + f"${"true"}%b" -> "true", + f"${"false"}%b"-> "false", + + // 'h' | 'H' (category: general) + // ----------------------------- + f"${null}%h" -> "null", + f"${f_zero}%h" -> "0", + f"${f_zero_-}%h" -> "80000000", + f"${s}%h" -> "4c01926", + + f"${null}%H" -> "NULL", + f"${s}%H" -> "4C01926", + + // 's' | 'S' (category: general) + // ----------------------------- + f"${null}%s" -> "null", + f"${null}%S" -> "NULL", + f"${s}%s" -> "Scala", + f"${s}%S" -> "SCALA", + f"${5}" -> "5", + f"${i}" -> "42", + f"${Symbol("foo")}" -> "Symbol(foo)", + + f"${Thread.State.NEW}" -> "NEW", + + // 'c' | 'C' (category: character) + // ------------------------------- + f"${120:Char}%c" -> "x", + f"${120:Byte}%c" -> "x", + f"${120:Short}%c" -> "x", + f"${120:Int}%c" -> "x", + f"${java.lang.Character.valueOf('x')}%c" -> "x", + f"${java.lang.Byte.valueOf(120:Byte)}%c" -> "x", + f"${java.lang.Short.valueOf(120:Short)}%c" -> "x", + f"${java.lang.Integer.valueOf(120)}%c" -> "x", + + f"${'x' : java.lang.Character}%c" -> "x", + f"${(120:Byte) : java.lang.Byte}%c" -> "x", + f"${(120:Short) : java.lang.Short}%c" -> "x", + f"${120 : java.lang.Integer}%c" -> "x", + + f"${"Scala"}%c" -> "S", + + // 'd' | 'o' | 'x' | 'X' (category: integral) + // ------------------------------------------ + f"${120:Byte}%d" -> "120", + f"${120:Short}%d" -> "120", + f"${120:Int}%d" -> "120", + f"${120:Long}%d" -> "120", + f"${60 * 2}%d" -> "120", + f"${java.lang.Byte.valueOf(120:Byte)}%d" -> "120", + f"${java.lang.Short.valueOf(120:Short)}%d" -> "120", + f"${java.lang.Integer.valueOf(120)}%d" -> "120", + f"${java.lang.Long.valueOf(120)}%d" -> "120", + f"${120 : java.lang.Integer}%d" -> "120", + f"${120 : java.lang.Long}%d" -> "120", + f"${BigInt(120)}%d" -> "120", + + f"${new java.math.BigInteger("120")}%d" -> "120", + + f"${4}%#10X" -> " 0X4", + + f"She is ${fff}%#s feet tall." -> "She is 4 feet tall.", + + f"Just want to say ${"hello, world"}%#s..." -> "Just want to say hello, world...", + + //{ implicit val strToShort: Conversion[String, Short] = java.lang.Short.parseShort ; f"${"120"}%d" } -> "120", + //{ implicit val strToInt = (s: String) => 42 ; f"${"120"}%d" } -> "42", + + // 'e' | 'E' | 'g' | 'G' | 'f' | 'a' | 'A' (category: floating point) + // ------------------------------------------------------------------ + f"${3.4f}%e" -> locally"3.400000e+00", + f"${3.4}%e" -> locally"3.400000e+00", + f"${3.4f : java.lang.Float}%e" -> locally"3.400000e+00", + f"${3.4 : java.lang.Double}%e" -> locally"3.400000e+00", + + f"${BigDecimal(3.4)}%e" -> locally"3.400000e+00", + + f"${new java.math.BigDecimal(3.4)}%e" -> locally"3.400000e+00", + + f"${3}%e" -> locally"3.000000e+00", + f"${3L}%e" -> locally"3.000000e+00", + + // 't' | 'T' (category: date/time) + // ------------------------------- + f"${cal}%TD" -> "05/26/12", + f"${cal.getTime}%TD" -> "05/26/12", + f"${cal.getTime.getTime}%TD" -> "05/26/12", + f"""${"1234"}%TD""" -> "05/26/12", + + // literals and arg indexes + f"%%" -> "%", + f" mind%n------%nmatter" -> + """| mind + |------ + |matter""".stripMargin.linesIterator.mkString(System.lineSeparator), + f"${i}%d % "42 42 9", + f"${7}%d % "7 7 9", + f"${7}%d %2$$d ${9}%d" -> "7 9 9", + + f"${null}%d % "null FALSE", + + f"${5: Any}" -> "5", + f"${5}%s% "55", + f"${3.14}%s,% locally"3.14,${"3.140000"}", + + f"z" -> "z" + ) + + for ((f, s) <- ss) assertEquals(s, f) + end `f interpolator baseline` + + def fIf = + val res = f"${if true then 2.5 else 2.5}%.2f" + val expected = locally"2.50" + assertEquals(expected, res) + + def fIfNot = + val res = f"${if false then 2.5 else 3.5}%.2f" + val expected = locally"3.50" + assertEquals(expected, res) + + // in Scala 2, [A >: Any] forced not to convert 3 to 3.0; Scala 3 harmonics should also respect lower bound. + def fHeteroArgs() = + val res = f"${3.14}%.2f rounds to ${3}%d" + val expected = locally"${"3.14"} rounds to 3" + assertEquals(expected, res) } +object StringContextTestUtils: + private val decimalSeparator: Char = new DecimalFormat().getDecimalFormatSymbols().getDecimalSeparator() + private val numberPattern = """(\d+)\.(\d+.*)""".r + private def applyProperLocale(number: String): String = + val numberPattern(intPart, fractionalPartAndSuffix) = number + s"$intPart$decimalSeparator$fractionalPartAndSuffix" + + extension (sc: StringContext) + // Use this String interpolator to avoid problems with a locale-dependent decimal mark. + def locally(numbers: String*): String = + val numbersWithCorrectLocale = numbers.map(applyProperLocale) + sc.s(numbersWithCorrectLocale: _*) + + // Handles cases like locally"3.14" - it's prettier than locally"${"3.14"}". + def locally(): String = sc.parts.map(applyProperLocale).mkString diff --git a/tests/run/t6476.check b/tests/run/t6476.check index 69bf68978177..e2a080bcf6dc 100644 --- a/tests/run/t6476.check +++ b/tests/run/t6476.check @@ -1,13 +1,18 @@ "Hello", Alice "Hello", Alice + +"Hello", Alice +"Hello", Alice + \"Hello\", Alice \"Hello\", Alice -\"Hello\", Alice -\"Hello\", Alice + \TILT\ -\\TILT\\ -\\TILT\\ \TILT\ \\TILT\\ + +\TILT\ +\TILT\ \\TILT\\ + \TILT\ diff --git a/tests/run/t6476.scala b/tests/run/t6476.scala index a04645065a2a..25a1d5f03ec1 100644 --- a/tests/run/t6476.scala +++ b/tests/run/t6476.scala @@ -3,21 +3,21 @@ object Test { val person = "Alice" println(s"\"Hello\", $person") println(s"""\"Hello\", $person""") - + println() println(f"\"Hello\", $person") println(f"""\"Hello\", $person""") - + println() println(raw"\"Hello\", $person") println(raw"""\"Hello\", $person""") - + println() println(s"\\TILT\\") println(f"\\TILT\\") println(raw"\\TILT\\") - + println() println(s"""\\TILT\\""") println(f"""\\TILT\\""") println(raw"""\\TILT\\""") - + println() println(raw"""\TILT\""") } } From be59cfaf9f077bbad29107cf1223df27fa956817 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Thu, 26 Aug 2021 16:26:44 -0700 Subject: [PATCH 1142/1244] Cleanup dispatch to interpolations --- .../localopt/StringInterpolatorOpt.scala | 84 ++++++++++--------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala index e42a98080242..1fc357ab2bfd 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala @@ -117,55 +117,57 @@ class StringInterpolatorOpt extends MiniPhase { } override def transformApply(tree: Apply)(using Context): Tree = { + def mkConcat(strs: List[Literal], elems: List[Tree]): Tree = + val stri = strs.iterator + val elemi = elems.iterator + var result: Tree = stri.next + def concat(tree: Tree): Unit = + result = result.select(defn.String_+).appliedTo(tree).withSpan(tree.span) + while elemi.hasNext + do + concat(elemi.next) + val str = stri.next + if !str.const.stringValue.isEmpty then concat(str) + result + end mkConcat val sym = tree.symbol - val isInterpolatedMethod = // Test names first to avoid loading scala.StringContext if not used - (sym.name == nme.raw_ && sym.eq(defn.StringContext_raw)) || - (sym.name == nme.f && sym.eq(defn.StringContext_f)) || - (sym.name == nme.s && sym.eq(defn.StringContext_s)) + // Test names first to avoid loading scala.StringContext if not used, and common names first + val isInterpolatedMethod = + sym.name match + case nme.s => sym eq defn.StringContext_s + case nme.raw_ => sym eq defn.StringContext_raw + case nme.f => sym eq defn.StringContext_f + case _ => false def transformF(fun: Tree, args: Tree): Tree = val (parts1, args1) = FormatInterpolatorTransform.checked(fun, args) resolveConstructor(defn.StringOps.typeRef, List(parts1)) .select(nme.format) .appliedTo(args1) - if (isInterpolatedMethod) - (tree: @unchecked) match { + // Starting with Scala 2.13, s and raw are macros in the standard + // library, so we need to expand them manually. + // sc.s(args) --> standardInterpolator(processEscapes, args, sc.parts) + // sc.raw(args) --> standardInterpolator(x => x, args, sc.parts) + def transformS(fun: Tree, args: Tree, isRaw: Boolean): Tree = + val pre = fun match + case Select(pre, _) => pre + case intp: Ident => tpd.desugarIdentPrefix(intp) + val stringToString = defn.StringContextModule_processEscapes.info.asInstanceOf[MethodType] + val process = tpd.Lambda(stringToString, args => + if isRaw then args.head else ref(defn.StringContextModule_processEscapes).appliedToTermArgs(args) + ) + evalOnce(pre) { sc => + val parts = sc.select(defn.StringContext_parts) + ref(defn.StringContextModule_standardInterpolator) + .appliedToTermArgs(List(process, args, parts)) + } + end transformS + if isInterpolatedMethod then + (tree: @unchecked) match case StringContextIntrinsic(strs: List[Literal], elems: List[Tree]) => - val stri = strs.iterator - val elemi = elems.iterator - var result: Tree = stri.next - def concat(tree: Tree): Unit = { - result = result.select(defn.String_+).appliedTo(tree).withSpan(tree.span) - } - while (elemi.hasNext) { - concat(elemi.next) - val str = stri.next - if (!str.const.stringValue.isEmpty) concat(str) - } - result - case Apply(intp, args :: Nil) if sym.eq(defn.StringContext_f) => - transformF(intp, args) - // Starting with Scala 2.13, s and raw are macros in the standard - // library, so we need to expand them manually. - // sc.s(args) --> standardInterpolator(processEscapes, args, sc.parts) - // sc.raw(args) --> standardInterpolator(x => x, args, sc.parts) + mkConcat(strs, elems) case Apply(intp, args :: Nil) => - val pre = intp match { - case Select(pre, _) => pre - case intp: Ident => tpd.desugarIdentPrefix(intp) - } - val isRaw = sym eq defn.StringContext_raw - val stringToString = defn.StringContextModule_processEscapes.info.asInstanceOf[MethodType] - - val process = tpd.Lambda(stringToString, args => - if (isRaw) args.head else ref(defn.StringContextModule_processEscapes).appliedToTermArgs(args)) - - evalOnce(pre) { sc => - val parts = sc.select(defn.StringContext_parts) - - ref(defn.StringContextModule_standardInterpolator) - .appliedToTermArgs(List(process, args, parts)) - } - } + if sym eq defn.StringContext_f then transformF(intp, args) + else transformS(intp, args, isRaw = sym eq defn.StringContext_raw) else tree.tpe match case _: ConstantType => tree From 96eed43e75f4655f59802dd9a545ca155cadbd3e Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Mon, 22 Nov 2021 20:53:53 -0800 Subject: [PATCH 1143/1244] Brace reduction and remove dead code --- compiler/src/dotty/tools/dotc/Compiler.scala | 2 +- .../transform/localopt/FormatChecker.scala | 2 - .../FormatInterpolatorTransform.scala | 86 ++- .../localopt/StringContextChecker.scala | 714 ------------------ .../localopt/StringInterpolatorOpt.scala | 118 ++- .../dotc/transform/FormatCheckerTest.scala | 16 +- tests/run-macros/f-interpolator-tests.scala | 13 +- 7 files changed, 96 insertions(+), 855 deletions(-) delete mode 100644 compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala diff --git a/compiler/src/dotty/tools/dotc/Compiler.scala b/compiler/src/dotty/tools/dotc/Compiler.scala index cbcc62b7fb6b..1ddc626d2646 100644 --- a/compiler/src/dotty/tools/dotc/Compiler.scala +++ b/compiler/src/dotty/tools/dotc/Compiler.scala @@ -85,7 +85,7 @@ class Compiler { new sjs.ExplicitJSClasses, // Make all JS classes explicit (Scala.js only) new ExplicitOuter, // Add accessors to outer classes from nested ones. new ExplicitSelf, // Make references to non-trivial self types explicit as casts - new StringInterpolatorOpt) :: // Optimizes raw and s string interpolators by rewriting them to string concatenations + new StringInterpolatorOpt) :: // Optimizes raw and s and f string interpolators by rewriting them to string concatenations or formats List(new PruneErasedDefs, // Drop erased definitions from scopes and simplify erased expressions new UninitializedDefs, // Replaces `compiletime.uninitialized` by `_` new InlinePatterns, // Remove placeholders of inlined patterns diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala index 1cbd73db2ba0..54493c552473 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala @@ -9,8 +9,6 @@ import scala.util.matching.Regex.Match import java.util.{Calendar, Date, Formattable} -import StringContextChecker.InterpolationReporter - /** Formatter string checker. */ abstract class FormatChecker(using reporter: InterpolationReporter): diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala index 820b42d2c225..436b56710370 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala @@ -22,51 +22,7 @@ import scala.util.matching.Regex.Match object FormatInterpolatorTransform: import tpd._ - import StringContextChecker.InterpolationReporter - /* - /** This trait defines a tool to report errors/warnings that do not depend on Position. */ - trait InterpolationReporter: - - /** Reports error/warning of size 1 linked with a part of the StringContext. - * - * @param message the message to report as error/warning - * @param index the index of the part inside the list of parts of the StringContext - * @param offset the index in the part String where the error is - * @return an error/warning depending on the function - */ - def partError(message: String, index: Int, offset: Int): Unit - def partWarning(message: String, index: Int, offset: Int): Unit - - /** Reports error linked with an argument to format. - * - * @param message the message to report as error/warning - * @param index the index of the argument inside the list of arguments of the format function - * @return an error depending on the function - */ - def argError(message: String, index: Int): Unit - - /** Reports error linked with the list of arguments or the StringContext. - * - * @param message the message to report in the error - * @return an error - */ - def strCtxError(message: String): Unit - def argsError(message: String): Unit - - /** Claims whether an error or a warning has been reported - * - * @return true if an error/warning has been reported, false - */ - def hasReported: Boolean - - /** Stores the old value of the reported and reset it to false */ - def resetReported(): Unit - - /** Restores the value of the reported boolean that has been reset */ - def restoreReported(): Unit - end InterpolationReporter - */ class PartsReporter(fun: Tree, args0: Tree, parts: List[Tree], args: List[Tree])(using Context) extends InterpolationReporter: private var reported = false private var oldReported = false @@ -193,3 +149,45 @@ object FormatInterpolatorTransform: (literally(checked.mkString), tpd.SeqLiteral(checker.actuals.toList, elemtpt)) end checked end FormatInterpolatorTransform + +/** This trait defines a tool to report errors/warnings that do not depend on Position. */ +trait InterpolationReporter: + + /** Reports error/warning of size 1 linked with a part of the StringContext. + * + * @param message the message to report as error/warning + * @param index the index of the part inside the list of parts of the StringContext + * @param offset the index in the part String where the error is + * @return an error/warning depending on the function + */ + def partError(message: String, index: Int, offset: Int): Unit + def partWarning(message: String, index: Int, offset: Int): Unit + + /** Reports error linked with an argument to format. + * + * @param message the message to report as error/warning + * @param index the index of the argument inside the list of arguments of the format function + * @return an error depending on the function + */ + def argError(message: String, index: Int): Unit + + /** Reports error linked with the list of arguments or the StringContext. + * + * @param message the message to report in the error + * @return an error + */ + def strCtxError(message: String): Unit + def argsError(message: String): Unit + + /** Claims whether an error or a warning has been reported + * + * @return true if an error/warning has been reported, false + */ + def hasReported: Boolean + + /** Stores the old value of the reported and reset it to false */ + def resetReported(): Unit + + /** Restores the value of the reported boolean that has been reset */ + def restoreReported(): Unit +end InterpolationReporter diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala deleted file mode 100644 index 18f296af8c4e..000000000000 --- a/compiler/src/dotty/tools/dotc/transform/localopt/StringContextChecker.scala +++ /dev/null @@ -1,714 +0,0 @@ -package dotty.tools.dotc -package transform.localopt - -import dotty.tools.dotc.ast.Trees._ -import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.core.Decorators._ -import dotty.tools.dotc.core.Constants.Constant -import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.StdNames._ -import dotty.tools.dotc.core.NameKinds._ -import dotty.tools.dotc.core.Symbols._ -import dotty.tools.dotc.core.Types._ - -// Ported from old dotty.internal.StringContextMacro -// TODO: port Scala 2 logic? (see https://github.com/scala/scala/blob/2.13.x/src/compiler/scala/tools/reflect/FormatInterpolator.scala#L74) -object StringContextChecker { - import tpd._ - - /** This trait defines a tool to report errors/warnings that do not depend on Position. */ - trait InterpolationReporter { - - /** Reports error/warning of size 1 linked with a part of the StringContext. - * - * @param message the message to report as error/warning - * @param index the index of the part inside the list of parts of the StringContext - * @param offset the index in the part String where the error is - * @return an error/warning depending on the function - */ - def partError(message : String, index : Int, offset : Int) : Unit - def partWarning(message : String, index : Int, offset : Int) : Unit - - /** Reports error linked with an argument to format. - * - * @param message the message to report as error/warning - * @param index the index of the argument inside the list of arguments of the format function - * @return an error depending on the function - */ - def argError(message : String, index : Int) : Unit - - /** Reports error linked with the list of arguments or the StringContext. - * - * @param message the message to report in the error - * @return an error - */ - def strCtxError(message : String) : Unit - def argsError(message : String) : Unit - - /** Claims whether an error or a warning has been reported - * - * @return true if an error/warning has been reported, false - */ - def hasReported : Boolean - - /** Stores the old value of the reported and reset it to false */ - def resetReported() : Unit - - /** Restores the value of the reported boolean that has been reset */ - def restoreReported() : Unit - } - - /** Check the format of the parts of the f".." arguments and returns the string parts of the StringContext */ - def checkedParts(strContext_f: Tree, args0: Tree)(using Context): String = { - - val (partsExpr, parts) = strContext_f match { - case TypeApply(Select(Apply(_, (parts: SeqLiteral) :: Nil), _), _) => - (parts.elems, parts.elems.map { case Literal(Constant(str: String)) => str } ) - case _ => - report.error("Expected statically known String Context", strContext_f.srcPos) - return "" - } - - val args = args0 match { - case args: SeqLiteral => args.elems - case _ => - report.error("Expected statically known argument list", args0.srcPos) - return "" - } - - val reporter = new InterpolationReporter{ - private[this] var reported = false - private[this] var oldReported = false - def partError(message : String, index : Int, offset : Int) : Unit = { - reported = true - val pos = partsExpr(index).sourcePos - val posOffset = pos.withSpan(pos.span.shift(offset)) - report.error(message, posOffset) - } - def partWarning(message : String, index : Int, offset : Int) : Unit = { - reported = true - val pos = partsExpr(index).sourcePos - val posOffset = pos.withSpan(pos.span.shift(offset)) - report.warning(message, posOffset) - } - - def argError(message : String, index : Int) : Unit = { - reported = true - report.error(message, args(index).srcPos) - } - - def strCtxError(message : String) : Unit = { - reported = true - report.error(message, strContext_f.srcPos) - } - def argsError(message : String) : Unit = { - reported = true - report.error(message, args0.srcPos) - } - - def hasReported : Boolean = { - reported - } - - def resetReported() : Unit = { - oldReported = reported - reported = false - } - - def restoreReported() : Unit = { - reported = oldReported - } - } - - checked(parts, args, reporter) - } - - def checked(parts0: List[String], args: List[Tree], reporter: InterpolationReporter)(using Context): String = { - - - /** Checks if the number of arguments are the same as the number of formatting strings - * - * @param format the number of formatting parts in the StringContext - * @param argument the number of arguments to interpolate in the string - * @return reports an error if the number of arguments does not match with the number of formatting strings, - * nothing otherwise - */ - def checkSizes(format : Int, argument : Int) : Unit = { - if (format > argument && !(format == -1 && argument == 0)) - if (argument == 0) - reporter.argsError("too few arguments for interpolated string") - else - reporter.argError("too few arguments for interpolated string", argument - 1) - if (format < argument && !(format == -1 && argument == 0)) - if (argument == 0) - reporter.argsError("too many arguments for interpolated string") - else - reporter.argError("too many arguments for interpolated string", format) - if (format == -1) - reporter.strCtxError("there are no parts") - } - - /** Adds the default "%s" to the Strings that do not have any given format - * - * @param parts the list of parts contained in the StringContext - * @return a new list of string with all a defined formatting or reports an error if the '%' and - * formatting parameter are too far away from the argument that they refer to - * For example : f2"${d}random-leading-junk%d" will lead to an error - */ - def addDefaultFormat(parts : List[String]) : List[String] = parts match { - case Nil => Nil - case p :: parts1 => p :: parts1.map((part : String) => { - if (!part.startsWith("%")) { - val index = part.indexOf('%') - if (!reporter.hasReported && index != -1) { - reporter.partError("conversions must follow a splice; use %% for literal %, %n for newline", parts.indexOf(part), index) - "%s" + part - } else "%s" + part - } else part - }) - } - - /** Checks whether a part contains a formatting substring - * - * @param part the part to check - * @param l the length of the given part - * @param index the index where to start to look for a potential new formatting string - * @return an Option containing the index in the part where a new formatting String starts, None otherwise - */ - def getFormattingSubstring(part : String, l : Int, index : Int) : Option[Int] = { - var i = index - var result : Option[Int] = None - while (i < l){ - if (part.charAt(i) == '%' && result.isEmpty) - result = Some(i) - i += 1 - } - result - } - - /** Finds all the flags that are inside a formatting String from a given index - * - * @param i the index in the String s where to start to check - * @param l the length of s - * @param s the String to check - * @return a list containing all the flags that are inside the formatting String, - * and their index in the String - */ - def getFlags(i : Int, l : Int, s : String) : List[(Char, Int)] = { - def isFlag(c : Char) : Boolean = c match { - case '-' | '#' | '+' | ' ' | '0' | ',' | '(' => true - case _ => false - } - if (i < l && isFlag(s.charAt(i))) (s.charAt(i), i) :: getFlags(i + 1, l, s) - else Nil - } - - /** Skips the Characters that are width or argumentIndex parameters - * - * @param i the index where to start checking in the given String - * @param s the String to check - * @param l the length of s - * @return a tuple containing the index in the String after skipping - * the parameters, true if it has a width parameter and its value, false otherwise - */ - def skipWidth(i : Int, s : String, l : Int) = { - var j = i - var width = (false, 0) - while (j < l && Character.isDigit(s.charAt(j))){ - width = (true, j) - j += 1 - } - (j, width._1, width._2) - } - - /** Retrieves all the formatting parameters from a part and their index in it - * - * @param part the String containing the formatting parameters - * @param argIndex the index of the current argument inside the list of arguments to interpolate - * @param partIndex the index of the current part inside the list of parts in the StringContext - * @param noArg true if there is no arg, i.e. "%%" or "%n" - * @param pos the initial index where to start checking the part - * @return reports an error if any of the size of the arguments and the parts do not match or if a conversion - * parameter is missing. Otherwise, - * the index where the format specifier substring is, - * hasArgumentIndex (true and the index of its corresponding argumentIndex if there is an argument index, false and 0 otherwise) and - * flags that contains the list of flags (empty if there is none), - * hasWidth (true and the index of the width parameter if there is a width, false and 0 otherwise), - * hasPrecision (true and the index of the precision if there is a precision, false and 0 otherwise), - * hasRelative (true if the specifiers use relative indexing, false otherwise) and - * conversion character index - */ - def getFormatSpecifiers(part : String, argIndex : Int, partIndex : Int, noArg : Boolean, pos : Int) : (Boolean, Int, List[(Char, Int)], Boolean, Int, Boolean, Int, Boolean, Int, Int) = { - var conversion = pos - var hasArgumentIndex = false - var argumentIndex = pos - var hasPrecision = false - var precision = pos - val l = part.length - - if (l >= 1 && part.charAt(conversion) == '%') - conversion += 1 - else if (!noArg) - reporter.argError("too many arguments for interpolated string", argIndex) - - //argument index or width - val (i, hasWidth1, width1) = skipWidth(conversion, part, l) - conversion = i - - //argument index - if (conversion < l && part.charAt(conversion) == '$'){ - if (hasWidth1){ - hasArgumentIndex = true - argumentIndex = width1 - conversion += 1 - } else { - reporter.partError("Missing conversion operator in '" + part.substring(0, conversion) + "'; use %% for literal %, %n for newline", partIndex, 0) - } - } - - //relative indexing - val hasRelative = conversion < l && part.charAt(conversion) == '<' - val relativeIndex = conversion - if (hasRelative) - conversion += 1 - - //flags - val flags = getFlags(conversion, l, part) - conversion += flags.size - - //width - val (j, hasWidth2, width2) = skipWidth(conversion, part, l) - conversion = j - - //precision - if (conversion < l && part.charAt(conversion) == '.') { - precision = conversion - conversion += 1 - hasPrecision = true - val oldConversion = conversion - while (conversion < l && Character.isDigit(part.charAt(conversion))) { - conversion += 1 - } - if (oldConversion == conversion) { - reporter.partError("Missing conversion operator in '" + part.substring(pos, oldConversion - 1) + "'; use %% for literal %, %n for newline", partIndex, pos) - hasPrecision = false - } - } - - //conversion - if((conversion >= l || (!part.charAt(conversion).isLetter && part.charAt(conversion) != '%')) && !reporter.hasReported) - reporter.partError("Missing conversion operator in '" + part.substring(pos, conversion) + "'; use %% for literal %, %n for newline", partIndex, pos) - - val hasWidth = (hasWidth1 && !hasArgumentIndex) || hasWidth2 - val width = if (hasWidth1 && !hasArgumentIndex) width1 else width2 - (hasArgumentIndex, argumentIndex, flags, hasWidth, width, hasPrecision, precision, hasRelative, relativeIndex, conversion) - } - - /** Checks if a given type is a subtype of any of the possibilities - * - * @param actualType the given type - * @param expectedType the type we are expecting - * @param argIndex the index of the argument that should type check - * @param possibilities all the types within which we want to find a super type of the actualType - * @return reports a type mismatch error if the actual type is not a subtype of any of the possibilities, - * nothing otherwise - */ - def checkSubtype(actualType: Type, expectedType: String, argIndex: Int, possibilities: List[Type]) = { - if !possibilities.exists(actualType <:< _) then - reporter.argError("type mismatch;\n found : " + actualType.widen.show.stripPrefix("scala.Predef.").stripPrefix("java.lang.").stripPrefix("scala.") + "\n required: " + expectedType, argIndex) - } - - /** Checks whether a given argument index, relative or not, is in the correct bounds - * - * @param partIndex the index of the part we are checking - * @param offset the index in the part where there might be an error - * @param relative true if relative indexing is used, false otherwise - * @param argumentIndex the argument index parameter in the formatting String - * @param expected true if we have an expectedArgumentIndex, false otherwise - * @param expectedArgumentIndex the expected argument index parameter - * @param maxArgumentIndex the maximum argument index parameter that can be used - * @return reports a warning if relative indexing is used but an argument is still given, - * an error is the argument index is not in the bounds [1, number of arguments] - */ - def checkArgumentIndex(partIndex : Int, offset : Int, relative : Boolean, argumentIndex : Int, expected : Boolean, expectedArgumentIndex : Int, maxArgumentIndex : Int) = { - if (relative) - reporter.partWarning("Argument index ignored if '<' flag is present", partIndex, offset) - - if (argumentIndex > maxArgumentIndex || argumentIndex <= 0) - reporter.partError("Argument index out of range", partIndex, offset) - - if (expected && expectedArgumentIndex != argumentIndex && !reporter.hasReported) - reporter.partWarning("Index is not this arg", partIndex, offset) - } - - /** Checks if a parameter is specified whereas it is not allowed - * - * @param hasParameter true if parameter is specified, false otherwise - * @param partIndex the index of the part inside the parts - * @param offset the index in the part where to report an error - * @param parameter the parameter that is not allowed - * @return reports an error if hasParameter is true, nothing otherwise - */ - def checkNotAllowedParameter(hasParameter : Boolean, partIndex : Int, offset : Int, parameter : String) = { - if (hasParameter) - reporter.partError(parameter + " not allowed", partIndex, offset) - } - - /** Checks if the flags are allowed for the conversion - * - * @param partIndex the index of the part in the String Context - * @param flags the specified flags to check - * @param notAllowedFlagsOnCondition a list that maps which flags are allowed depending on the conversion Char - * @return reports an error if the flag is not allowed, nothing otherwise - */ - def checkFlags(partIndex : Int, flags : List[(Char, Int)], notAllowedFlagOnCondition: List[(Char, Boolean, String)]) = { - for {flag <- flags ; (nonAllowedFlag, condition, message) <- notAllowedFlagOnCondition ; if (flag._1 == nonAllowedFlag && condition)} - reporter.partError(message, partIndex, flag._2) - } - - /** Checks if the flags are allowed for the conversion - * - * @param partIndex the index of the part in the String Context - * @param flags the specified flags to check - * @param notAllowedFlagsOnCondition a list that maps which flags are allowed depending on the conversion Char - * @return reports an error only once if at least one of the flags is not allowed, nothing otherwise - */ - def checkUniqueFlags(partIndex : Int, flags : List[(Char, Int)], notAllowedFlagOnCondition : List[(Char, Boolean, String)]) = { - reporter.resetReported() - for {flag <- flags ; (nonAllowedFlag, condition, message) <- notAllowedFlagOnCondition ; if (flag._1 == nonAllowedFlag && condition)} { - if (!reporter.hasReported) - reporter.partError(message, partIndex, flag._2) - } - if (!reporter.hasReported) - reporter.restoreReported() - } - - /** Checks all the formatting parameters for a Character conversion - * - * @param partIndex the index of the part, that we are checking, inside the parts - * @param flags the flags parameters inside the formatting part - * @param hasPrecision true if precision parameter is specified, false otherwise - * @param precision the index of the precision parameter inside the part - * @return reports an error - * if precision is specified or if the used flags are different from '-' - */ - def checkCharacterConversion(partIndex : Int, flags : List[(Char, Int)], hasPrecision : Boolean, precisionIndex : Int) = { - val notAllowedFlagOnCondition = for (flag <- List('#', '+', ' ', '0', ',', '(')) yield (flag, true, "Only '-' allowed for c conversion") - checkUniqueFlags(partIndex, flags, notAllowedFlagOnCondition) - checkNotAllowedParameter(hasPrecision, partIndex, precisionIndex, "precision") - } - - /** Checks all the formatting parameters for an Integral conversion - * - * @param partIndex the index of the part, that we are checking, inside the parts - * @param argType the type of the argument matching with the given part - * @param conversionChar the Char used for the formatting conversion - * @param flags the flags parameters inside the formatting part - * @param hasPrecision true if precision parameter is specified, false otherwise - * @param precision the index of the precision parameter inside the part - * @return reports an error - * if precision is specified or if the used flags are not allowed : - * ’d’: only ’#’ is allowed, - * ’o’, ’x’, ’X’: ’-’, ’#’, ’0’ are always allowed, depending on the type, this will be checked in the type check step - */ - def checkIntegralConversion(partIndex : Int, argType : Option[Type], conversionChar : Char, flags : List[(Char, Int)], hasPrecision : Boolean, precision : Int) = { - if (conversionChar == 'd') - checkFlags(partIndex, flags, List(('#', true, "# not allowed for d conversion"))) - - checkNotAllowedParameter(hasPrecision, partIndex, precision, "precision") - } - - /** Checks all the formatting parameters for a Floating Point conversion - * - * @param partIndex the index of the part, that we are checking, inside the parts - * @param conversionChar the Char used for the formatting conversion - * @param flags the flags parameters inside the formatting part - * @param hasPrecision true if precision parameter is specified, false otherwise - * @param precision the index of the precision parameter inside the part - * @return reports an error - * if precision is specified for 'a', 'A' conversion or if the used flags are '(' and ',' for 'a', 'A' - */ - def checkFloatingPointConversion(partIndex: Int, conversionChar : Char, flags : List[(Char, Int)], hasPrecision : Boolean, precision : Int) = { - if(conversionChar == 'a' || conversionChar == 'A'){ - for {flag <- flags ; if (flag._1 == ',' || flag._1 == '(')} - reporter.partError("'" + flag._1 + "' not allowed for a, A", partIndex, flag._2) - checkNotAllowedParameter(hasPrecision, partIndex, precision, "precision") - } - } - - /** Checks all the formatting parameters for a Time conversion - * - * @param partIndex the index of the part, that we are checking, inside the parts - * @param part the part that we are checking - * @param conversionIndex the index of the conversion Char used in the part - * @param flags the flags parameters inside the formatting part - * @param hasPrecision true if precision parameter is specified, false otherwise - * @param precision the index of the precision parameter inside the part - * @return reports an error - * if precision is specified, if the time suffix is not given/incorrect or if the used flags are - * different from '-' - */ - def checkTimeConversion(partIndex : Int, part : String, conversionIndex : Int, flags : List[(Char, Int)], hasPrecision : Boolean, precision : Int) = { - /** Checks whether a time suffix is given and whether it is allowed - * - * @param part the part that we are checking - * @param partIndex the index of the part inside of the parts of the StringContext - * @param conversionIndex the index of the conversion Char inside the part - * @param return reports an error if no suffix is specified or if the given suffix is not - * part of the allowed ones - */ - def checkTime(part : String, partIndex : Int, conversionIndex : Int) : Unit = { - if (conversionIndex + 1 >= part.size) - reporter.partError("Date/time conversion must have two characters", partIndex, conversionIndex) - else { - part.charAt(conversionIndex + 1) match { - case 'H' | 'I' | 'k' | 'l' | 'M' | 'S' | 'L' | 'N' | 'p' | 'z' | 'Z' | 's' | 'Q' => //times - case 'B' | 'b' | 'h' | 'A' | 'a' | 'C' | 'Y' | 'y' | 'j' | 'm' | 'd' | 'e' => //dates - case 'R' | 'T' | 'r' | 'D' | 'F' | 'c' => //dates and times - case c => reporter.partError("'" + c + "' doesn't seem to be a date or time conversion", partIndex, conversionIndex + 1) - } - } - } - - val notAllowedFlagOnCondition = for (flag <- List('#', '+', ' ', '0', ',', '(')) yield (flag, true, "Only '-' allowed for date/time conversions") - checkUniqueFlags(partIndex, flags, notAllowedFlagOnCondition) - checkNotAllowedParameter(hasPrecision, partIndex, precision, "precision") - checkTime(part, partIndex, conversionIndex) - } - - /** Checks all the formatting parameters for a General conversion - * - * @param partIndex the index of the part, that we are checking, inside the parts - * @param argType the type of the argument matching with the given part - * @param conversionChar the Char used for the formatting conversion - * @param flags the flags parameters inside the formatting part - * @return reports an error - * if '#' flag is used or if any other flag is used - */ - def checkGeneralConversion(partIndex : Int, argType : Option[Type], conversionChar : Char, flags : List[(Char, Int)]) = { - for {flag <- flags ; if (flag._1 != '-' && flag._1 != '#')} - reporter.partError("Illegal flag '" + flag._1 + "'", partIndex, flag._2) - } - - /** Checks all the formatting parameters for a special Char such as '%' and end of line - * - * @param partIndex the index of the part, that we are checking, inside the parts - * @param conversionChar the Char used for the formatting conversion - * @param hasPrecision true if precision parameter is specified, false otherwise - * @param precision the index of the precision parameter inside the part - * @param hasWidth true if width parameter is specified, false otherwise - * @param width the index of the width parameter inside the part - * @return reports an error if precision or width is specified for '%' or - * if precision is specified for end of line - */ - def checkSpecials(partIndex : Int, conversionChar : Char, hasPrecision : Boolean, precision : Int, hasWidth : Boolean, width : Int, flags : List[(Char, Int)]) = conversionChar match { - case 'n' => { - checkNotAllowedParameter(hasPrecision, partIndex, precision, "precision") - checkNotAllowedParameter(hasWidth, partIndex, width, "width") - val notAllowedFlagOnCondition = for (flag <- List('-', '#', '+', ' ', '0', ',', '(')) yield (flag, true, "flags not allowed") - checkUniqueFlags(partIndex, flags, notAllowedFlagOnCondition) - } - case '%' => { - checkNotAllowedParameter(hasPrecision, partIndex, precision, "precision") - val notAllowedFlagOnCondition = for (flag <- List('#', '+', ' ', '0', ',', '(')) yield (flag, true, "Illegal flag '" + flag + "'") - checkFlags(partIndex, flags, notAllowedFlagOnCondition) - } - case _ => // OK - } - - /** Checks whether the format specifiers are correct depending on the conversion parameter - * - * @param partIndex the index of the part, that we are checking, inside the parts - * @param part the part to check - * The rest of the inputs correspond to the output of the function getFormatSpecifiers - * @param hasArgumentIndex - * @param actualArgumentIndex - * @param expectedArgumentIndex - * @param firstFormattingSubstring true if it is the first in the list, i.e. not an indexed argument - * @param maxArgumentIndex - * @param hasRelative - * @param hasWidth - * @param hasPrecision - * @param precision - * @param flags - * @param conversion - * @param argType - * @return the argument index and its type if there is an argument, the flags and the conversion parameter - * reports an error/warning if the formatting parameters are not allowed/wrong, nothing otherwise - */ - def checkFormatSpecifiers(partIndex : Int, hasArgumentIndex : Boolean, actualArgumentIndex : Int, expectedArgumentIndex : Option[Int], firstFormattingSubstring : Boolean, maxArgumentIndex : Option[Int], - hasRelative : Boolean, hasWidth : Boolean, width : Int, hasPrecision : Boolean, precision : Int, flags : List[(Char, Int)], conversion : Int, argType : Option[Type], part : String) : (Option[(Type, Int)], Char, List[(Char, Int)])= { - val conversionChar = part.charAt(conversion) - - if (hasArgumentIndex && expectedArgumentIndex.nonEmpty && maxArgumentIndex.nonEmpty && firstFormattingSubstring) - checkArgumentIndex(partIndex, actualArgumentIndex, hasRelative, part.charAt(actualArgumentIndex).asDigit, true, expectedArgumentIndex.get, maxArgumentIndex.get) - else if(hasArgumentIndex && maxArgumentIndex.nonEmpty && !firstFormattingSubstring) - checkArgumentIndex(partIndex, actualArgumentIndex, hasRelative, part.charAt(actualArgumentIndex).asDigit, false, 0, maxArgumentIndex.get) - - conversionChar match { - case 'c' | 'C' => checkCharacterConversion(partIndex, flags, hasPrecision, precision) - case 'd' | 'o' | 'x' | 'X' => checkIntegralConversion(partIndex, argType, conversionChar, flags, hasPrecision, precision) - case 'e' | 'E' |'f' | 'g' | 'G' | 'a' | 'A' => checkFloatingPointConversion(partIndex, conversionChar, flags, hasPrecision, precision) - case 't' | 'T' => checkTimeConversion(partIndex, part, conversion, flags, hasPrecision, precision) - case 'b' | 'B' | 'h' | 'H' | 'S' | 's' => checkGeneralConversion(partIndex, argType, conversionChar, flags) - case 'n' | '%' => checkSpecials(partIndex, conversionChar, hasPrecision, precision, hasWidth, width, flags) - case illegal => reporter.partError("illegal conversion character '" + illegal + "'", partIndex, conversion) - } - - (if (argType.isEmpty) None else Some(argType.get, (partIndex - 1)), conversionChar, flags) - } - - /** Checks whether the argument type, if there is one, type checks with the formatting parameters - * - * @param partIndex the index of the part, that we are checking, inside the parts - * @param conversionChar the character used for the conversion - * @param argument an option containing the type and index of the argument, None if there is no argument - * @param flags the flags used for the formatting - * @param formattingStart the index in the part where the formatting substring starts, i.e. where the '%' is - * @return reports an error/warning if the formatting parameters are not allowed/wrong depending on the type, nothing otherwise - */ - def checkArgTypeWithConversion(partIndex : Int, conversionChar : Char, argument : Option[(Type, Int)], flags : List[(Char, Int)], formattingStart : Int) = { - if (argument.nonEmpty) - checkTypeWithArgs(argument.get, conversionChar, partIndex, flags) - else - checkTypeWithoutArgs(conversionChar, partIndex, flags, formattingStart) - } - - /** Checks whether the argument type checks with the formatting parameters - * - * @param argument the given argument to check - * @param conversionChar the conversion parameter inside the formatting String - * @param partIndex index of the part inside the String Context - * @param flags the list of flags, and their index, used inside the formatting String - * @return reports an error if the argument type does not correspond with the conversion character, - * nothing otherwise - */ - def checkTypeWithArgs(argument : (Type, Int), conversionChar : Char, partIndex : Int, flags : List[(Char, Int)]) = { - def booleans = List(defn.BooleanType, defn.NullType) - def dates = List(defn.LongType, defn.JavaCalendarClass.typeRef, defn.JavaDateClass.typeRef) - def floatingPoints = List(defn.DoubleType, defn.FloatType, defn.JavaBigDecimalClass.typeRef) - def integral = List(defn.IntType, defn.LongType, defn.ShortType, defn.ByteType, defn.JavaBigIntegerClass.typeRef) - def character = List(defn.CharType, defn.ByteType, defn.ShortType, defn.IntType) - - val (argType, argIndex) = argument - conversionChar match { - case 'c' | 'C' => checkSubtype(argType, "Char", argIndex, character) - case 'd' | 'o' | 'x' | 'X' => { - checkSubtype(argType, "Int", argIndex, integral) - if (conversionChar != 'd') { - val notAllowedFlagOnCondition = List(('+', !(argType <:< defn.JavaBigIntegerClass.typeRef), "only use '+' for BigInt conversions to o, x, X"), - (' ', !(argType <:< defn.JavaBigIntegerClass.typeRef), "only use ' ' for BigInt conversions to o, x, X"), - ('(', !(argType <:< defn.JavaBigIntegerClass.typeRef), "only use '(' for BigInt conversions to o, x, X"), - (',', true, "',' only allowed for d conversion of integral types")) - checkFlags(partIndex, flags, notAllowedFlagOnCondition) - } - } - case 'e' | 'E' |'f' | 'g' | 'G' | 'a' | 'A' => checkSubtype(argType, "Double", argIndex, floatingPoints) - case 't' | 'T' => checkSubtype(argType, "Date", argIndex, dates) - case 'b' | 'B' => checkSubtype(argType, "Boolean", argIndex, booleans) - case 'h' | 'H' | 'S' | 's' => - if !(argType <:< defn.JavaFormattableClass.typeRef) then - for flag <- flags; if flag._1 == '#' do - reporter.argError("type mismatch;\n found : " + argType.widen.show.stripPrefix("scala.Predef.").stripPrefix("java.lang.").stripPrefix("scala.") + "\n required: java.util.Formattable", argIndex) - case 'n' | '%' => - case illegal => - } - } - - /** Reports error when the formatting parameter require a specific type but no argument is given - * - * @param conversionChar the conversion parameter inside the formatting String - * @param partIndex index of the part inside the String Context - * @param flags the list of flags, and their index, used inside the formatting String - * @param formattingStart the index in the part where the formatting substring starts, i.e. where the '%' is - * @return reports an error if the formatting parameter refer to the type of the parameter but no parameter is given - * nothing otherwise - */ - def checkTypeWithoutArgs(conversionChar : Char, partIndex : Int, flags : List[(Char, Int)], formattingStart : Int) = { - conversionChar match { - case 'o' | 'x' | 'X' => { - val notAllowedFlagOnCondition = List(('+', true, "only use '+' for BigInt conversions to o, x, X"), - (' ', true, "only use ' ' for BigInt conversions to o, x, X"), - ('(', true, "only use '(' for BigInt conversions to o, x, X"), - (',', true, "',' only allowed for d conversion of integral types")) - checkFlags(partIndex, flags, notAllowedFlagOnCondition) - } - case _ => //OK - } - } - - /** Checks that a given part of the String Context respects every formatting constraint per parameter - * - * @param part a particular part of the String Context - * @param start the index from which we start checking the part - * @param argument an Option containing the argument corresponding to the part and its index in the list of args, - * None if no args are specified. - * @param maxArgumentIndex an Option containing the maximum argument index possible, None if no args are specified - * @return a list with all the elements of the conversion per formatting string - */ - def checkPart(part : String, start : Int, argument : Option[(Int, Tree)], maxArgumentIndex : Option[Int]) : List[(Option[(Type, Int)], Char, List[(Char, Int)])] = { - reporter.resetReported() - val hasFormattingSubstring = getFormattingSubstring(part, part.size, start) - if (hasFormattingSubstring.nonEmpty) { - val formattingStart = hasFormattingSubstring.get - var nextStart = formattingStart - - argument match { - case Some(argIndex, arg) => { - val (hasArgumentIndex, argumentIndex, flags, hasWidth, width, hasPrecision, precision, hasRelative, relativeIndex, conversion) = getFormatSpecifiers(part, argIndex, argIndex + 1, false, formattingStart) - if (!reporter.hasReported){ - val conversionWithType = checkFormatSpecifiers(argIndex + 1, hasArgumentIndex, argumentIndex, Some(argIndex + 1), start == 0, maxArgumentIndex, hasRelative, hasWidth, width, hasPrecision, precision, flags, conversion, Some(arg.tpe), part) - nextStart = conversion + 1 - conversionWithType :: checkPart(part, nextStart, argument, maxArgumentIndex) - } else checkPart(part, conversion + 1, argument, maxArgumentIndex) - } - case None => { - val (hasArgumentIndex, argumentIndex, flags, hasWidth, width, hasPrecision, precision, hasRelative, relativeIndex, conversion) = getFormatSpecifiers(part, 0, 0, true, formattingStart) - if (hasArgumentIndex && !(part.charAt(argumentIndex).asDigit == 1 && (part.charAt(conversion) == 'n' || part.charAt(conversion) == '%'))) - reporter.partError("Argument index out of range", 0, argumentIndex) - if (hasRelative) - reporter.partError("No last arg", 0, relativeIndex) - if (!reporter.hasReported){ - val conversionWithType = checkFormatSpecifiers(0, hasArgumentIndex, argumentIndex, None, start == 0, maxArgumentIndex, hasRelative, hasWidth, width, hasPrecision, precision, flags, conversion, None, part) - nextStart = conversion + 1 - if (!reporter.hasReported && part.charAt(conversion) != '%' && part.charAt(conversion) != 'n' && !hasArgumentIndex && !hasRelative) - reporter.partError("conversions must follow a splice; use %% for literal %, %n for newline", 0, part.indexOf('%')) - conversionWithType :: checkPart(part, nextStart, argument, maxArgumentIndex) - } else checkPart(part, conversion + 1, argument, maxArgumentIndex) - } - } - } else { - reporter.restoreReported() - Nil - } - } - - val argument = args.size - - // check validity of formatting - checkSizes(parts0.size - 1, argument) - - // add default format - val parts = addDefaultFormat(parts0) - - if (!parts.isEmpty && !reporter.hasReported) { - if (parts.size == 1 && args.size == 0 && parts.head.size != 0){ - val argTypeWithConversion = checkPart(parts.head, 0, None, None) - if (!reporter.hasReported) - for ((argument, conversionChar, flags) <- argTypeWithConversion) - checkArgTypeWithConversion(0, conversionChar, argument, flags, parts.head.indexOf('%')) - } else { - val partWithArgs = parts.tail.zip(args) - for (i <- (0 until args.size)){ - val (part, arg) = partWithArgs(i) - val argTypeWithConversion = checkPart(part, 0, Some((i, arg)), Some(args.size)) - if (!reporter.hasReported) - for ((argument, conversionChar, flags) <- argTypeWithConversion) - checkArgTypeWithConversion(i + 1, conversionChar, argument, flags, parts(i).indexOf('%')) - } - } - } - - parts.mkString - } -} diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala index 1fc357ab2bfd..06e6a56484fc 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala @@ -13,110 +13,86 @@ import dotty.tools.dotc.core.Types._ import dotty.tools.dotc.transform.MegaPhase.MiniPhase import dotty.tools.dotc.typer.ConstFold -/** - * MiniPhase to transform s and raw string interpolators from using StringContext to string - * concatenation. Since string concatenation uses the Java String builder, we get a performance - * improvement in terms of these two interpolators. - * - * More info here: - * https://medium.com/@dkomanov/scala-string-interpolation-performance-21dc85e83afd - */ -class StringInterpolatorOpt extends MiniPhase { - import tpd._ +/** MiniPhase to transform s and raw string interpolators from using StringContext to string + * concatenation. Since string concatenation uses the Java String builder, we get a performance + * improvement in terms of these two interpolators. + * + * More info here: + * https://medium.com/@dkomanov/scala-string-interpolation-performance-21dc85e83afd + */ +class StringInterpolatorOpt extends MiniPhase: + import tpd.* override def phaseName: String = StringInterpolatorOpt.name override def description: String = StringInterpolatorOpt.description - override def checkPostCondition(tree: tpd.Tree)(using Context): Unit = { - tree match { + override def checkPostCondition(tree: tpd.Tree)(using Context): Unit = + tree match case tree: RefTree => val sym = tree.symbol assert(sym != defn.StringContext_raw && sym != defn.StringContext_s && sym != defn.StringContext_f, i"$tree in ${ctx.owner.showLocated} should have been rewritten by phase $phaseName") case _ => - } - } /** Matches a list of constant literals */ - private object Literals { - def unapply(tree: SeqLiteral)(using Context): Option[List[Literal]] = { - tree.elems match { - case literals if literals.forall(_.isInstanceOf[Literal]) => - Some(literals.map(_.asInstanceOf[Literal])) + private object Literals: + def unapply(tree: SeqLiteral)(using Context): Option[List[Literal]] = + tree.elems match + case literals if literals.forall(_.isInstanceOf[Literal]) => Some(literals.map(_.asInstanceOf[Literal])) case _ => None - } - } - } - private object StringContextApply { - def unapply(tree: Select)(using Context): Boolean = { - tree.symbol.eq(defn.StringContextModule_apply) && - tree.qualifier.symbol.eq(defn.StringContextModule) - } - } + private object StringContextApply: + def unapply(tree: Select)(using Context): Boolean = + (tree.symbol eq defn.StringContextModule_apply) && (tree.qualifier.symbol eq defn.StringContextModule) /** Matches an s or raw string interpolator */ - private object SOrRawInterpolator { - def unapply(tree: Tree)(using Context): Option[(List[Literal], List[Tree])] = { - tree match { - case Apply(Select(Apply(StringContextApply(), List(Literals(strs))), _), - List(SeqLiteral(elems, _))) if elems.length == strs.length - 1 => - Some(strs, elems) + private object SOrRawInterpolator: + def unapply(tree: Tree)(using Context): Option[(List[Literal], List[Tree])] = + tree match + case Apply(Select(Apply(StringContextApply(), List(Literals(strs))), _), List(SeqLiteral(elems, _))) + if elems.length == strs.length - 1 => Some(strs, elems) case _ => None - } - } - } //Extract the position from InvalidUnicodeEscapeException //which due to bincompat reasons is unaccessible. //TODO: remove once there is less restrictive bincompat - private object InvalidEscapePosition { - def unapply(t: Throwable): Option[Int] = t match { + private object InvalidEscapePosition: + def unapply(t: Throwable): Option[Int] = t match case iee: StringContext.InvalidEscapeException => Some(iee.index) - case il: IllegalArgumentException => il.getMessage() match { - case s"""invalid unicode escape at index $index of $_""" => index.toIntOption - case _ => None - } + case iae: IllegalArgumentException => iae.getMessage() match + case s"""invalid unicode escape at index $index of $_""" => index.toIntOption + case _ => None case _ => None - } - } - /** - * Match trees that resemble s and raw string interpolations. In the case of the s - * interpolator, escapes the string constants. Exposes the string constants as well as - * the variable references. - */ - private object StringContextIntrinsic { - def unapply(tree: Apply)(using Context): Option[(List[Literal], List[Tree])] = { - tree match { + /** Match trees that resemble s and raw string interpolations. In the case of the s + * interpolator, escapes the string constants. Exposes the string constants as well as + * the variable references. + */ + private object StringContextIntrinsic: + def unapply(tree: Apply)(using Context): Option[(List[Literal], List[Tree])] = + tree match case SOrRawInterpolator(strs, elems) => - if (tree.symbol == defn.StringContext_raw) Some(strs, elems) - else { // tree.symbol == defn.StringContextS + if tree.symbol == defn.StringContext_raw then Some(strs, elems) + else // tree.symbol == defn.StringContextS import dotty.tools.dotc.util.SourcePosition var stringPosition: SourcePosition = null - try { - val escapedStrs = strs.map(str => { + try + val escapedStrs = strs.map { str => stringPosition = str.sourcePos val escaped = StringContext.processEscapes(str.const.stringValue) cpy.Literal(str)(Constant(escaped)) - }) + } Some(escapedStrs, elems) - } catch { - case t @ InvalidEscapePosition(p) => { + catch + case t @ InvalidEscapePosition(p) => val errorSpan = stringPosition.span.startPos.shift(p) val errorPosition = stringPosition.withSpan(errorSpan) report.error(t.getMessage() + "\n", errorPosition) None - } - } - } case _ => None - } - } - } - override def transformApply(tree: Apply)(using Context): Tree = { + override def transformApply(tree: Apply)(using Context): Tree = def mkConcat(strs: List[Literal], elems: List[Tree]): Tree = val stri = strs.iterator val elemi = elems.iterator @@ -175,16 +151,12 @@ class StringInterpolatorOpt extends MiniPhase { ConstFold.Apply(tree).tpe match case ConstantType(x) => Literal(x).withSpan(tree.span).ensureConforms(tree.tpe) case _ => tree - } - override def transformSelect(tree: Select)(using Context): Tree = { + override def transformSelect(tree: Select)(using Context): Tree = ConstFold.Select(tree).tpe match case ConstantType(x) => Literal(x).withSpan(tree.span).ensureConforms(tree.tpe) case _ => tree - } - -} object StringInterpolatorOpt: val name: String = "stringInterpolatorOpt" - val description: String = "optimize raw and s string interpolators" + val description: String = "optimize s, f and raw string interpolators" diff --git a/compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala b/compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala index 56bc47d172b2..984008c1f8ce 100644 --- a/compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala +++ b/compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala @@ -6,15 +6,14 @@ import org.junit.{Test, Assert}, Assert.{assertEquals, assertFalse, assertTrue} import scala.collection.mutable.ListBuffer import scala.language.implicitConversions import scala.reflect.{ClassTag, classTag} -import scala.util.chaining._ import java.util.{Calendar, Date, Formattable} -import localopt.{FormatChecker, StringContextChecker} +import localopt.{FormatChecker, InterpolationReporter} // TDD for just the Checker class FormatCheckerTest: - class TestReporter extends StringContextChecker.InterpolationReporter: + class TestReporter extends InterpolationReporter: private var reported = false private var oldReported = false val reports = ListBuffer.empty[(String, Int, Int)] @@ -45,17 +44,6 @@ class FormatCheckerTest: end TestReporter given TestReporter = TestReporter() - /* - enum ArgTypeTag: - case BooleanArg, ByteArg, CharArg, ShortArg, IntArg, LongArg, FloatArg, DoubleArg, AnyArg, - StringArg, FormattableArg, BigIntArg, BigDecimalArg, CalendarArg, DateArg - given Conversion[ArgTypeTag, Int] = _.ordinal - def argTypeString(tag: Int) = - if tag < 0 then "Null" - else if tag >= ArgTypeTag.values.length then throw RuntimeException(s"Bad tag $tag") - else ArgTypeTag.values(tag) - */ - class TestChecker(args: ClassTag[?]*)(using val reporter: TestReporter) extends FormatChecker: def argType(argi: Int, types: ClassTag[?]*): ClassTag[?] = types.find(_ == args(argi)).getOrElse(types.head) val argc = args.length diff --git a/tests/run-macros/f-interpolator-tests.scala b/tests/run-macros/f-interpolator-tests.scala index 73ad9b8852fa..8c59ae19a187 100755 --- a/tests/run-macros/f-interpolator-tests.scala +++ b/tests/run-macros/f-interpolator-tests.scala @@ -1,10 +1,9 @@ -/** - * These tests test all the possible formats the f interpolator has to deal with. - * The tests are sorted by argument category as the arguments are on https://docs.oracle.com/javase/6/docs/api/java/util/Formatter.html#detail - * - * - * Some tests come from https://github.com/lampepfl/dotty/pull/3894/files - */ +/** These tests test all the possible formats the f interpolator has to deal with. + * + * The tests are sorted by argument category as the arguments are on https://docs.oracle.com/javase/6/docs/api/java/util/Formatter.html#detail + * + * Some tests come from https://github.com/lampepfl/dotty/pull/3894/files + */ object Test { def main(args: Array[String]) = { println(f"integer: ${5}%d") From 9a2e42ab35205dcf134febba960d3627efc7663f Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Thu, 20 Jan 2022 22:44:26 -0800 Subject: [PATCH 1144/1244] Simplify Conversion --- .../transform/localopt/FormatChecker.scala | 184 +++++++++--------- .../localopt/StringInterpolatorOpt.scala | 6 +- 2 files changed, 97 insertions(+), 93 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala index 54493c552473..069eac80e458 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala @@ -9,6 +9,8 @@ import scala.util.matching.Regex.Match import java.util.{Calendar, Date, Formattable} +import PartialFunction.cond + /** Formatter string checker. */ abstract class FormatChecker(using reporter: InterpolationReporter): @@ -19,7 +21,7 @@ abstract class FormatChecker(using reporter: InterpolationReporter): // count of args, for checking indexes def argc: Int - val allFlags = "-#+ 0,(<" + // match a conversion specifier val formatPattern = """%(?:(\d+)\$)?([-#+ 0,(<]+)?(\d+)?(\.\d+)?([tT]?[%a-zA-Z])?""".r // ordinal is the regex group index in the format pattern @@ -95,18 +97,16 @@ abstract class FormatChecker(using reporter: InterpolationReporter): extension (inline value: Boolean) inline def or(inline body: => Unit): Boolean = value || { body ; false } inline def orElse(inline body: => Unit): Boolean = value || { body ; true } - inline def but(inline body: => Unit): Boolean = value && { body ; false } inline def and(inline body: => Unit): Boolean = value && { body ; true } + inline def but(inline body: => Unit): Boolean = value && { body ; false } - /** A conversion specifier matched in the argi'th string part, - * with `argc` arguments to interpolate. - */ - sealed abstract class Conversion: - // the match for this descriptor - def descriptor: Match - // the part number for reporting errors - def argi: Int + enum Kind: + case StringXn, HashXn, BooleanXn, CharacterXn, IntegralXn, FloatingPointXn, DateTimeXn, LiteralXn, ErrorXn + import Kind.* + /** A conversion specifier matched in the argi'th string part, with `argc` arguments to interpolate. + */ + final class Conversion(val descriptor: Match, val argi: Int, val kind: Kind): // the descriptor fields val index: Option[Int] = descriptor.intOf(Index) val flags: String = descriptor.stringOf(Flags) @@ -115,26 +115,86 @@ abstract class FormatChecker(using reporter: InterpolationReporter): val op: String = descriptor.stringOf(CC) // the conversion char is the head of the op string (but see DateTimeXn) - val cc: Char = if isError then '?' else op(0) + val cc: Char = + kind match + case ErrorXn => '?' + case DateTimeXn => if op.length > 1 then op(1) else '?' + case _ => op(0) - def isError: Boolean = false def isIndexed: Boolean = index.nonEmpty || hasFlag('<') - def isLiteral: Boolean = false + def isError: Boolean = kind == ErrorXn + def isLiteral: Boolean = kind == LiteralXn // descriptor is at index 0 of the part string def isLeading: Boolean = descriptor.at(Spec) == 0 + // flags and index in specifier are ok + private def goodies = goodFlags && goodIndex + // true if passes. Default checks flags and index - def verify: Boolean = goodFlags && goodIndex + def verify: Boolean = + kind match { + case StringXn => goodies + case BooleanXn => goodies + case HashXn => goodies + case CharacterXn => goodies && noPrecision && only_-("c conversion") + case IntegralXn => + def d_# = cc == 'd' && hasFlag('#') and badFlag('#', "# not allowed for d conversion") + def x_comma = cc != 'd' && hasFlag(',') and badFlag(',', "',' only allowed for d conversion of integral types") + goodies && noPrecision && !d_# && !x_comma + case FloatingPointXn => + goodies && (cc match { + case 'a' | 'A' => + val badFlags = ",(".filter(hasFlag) + noPrecision && badFlags.isEmpty or badFlags.foreach(badf => badFlag(badf, s"'$badf' not allowed for a, A")) + case _ => true + }) + case DateTimeXn => + def hasCC = op.length == 2 or errorAt(CC)("Date/time conversion must have two characters") + def goodCC = "HIklMSLNpzZsQBbhAaCYyjmdeRTrDFc".contains(cc) or errorAt(CC, 1)(s"'$cc' doesn't seem to be a date or time conversion") + goodies && hasCC && goodCC && noPrecision && only_-("date/time conversions") + case LiteralXn => + op match { + case "%" => goodies && noPrecision and width.foreach(_ => warningAt(Width)("width ignored on literal")) + case "n" => noFlags && noWidth && noPrecision + } + case ErrorXn => + errorAt(CC)(s"illegal conversion character '$cc'") + false + } // is the specifier OK with the given arg - def accepts(arg: ClassTag[?]): Boolean = true + def accepts(arg: ClassTag[?]): Boolean = + kind match + case BooleanXn => arg == classTag[Boolean] orElse warningAt(CC)("Boolean format is null test for non-Boolean") + case IntegralXn => + arg == classTag[BigInt] || !cond(cc) { + case 'o' | 'x' | 'X' if hasAnyFlag("+ (") => "+ (".filter(hasFlag).foreach(bad => badFlag(bad, s"only use '$bad' for BigInt conversions to o, x, X")) ; true + } + case _ => true // what arg type if any does the conversion accept - def acceptableVariants: List[ClassTag[?]] + def acceptableVariants: List[ClassTag[?]] = + kind match { + case StringXn => if hasFlag('#') then classTag[Formattable] :: Nil else classTag[Any] :: Nil + case BooleanXn => classTag[Boolean] :: Conversion.FakeNullTag :: Nil + case HashXn => classTag[Any] :: Nil + case CharacterXn => classTag[Char] :: classTag[Byte] :: classTag[Short] :: classTag[Int] :: Nil + case IntegralXn => classTag[Int] :: classTag[Long] :: classTag[Byte] :: classTag[Short] :: classTag[BigInt] :: Nil + case FloatingPointXn => classTag[Double] :: classTag[Float] :: classTag[BigDecimal] :: Nil + case DateTimeXn => classTag[Long] :: classTag[Calendar] :: classTag[Date] :: Nil + case LiteralXn => Nil + case ErrorXn => Nil + } - // what flags does the conversion accept? defaults to all - protected def okFlags: String = allFlags + // what flags does the conversion accept? + private def okFlags: String = + kind match { + case StringXn => "-#<" + case BooleanXn | HashXn => "-<" + case LiteralXn => "-" + case _ => "-#+ 0,(<" + } def hasFlag(f: Char) = flags.contains(f) def hasAnyFlag(fs: String) = fs.exists(hasFlag) @@ -146,6 +206,7 @@ abstract class FormatChecker(using reporter: InterpolationReporter): def errorAt(g: SpecGroup, i: Int = 0)(msg: String) = reporter.partError(msg, argi, descriptor.offset(g, i)) def warningAt(g: SpecGroup, i: Int = 0)(msg: String) = reporter.partWarning(msg, argi, descriptor.offset(g, i)) + // various assertions def noFlags = flags.isEmpty or errorAt(Flags)("flags not allowed") def noWidth = width.isEmpty or errorAt(Width)("width not allowed") def noPrecision = precision.isEmpty or errorAt(Precision)("precision not allowed") @@ -162,84 +223,25 @@ abstract class FormatChecker(using reporter: InterpolationReporter): okRange || hasFlag('<') or errorAt(Index)("Argument index out of range") object Conversion: def apply(m: Match, i: Int): Conversion = - def badCC(msg: String) = ErrorXn(m, i).tap(error => error.errorAt(if (error.op.isEmpty) Spec else CC)(msg)) - def cv(cc: Char) = cc match - case 's' | 'S' => StringXn(m, i) - case 'h' | 'H' => HashXn(m, i) - case 'b' | 'B' => BooleanXn(m, i) - case 'c' | 'C' => CharacterXn(m, i) + def kindOf(cc: Char) = cc match + case 's' | 'S' => StringXn + case 'h' | 'H' => HashXn + case 'b' | 'B' => BooleanXn + case 'c' | 'C' => CharacterXn case 'd' | 'o' | - 'x' | 'X' => IntegralXn(m, i) + 'x' | 'X' => IntegralXn case 'e' | 'E' | 'f' | 'g' | 'G' | - 'a' | 'A' => FloatingPointXn(m, i) - case 't' | 'T' => DateTimeXn(m, i) - case '%' | 'n' => LiteralXn(m, i) - case _ => badCC(s"illegal conversion character '$cc'") - end cv + 'a' | 'A' => FloatingPointXn + case 't' | 'T' => DateTimeXn + case '%' | 'n' => LiteralXn + case _ => ErrorXn + end kindOf m.group(CC) match - case Some(cc) => cv(cc(0)).tap(_.verify) - case None => badCC(s"Missing conversion operator in '${m.matched}'; $literalHelp") + case Some(cc) => new Conversion(m, i, kindOf(cc(0))).tap(_.verify) + case None => new Conversion(m, i, ErrorXn).tap(_.errorAt(Spec)(s"Missing conversion operator in '${m.matched}'; $literalHelp")) end apply val literalHelp = "use %% for literal %, %n for newline" + private val FakeNullTag: ClassTag[?] = null end Conversion - abstract class GeneralXn extends Conversion - // s | S - class StringXn(val descriptor: Match, val argi: Int) extends GeneralXn: - val acceptableVariants = - if hasFlag('#') then classTag[Formattable] :: Nil - else classTag[Any] :: Nil - override protected def okFlags = "-#<" - // b | B - class BooleanXn(val descriptor: Match, val argi: Int) extends GeneralXn: - val FakeNullTag: ClassTag[?] = null - val acceptableVariants = classTag[Boolean] :: FakeNullTag :: Nil - override def accepts(arg: ClassTag[?]): Boolean = - arg == classTag[Boolean] orElse warningAt(CC)("Boolean format is null test for non-Boolean") - override protected def okFlags = "-<" - // h | H - class HashXn(val descriptor: Match, val argi: Int) extends GeneralXn: - val acceptableVariants = classTag[Any] :: Nil - override protected def okFlags = "-<" - // %% | %n - class LiteralXn(val descriptor: Match, val argi: Int) extends Conversion: - override def isLiteral = true - override def verify = op match - case "%" => super.verify && noPrecision and width.foreach(_ => warningAt(Width)("width ignored on literal")) - case "n" => noFlags && noWidth && noPrecision - override protected val okFlags = "-" - override def acceptableVariants = Nil - class CharacterXn(val descriptor: Match, val argi: Int) extends Conversion: - override def verify = super.verify && noPrecision && only_-("c conversion") - val acceptableVariants = classTag[Char] :: classTag[Byte] :: classTag[Short] :: classTag[Int] :: Nil - class IntegralXn(val descriptor: Match, val argi: Int) extends Conversion: - override def verify = - def d_# = cc == 'd' && hasFlag('#') and badFlag('#', "# not allowed for d conversion") - def x_comma = cc != 'd' && hasFlag(',') and badFlag(',', "',' only allowed for d conversion of integral types") - super.verify && noPrecision && !d_# && !x_comma - val acceptableVariants = classTag[Int] :: classTag[Long] :: classTag[Byte] :: classTag[Short] :: classTag[BigInt] :: Nil - override def accepts(arg: ClassTag[?]): Boolean = - arg == classTag[BigInt] || { - cc match - case 'o' | 'x' | 'X' if hasAnyFlag("+ (") => "+ (".filter(hasFlag).foreach(bad => badFlag(bad, s"only use '$bad' for BigInt conversions to o, x, X")) ; false - case _ => true - } - class FloatingPointXn(val descriptor: Match, val argi: Int) extends Conversion: - override def verify = super.verify && (cc match { - case 'a' | 'A' => - val badFlags = ",(".filter(hasFlag) - noPrecision && badFlags.isEmpty or badFlags.foreach(badf => badFlag(badf, s"'$badf' not allowed for a, A")) - case _ => true - }) - val acceptableVariants = classTag[Double] :: classTag[Float] :: classTag[BigDecimal] :: Nil - class DateTimeXn(val descriptor: Match, val argi: Int) extends Conversion: - override val cc: Char = if op.length > 1 then op(1) else '?' - def hasCC = op.length == 2 or errorAt(CC)("Date/time conversion must have two characters") - def goodCC = "HIklMSLNpzZsQBbhAaCYyjmdeRTrDFc".contains(cc) or errorAt(CC, 1)(s"'$cc' doesn't seem to be a date or time conversion") - override def verify = super.verify && hasCC && goodCC && noPrecision && only_-("date/time conversions") - val acceptableVariants = classTag[Long] :: classTag[Calendar] :: classTag[Date] :: Nil - class ErrorXn(val descriptor: Match, val argi: Int) extends Conversion: - override def isError = true - override def verify = false - override def acceptableVariants = Nil diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala index 06e6a56484fc..b8e6300f4e04 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala @@ -114,9 +114,10 @@ class StringInterpolatorOpt extends MiniPhase: case nme.raw_ => sym eq defn.StringContext_raw case nme.f => sym eq defn.StringContext_f case _ => false + // Perform format checking and normalization, then make it StringOps(fmt).format(args1) with tweaked args def transformF(fun: Tree, args: Tree): Tree = - val (parts1, args1) = FormatInterpolatorTransform.checked(fun, args) - resolveConstructor(defn.StringOps.typeRef, List(parts1)) + val (fmt, args1) = FormatInterpolatorTransform.checked(fun, args) + resolveConstructor(defn.StringOps.typeRef, List(fmt)) .select(nme.format) .appliedTo(args1) // Starting with Scala 2.13, s and raw are macros in the standard @@ -137,6 +138,7 @@ class StringInterpolatorOpt extends MiniPhase: .appliedToTermArgs(List(process, args, parts)) } end transformS + // begin transformApply if isInterpolatedMethod then (tree: @unchecked) match case StringContextIntrinsic(strs: List[Literal], elems: List[Tree]) => From d92e36c1defa0911b01ab9e13de96967463ed5b3 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Sat, 22 Jan 2022 00:24:01 -0800 Subject: [PATCH 1145/1244] Simplify TypedFormatChecker --- .../transform/localopt/FormatChecker.scala | 131 +++++++++++------- .../FormatInterpolatorTransform.scala | 83 +---------- .../dotc/transform/FormatCheckerTest.scala | 70 ---------- 3 files changed, 81 insertions(+), 203 deletions(-) delete mode 100644 compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala index 069eac80e458..0f3a3ef4c154 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala @@ -2,8 +2,7 @@ package dotty.tools.dotc package transform.localopt import scala.annotation.tailrec -import scala.collection.mutable.{ListBuffer, Stack} -import scala.reflect.{ClassTag, classTag} +import scala.collection.mutable.ListBuffer import scala.util.chaining.* import scala.util.matching.Regex.Match @@ -11,15 +10,49 @@ import java.util.{Calendar, Date, Formattable} import PartialFunction.cond +import dotty.tools.dotc.ast.tpd.{Match => _, *} +import dotty.tools.dotc.core.Contexts._ +import dotty.tools.dotc.core.Symbols._ +import dotty.tools.dotc.core.Types._ +import dotty.tools.dotc.core.Phases.typerPhase + /** Formatter string checker. */ -abstract class FormatChecker(using reporter: InterpolationReporter): +class TypedFormatChecker(args: List[Tree])(using Context)(using reporter: InterpolationReporter): + + val argTypes = args.map(_.tpe) + val actuals = ListBuffer.empty[Tree] + + // count of args, for checking indexes + val argc = argTypes.length // Pick the first runtime type which the i'th arg can satisfy. // If conversion is required, implementation must emit it. - def argType(argi: Int, types: ClassTag[?]*): ClassTag[?] + def argType(argi: Int, types: Type*): Type = + require(argi < argc, s"$argi out of range picking from $types") + val tpe = argTypes(argi) + types.find(t => argConformsTo(argi, tpe, t)) + .orElse(types.find(t => argConvertsTo(argi, tpe, t))) + .getOrElse { + reporter.argError(s"Found: ${tpe.show}, Required: ${types.mkString(", ")}", argi) + actuals += args(argi) + types.head + } - // count of args, for checking indexes - def argc: Int + object formattableTypes: + val FormattableType = requiredClassRef("java.util.Formattable") + val BigIntType = requiredClassRef("scala.math.BigInt") + val BigDecimalType = requiredClassRef("scala.math.BigDecimal") + val CalendarType = requiredClassRef("java.util.Calendar") + val DateType = requiredClassRef("java.util.Date") + import formattableTypes.* + def argConformsTo(argi: Int, arg: Type, target: Type): Boolean = (arg <:< target).tap(if _ then actuals += args(argi)) + def argConvertsTo(argi: Int, arg: Type, target: Type): Boolean = + import typer.Implicits.SearchSuccess + atPhase(typerPhase) { + ctx.typer.inferView(args(argi), target) match + case SearchSuccess(view, ref, _, _) => actuals += view ; true + case _ => false + } // match a conversion specifier val formatPattern = """%(?:(\d+)\$)?([-#+ 0,(<]+)?(\d+)?(\.\d+)?([tT]?[%a-zA-Z])?""".r @@ -51,7 +84,7 @@ abstract class FormatChecker(using reporter: InterpolationReporter): def insertStringConversion(): Unit = amended += "%s" + part convert += Conversion(formatPattern.findAllMatchIn("%s").next(), n) // improve - argType(n-1, classTag[Any]) + argType(n-1, defn.AnyType) def errorLeading(op: Conversion) = op.errorAt(Spec)(s"conversions must follow a splice; ${Conversion.literalHelp}") def accept(op: Conversion): Unit = if !op.isLeading then errorLeading(op) @@ -66,11 +99,7 @@ abstract class FormatChecker(using reporter: InterpolationReporter): val cv = Conversion(matches.next(), n) if cv.isLiteral then insertStringConversion() else if cv.isIndexed then - if cv.index.getOrElse(-1) == n then accept(cv) - else - // either some other arg num, or '<' - //c.warning(op.groupPos(Index), "Index is not this arg") - insertStringConversion() + if cv.index.getOrElse(-1) == n then accept(cv) else insertStringConversion() else if !cv.isError then accept(cv) // any remaining conversions in this part must be either literals or indexed @@ -128,12 +157,26 @@ abstract class FormatChecker(using reporter: InterpolationReporter): // descriptor is at index 0 of the part string def isLeading: Boolean = descriptor.at(Spec) == 0 - // flags and index in specifier are ok - private def goodies = goodFlags && goodIndex - - // true if passes. Default checks flags and index + // true if passes. def verify: Boolean = - kind match { + // various assertions + def goodies = goodFlags && goodIndex + def noFlags = flags.isEmpty or errorAt(Flags)("flags not allowed") + def noWidth = width.isEmpty or errorAt(Width)("width not allowed") + def noPrecision = precision.isEmpty or errorAt(Precision)("precision not allowed") + def only_-(msg: String) = + val badFlags = flags.filterNot { case '-' | '<' => true case _ => false } + badFlags.isEmpty or badFlag(badFlags(0), s"Only '-' allowed for $msg") + def goodFlags = + val badFlags = flags.filterNot(okFlags.contains) + for f <- badFlags do badFlag(f, s"Illegal flag '$f'") + badFlags.isEmpty + def goodIndex = + if index.nonEmpty && hasFlag('<') then warningAt(Index)("Argument index ignored if '<' flag is present") + val okRange = index.map(i => i > 0 && i <= argc).getOrElse(true) + okRange || hasFlag('<') or errorAt(Index)("Argument index out of range") + // begin verify + kind match case StringXn => goodies case BooleanXn => goodies case HashXn => goodies @@ -143,58 +186,55 @@ abstract class FormatChecker(using reporter: InterpolationReporter): def x_comma = cc != 'd' && hasFlag(',') and badFlag(',', "',' only allowed for d conversion of integral types") goodies && noPrecision && !d_# && !x_comma case FloatingPointXn => - goodies && (cc match { + goodies && (cc match case 'a' | 'A' => val badFlags = ",(".filter(hasFlag) noPrecision && badFlags.isEmpty or badFlags.foreach(badf => badFlag(badf, s"'$badf' not allowed for a, A")) case _ => true - }) + ) case DateTimeXn => def hasCC = op.length == 2 or errorAt(CC)("Date/time conversion must have two characters") def goodCC = "HIklMSLNpzZsQBbhAaCYyjmdeRTrDFc".contains(cc) or errorAt(CC, 1)(s"'$cc' doesn't seem to be a date or time conversion") goodies && hasCC && goodCC && noPrecision && only_-("date/time conversions") case LiteralXn => - op match { + op match case "%" => goodies && noPrecision and width.foreach(_ => warningAt(Width)("width ignored on literal")) case "n" => noFlags && noWidth && noPrecision - } case ErrorXn => errorAt(CC)(s"illegal conversion character '$cc'") false - } + end verify // is the specifier OK with the given arg - def accepts(arg: ClassTag[?]): Boolean = + def accepts(arg: Type): Boolean = kind match - case BooleanXn => arg == classTag[Boolean] orElse warningAt(CC)("Boolean format is null test for non-Boolean") + case BooleanXn => arg == defn.BooleanType orElse warningAt(CC)("Boolean format is null test for non-Boolean") case IntegralXn => - arg == classTag[BigInt] || !cond(cc) { + arg == BigIntType || !cond(cc) { case 'o' | 'x' | 'X' if hasAnyFlag("+ (") => "+ (".filter(hasFlag).foreach(bad => badFlag(bad, s"only use '$bad' for BigInt conversions to o, x, X")) ; true } case _ => true // what arg type if any does the conversion accept - def acceptableVariants: List[ClassTag[?]] = - kind match { - case StringXn => if hasFlag('#') then classTag[Formattable] :: Nil else classTag[Any] :: Nil - case BooleanXn => classTag[Boolean] :: Conversion.FakeNullTag :: Nil - case HashXn => classTag[Any] :: Nil - case CharacterXn => classTag[Char] :: classTag[Byte] :: classTag[Short] :: classTag[Int] :: Nil - case IntegralXn => classTag[Int] :: classTag[Long] :: classTag[Byte] :: classTag[Short] :: classTag[BigInt] :: Nil - case FloatingPointXn => classTag[Double] :: classTag[Float] :: classTag[BigDecimal] :: Nil - case DateTimeXn => classTag[Long] :: classTag[Calendar] :: classTag[Date] :: Nil + def acceptableVariants: List[Type] = + kind match + case StringXn => if hasFlag('#') then FormattableType :: Nil else defn.AnyType :: Nil + case BooleanXn => defn.BooleanType :: defn.NullType :: Nil + case HashXn => defn.AnyType :: Nil + case CharacterXn => defn.CharType :: defn.ByteType :: defn.ShortType :: defn.IntType :: Nil + case IntegralXn => defn.IntType :: defn.LongType :: defn.ByteType :: defn.ShortType :: BigIntType :: Nil + case FloatingPointXn => defn.DoubleType :: defn.FloatType :: BigDecimalType :: Nil + case DateTimeXn => defn.LongType :: CalendarType :: DateType :: Nil case LiteralXn => Nil case ErrorXn => Nil - } // what flags does the conversion accept? private def okFlags: String = - kind match { + kind match case StringXn => "-#<" case BooleanXn | HashXn => "-<" case LiteralXn => "-" case _ => "-#+ 0,(<" - } def hasFlag(f: Char) = flags.contains(f) def hasAnyFlag(fs: String) = fs.exists(hasFlag) @@ -206,21 +246,6 @@ abstract class FormatChecker(using reporter: InterpolationReporter): def errorAt(g: SpecGroup, i: Int = 0)(msg: String) = reporter.partError(msg, argi, descriptor.offset(g, i)) def warningAt(g: SpecGroup, i: Int = 0)(msg: String) = reporter.partWarning(msg, argi, descriptor.offset(g, i)) - // various assertions - def noFlags = flags.isEmpty or errorAt(Flags)("flags not allowed") - def noWidth = width.isEmpty or errorAt(Width)("width not allowed") - def noPrecision = precision.isEmpty or errorAt(Precision)("precision not allowed") - def only_-(msg: String) = - val badFlags = flags.filterNot { case '-' | '<' => true case _ => false } - badFlags.isEmpty or badFlag(badFlags(0), s"Only '-' allowed for $msg") - def goodFlags = - val badFlags = flags.filterNot(okFlags.contains) - for f <- badFlags do badFlag(f, s"Illegal flag '$f'") - badFlags.isEmpty - def goodIndex = - if index.nonEmpty && hasFlag('<') then warningAt(Index)("Argument index ignored if '<' flag is present") - val okRange = index.map(i => i > 0 && i <= argc).getOrElse(true) - okRange || hasFlag('<') or errorAt(Index)("Argument index out of range") object Conversion: def apply(m: Match, i: Int): Conversion = def kindOf(cc: Char) = cc match @@ -243,5 +268,5 @@ abstract class FormatChecker(using reporter: InterpolationReporter): case None => new Conversion(m, i, ErrorXn).tap(_.errorAt(Spec)(s"Missing conversion operator in '${m.matched}'; $literalHelp")) end apply val literalHelp = "use %% for literal %, %n for newline" - private val FakeNullTag: ClassTag[?] = null end Conversion +end TypedFormatChecker diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala index 436b56710370..52869a5877c2 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala @@ -1,27 +1,11 @@ package dotty.tools.dotc package transform.localopt -import dotty.tools.dotc.ast.Trees._ -import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.core.Decorators._ +import dotty.tools.dotc.ast.tpd.* import dotty.tools.dotc.core.Constants.Constant -import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.StdNames._ -import dotty.tools.dotc.core.NameKinds._ -import dotty.tools.dotc.core.Symbols._ -import dotty.tools.dotc.core.Types._ -import dotty.tools.dotc.core.Phases.typerPhase -import dotty.tools.dotc.typer.ProtoTypes._ - -import scala.StringContext.processEscapes -import scala.annotation.tailrec -import scala.collection.mutable.{ListBuffer, Stack} -import scala.reflect.{ClassTag, classTag} -import scala.util.chaining._ -import scala.util.matching.Regex.Match +import dotty.tools.dotc.core.Contexts.* object FormatInterpolatorTransform: - import tpd._ class PartsReporter(fun: Tree, args0: Tree, parts: List[Tree], args: List[Tree])(using Context) extends InterpolationReporter: private var reported = false @@ -50,67 +34,6 @@ object FormatInterpolatorTransform: reported = false def restoreReported(): Unit = reported = oldReported end PartsReporter - object tags: - import java.util.{Calendar, Date, Formattable} - val StringTag = classTag[String] - val FormattableTag = classTag[Formattable] - val BigIntTag = classTag[BigInt] - val BigDecimalTag = classTag[BigDecimal] - val CalendarTag = classTag[Calendar] - val DateTag = classTag[Date] - class FormattableTypes(using Context): - val FormattableType = requiredClassRef("java.util.Formattable") - val BigIntType = requiredClassRef("scala.math.BigInt") - val BigDecimalType = requiredClassRef("scala.math.BigDecimal") - val CalendarType = requiredClassRef("java.util.Calendar") - val DateType = requiredClassRef("java.util.Date") - class TypedFormatChecker(val args: List[Tree])(using Context, InterpolationReporter) extends FormatChecker: - val reporter = summon[InterpolationReporter] - val argTypes = args.map(_.tpe) - val actuals = ListBuffer.empty[Tree] - val argc = argTypes.length - def argType(argi: Int, types: Seq[ClassTag[?]]) = - require(argi < argc, s"$argi out of range picking from $types") - val tpe = argTypes(argi) - types.find(t => argConformsTo(argi, tpe, argTypeOf(t))) - .orElse(types.find(t => argConvertsTo(argi, tpe, argTypeOf(t)))) - .getOrElse { - reporter.argError(s"Found: ${tpe.show}, Required: ${types.mkString(", ")}", argi) - actuals += args(argi) - types.head - } - final lazy val fmtTypes = FormattableTypes() - import tags.*, fmtTypes.* - def argConformsTo(argi: Int, arg: Type, target: Type): Boolean = - (arg <:< target).tap(if _ then actuals += args(argi)) - def argConvertsTo(argi: Int, arg: Type, target: Type): Boolean = - import typer.Implicits.SearchSuccess - atPhase(typerPhase) { - ctx.typer.inferView(args(argi), target) match - case SearchSuccess(view, ref, _, _) => actuals += view ; true - case _ => false - } - def argTypeOf(tag: ClassTag[?]): Type = tag match - case StringTag => defn.StringType - case ClassTag.Boolean => defn.BooleanType - case ClassTag.Byte => defn.ByteType - case ClassTag.Char => defn.CharType - case ClassTag.Short => defn.ShortType - case ClassTag.Int => defn.IntType - case ClassTag.Long => defn.LongType - case ClassTag.Float => defn.FloatType - case ClassTag.Double => defn.DoubleType - case ClassTag.Any => defn.AnyType - case ClassTag.AnyRef => defn.AnyRefType - case FormattableTag => FormattableType - case BigIntTag => BigIntType - case BigDecimalTag => BigDecimalType - case CalendarTag => CalendarType - case DateTag => DateType - case null => defn.NullType - case _ => reporter.strCtxError(s"Unknown type for format $tag") - defn.AnyType - end TypedFormatChecker /** For f"${arg}%xpart", check format conversions and return (format, args) * suitable for String.format(format, args). @@ -146,7 +69,7 @@ object FormatInterpolatorTransform: if reporter.hasReported then (literally(parts.mkString), args0) else assert(checker.argc == checker.actuals.size, s"Expected ${checker.argc}, actuals size is ${checker.actuals.size} for [${parts.mkString(", ")}]") - (literally(checked.mkString), tpd.SeqLiteral(checker.actuals.toList, elemtpt)) + (literally(checked.mkString), SeqLiteral(checker.actuals.toList, elemtpt)) end checked end FormatInterpolatorTransform diff --git a/compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala b/compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala deleted file mode 100644 index 984008c1f8ce..000000000000 --- a/compiler/test/dotty/tools/dotc/transform/FormatCheckerTest.scala +++ /dev/null @@ -1,70 +0,0 @@ -package dotty.tools -package dotc.transform - -import org.junit.{Test, Assert}, Assert.{assertEquals, assertFalse, assertTrue} - -import scala.collection.mutable.ListBuffer -import scala.language.implicitConversions -import scala.reflect.{ClassTag, classTag} - -import java.util.{Calendar, Date, Formattable} - -import localopt.{FormatChecker, InterpolationReporter} - -// TDD for just the Checker -class FormatCheckerTest: - class TestReporter extends InterpolationReporter: - private var reported = false - private var oldReported = false - val reports = ListBuffer.empty[(String, Int, Int)] - - def partError(message: String, index: Int, offset: Int): Unit = - reported = true - reports += ((message, index, offset)) - def partWarning(message: String, index: Int, offset: Int): Unit = - reported = true - reports += ((message, index, offset)) - def argError(message: String, index: Int): Unit = - reported = true - reports += ((message, index, 0)) - def strCtxError(message: String): Unit = - reported = true - reports += ((message, 0, 0)) - def argsError(message: String): Unit = - reports += ((message, 0, 0)) - - def hasReported: Boolean = reported - - def resetReported(): Unit = - oldReported = reported - reported = false - - def restoreReported(): Unit = - reported = oldReported - end TestReporter - given TestReporter = TestReporter() - - class TestChecker(args: ClassTag[?]*)(using val reporter: TestReporter) extends FormatChecker: - def argType(argi: Int, types: ClassTag[?]*): ClassTag[?] = types.find(_ == args(argi)).getOrElse(types.head) - val argc = args.length - - def checked(parts: String*)(args: ClassTag[?]*): String = - val checker = TestChecker(args*) - val (amended, _) = checker.checked(parts.toList) - assertFalse(checker.reporter.hasReported) - amended.mkString - def assertChecked(parts: String*)(args: ClassTag[?]*)(p: TestReporter => Boolean = _ => true): Unit = - val checker = TestChecker(args*) - checker.checked(parts.toList) - assertTrue(p(checker.reporter)) - def errorIs(msg: String): (TestReporter => Boolean) = _.reports.head._1.contains(msg) - - @Test def `simple string` = assertEquals("xyz", checked("xyz")()) - @Test def `one string` = assertEquals("xyz%s123", checked("xyz", "123")(classTag[String])) - @Test def `in first part` = assertEquals("x%ny%%z%s123", checked("x%ny%%z", "123")(classTag[String])) - @Test def `one int` = assertEquals("xyz%d123", checked("xyz", "%d123")(classTag[Int])) - //@Test def `one bad int`: Unit = assertChecked("xyz", "%d123")(classTag[String])(errorIs("Type error")) - @Test def `extra descriptor` = assertChecked("xyz", "%s12%d3")(classTag[String])(errorIs("conversions must follow")) - @Test def `bad leader`: Unit = assertChecked("%dxyz")()(_.reports.head._1.contains("conversions must follow")) - @Test def `in second part`: Unit = assertEquals("xyz%s1%n2%%3", checked("xyz", "1%n2%%3")(classTag[String])) - @Test def `something weird`: Unit = assertEquals("xyz%tH123", checked("xyz", "%tH123")(classTag[Calendar])) From c6eee0c91c688ae7f16735076a96fd2107a5edaf Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Sat, 22 Jan 2022 15:50:40 -0800 Subject: [PATCH 1146/1244] Drop special reporter --- .../transform/localopt/FormatChecker.scala | 41 +++++---- .../FormatInterpolatorTransform.scala | 89 ++----------------- 2 files changed, 32 insertions(+), 98 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala index 0f3a3ef4c154..94b10a5b538e 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala @@ -17,7 +17,7 @@ import dotty.tools.dotc.core.Types._ import dotty.tools.dotc.core.Phases.typerPhase /** Formatter string checker. */ -class TypedFormatChecker(args: List[Tree])(using Context)(using reporter: InterpolationReporter): +class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List[Tree])(using Context): val argTypes = args.map(_.tpe) val actuals = ListBuffer.empty[Tree] @@ -33,7 +33,7 @@ class TypedFormatChecker(args: List[Tree])(using Context)(using reporter: Interp types.find(t => argConformsTo(argi, tpe, t)) .orElse(types.find(t => argConvertsTo(argi, tpe, t))) .getOrElse { - reporter.argError(s"Found: ${tpe.show}, Required: ${types.mkString(", ")}", argi) + report.argError(s"Found: ${tpe.show}, Required: ${types.mkString(", ")}", argi) actuals += args(argi) types.head } @@ -64,20 +64,17 @@ class TypedFormatChecker(args: List[Tree])(using Context)(using reporter: Interp /** For N part strings and N-1 args to interpolate, normalize parts and check arg types. * - * Returns parts, possibly updated with explicit leading "%s", - * and conversions for each arg. - * - * Implementation must emit conversions required by invocations of `argType`. + * Returns normalized part strings and args, where args correcpond to conversions in tail of parts. */ - def checked(parts0: List[String]): (List[String], List[Conversion]) = + def checked: (List[String], List[Tree]) = val amended = ListBuffer.empty[String] val convert = ListBuffer.empty[Conversion] @tailrec - def loop(parts: List[String], n: Int): Unit = - parts match + def loop(remaining: List[String], n: Int): Unit = + remaining match case part0 :: more => - def badPart(t: Throwable): String = "".tap(_ => reporter.partError(t.getMessage, index = n, offset = 0)) + def badPart(t: Throwable): String = "".tap(_ => report.partError(t.getMessage, index = n, offset = 0)) val part = try StringContext.processEscapes(part0) catch badPart val matches = formatPattern.findAllMatchIn(part) @@ -112,8 +109,11 @@ class TypedFormatChecker(args: List[Tree])(using Context)(using reporter: Interp case Nil => () end loop - loop(parts0, n = 0) - (amended.toList, convert.toList) + loop(parts, n = 0) + if reported then (Nil, Nil) + else + assert(argc == actuals.size, s"Expected ${argc} args but got ${actuals.size} for [${parts.mkString(", ")}]") + (amended.toList, actuals.toList) end checked extension (descriptor: Match) @@ -146,7 +146,7 @@ class TypedFormatChecker(args: List[Tree])(using Context)(using reporter: Interp // the conversion char is the head of the op string (but see DateTimeXn) val cc: Char = kind match - case ErrorXn => '?' + case ErrorXn => if op.isEmpty then '?' else op(0) case DateTimeXn => if op.length > 1 then op(1) else '?' case _ => op(0) @@ -243,8 +243,8 @@ class TypedFormatChecker(args: List[Tree])(using Context)(using reporter: Interp val i = flags.indexOf(f) match { case -1 => 0 case j => j } errorAt(Flags, i)(msg) - def errorAt(g: SpecGroup, i: Int = 0)(msg: String) = reporter.partError(msg, argi, descriptor.offset(g, i)) - def warningAt(g: SpecGroup, i: Int = 0)(msg: String) = reporter.partWarning(msg, argi, descriptor.offset(g, i)) + def errorAt(g: SpecGroup, i: Int = 0)(msg: String) = report.partError(msg, argi, descriptor.offset(g, i)) + def warningAt(g: SpecGroup, i: Int = 0)(msg: String) = report.partWarning(msg, argi, descriptor.offset(g, i)) object Conversion: def apply(m: Match, i: Int): Conversion = @@ -269,4 +269,15 @@ class TypedFormatChecker(args: List[Tree])(using Context)(using reporter: Interp end apply val literalHelp = "use %% for literal %, %n for newline" end Conversion + + var reported = false + + private def partPosAt(index: Int, offset: Int) = + val pos = partsElems(index).sourcePos + pos.withSpan(pos.span.shift(offset)) + + extension (r: report.type) + def argError(message: String, index: Int): Unit = r.error(message, args(index).srcPos).tap(_ => reported = true) + def partError(message: String, index: Int, offset: Int): Unit = r.error(message, partPosAt(index, offset)).tap(_ => reported = true) + def partWarning(message: String, index: Int, offset: Int): Unit = r.warning(message, partPosAt(index, offset)).tap(_ => reported = true) end TypedFormatChecker diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala index 52869a5877c2..79d94c26c692 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatInterpolatorTransform.scala @@ -7,34 +7,6 @@ import dotty.tools.dotc.core.Contexts.* object FormatInterpolatorTransform: - class PartsReporter(fun: Tree, args0: Tree, parts: List[Tree], args: List[Tree])(using Context) extends InterpolationReporter: - private var reported = false - private var oldReported = false - private def partPosAt(index: Int, offset: Int) = - val pos = parts(index).sourcePos - pos.withSpan(pos.span.shift(offset)) - def partError(message: String, index: Int, offset: Int): Unit = - reported = true - report.error(message, partPosAt(index, offset)) - def partWarning(message: String, index: Int, offset: Int): Unit = - reported = true - report.warning(message, partPosAt(index, offset)) - def argError(message: String, index: Int): Unit = - reported = true - report.error(message, args(index).srcPos) - def strCtxError(message: String): Unit = - reported = true - report.error(message, fun.srcPos) - def argsError(message: String): Unit = - reported = true - report.error(message, args0.srcPos) - def hasReported: Boolean = reported - def resetReported(): Unit = - oldReported = reported - reported = false - def restoreReported(): Unit = reported = oldReported - end PartsReporter - /** For f"${arg}%xpart", check format conversions and return (format, args) * suitable for String.format(format, args). */ @@ -50,67 +22,18 @@ object FormatInterpolatorTransform: case _ => report.error("Expected statically known argument list", args0.srcPos) (Nil, EmptyTree) - given reporter: InterpolationReporter = PartsReporter(fun, args0, partsExpr, args) def literally(s: String) = Literal(Constant(s)) - inline val skip = false if parts.lengthIs != args.length + 1 then - reporter.strCtxError { + val badParts = if parts.isEmpty then "there are no parts" else s"too ${if parts.lengthIs > args.length + 1 then "few" else "many"} arguments for interpolated string" - } + report.error(badParts, fun.srcPos) (literally(""), args0) - else if skip then - val checked = parts.head :: parts.tail.map(p => if p.startsWith("%") then p else "%s" + p) - (literally(checked.mkString), args0) else - val checker = TypedFormatChecker(args) - val (checked, cvs) = checker.checked(parts) - if reporter.hasReported then (literally(parts.mkString), args0) - else - assert(checker.argc == checker.actuals.size, s"Expected ${checker.argc}, actuals size is ${checker.actuals.size} for [${parts.mkString(", ")}]") - (literally(checked.mkString), SeqLiteral(checker.actuals.toList, elemtpt)) + val checker = TypedFormatChecker(partsExpr, parts, args) + val (format, formatArgs) = checker.checked + if format.isEmpty then (literally(parts.mkString), args0) + else (literally(format.mkString), SeqLiteral(formatArgs.toList, elemtpt)) end checked end FormatInterpolatorTransform - -/** This trait defines a tool to report errors/warnings that do not depend on Position. */ -trait InterpolationReporter: - - /** Reports error/warning of size 1 linked with a part of the StringContext. - * - * @param message the message to report as error/warning - * @param index the index of the part inside the list of parts of the StringContext - * @param offset the index in the part String where the error is - * @return an error/warning depending on the function - */ - def partError(message: String, index: Int, offset: Int): Unit - def partWarning(message: String, index: Int, offset: Int): Unit - - /** Reports error linked with an argument to format. - * - * @param message the message to report as error/warning - * @param index the index of the argument inside the list of arguments of the format function - * @return an error depending on the function - */ - def argError(message: String, index: Int): Unit - - /** Reports error linked with the list of arguments or the StringContext. - * - * @param message the message to report in the error - * @return an error - */ - def strCtxError(message: String): Unit - def argsError(message: String): Unit - - /** Claims whether an error or a warning has been reported - * - * @return true if an error/warning has been reported, false - */ - def hasReported: Boolean - - /** Stores the old value of the reported and reset it to false */ - def resetReported(): Unit - - /** Restores the value of the reported boolean that has been reset */ - def restoreReported(): Unit -end InterpolationReporter From 6ced168e06843574f27f4db72bc1be5ac1885065 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Sun, 23 Jan 2022 12:01:40 -0800 Subject: [PATCH 1147/1244] Improve error position and recovery for bad dollar --- compiler/src/dotty/tools/dotc/parsing/Scanners.scala | 4 +++- compiler/test/dotty/tools/repl/ReplTest.scala | 5 +++-- tests/neg/interpolator-dollar.check | 4 ++++ tests/neg/interpolator-dollar.scala | 6 ++++++ 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 tests/neg/interpolator-dollar.check create mode 100644 tests/neg/interpolator-dollar.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index c2c13e899ef4..1fee0f52f770 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -1168,7 +1168,9 @@ object Scanners { finishNamedToken(IDENTIFIER, target = next) } else - error("invalid string interpolation: `$$`, `$\"`, `$`ident or `$`BlockExpr expected") + error("invalid string interpolation: `$$`, `$\"`, `$`ident or `$`BlockExpr expected", off = charOffset - 2) + putChar('$') + getStringPart(multiLine) } else { val isUnclosedLiteral = !isUnicodeEscape && (ch == SU || (!multiLine && (ch == CR || ch == LF))) diff --git a/compiler/test/dotty/tools/repl/ReplTest.scala b/compiler/test/dotty/tools/repl/ReplTest.scala index 55f8afa26260..d5256986f874 100644 --- a/compiler/test/dotty/tools/repl/ReplTest.scala +++ b/compiler/test/dotty/tools/repl/ReplTest.scala @@ -63,8 +63,9 @@ extends ReplDriver(options, new PrintStream(out, true, StandardCharsets.UTF_8.na case "" => Nil case nonEmptyLine => nonEmptyLine :: Nil } + def nonBlank(line: String): Boolean = line.exists(!Character.isWhitespace(_)) - val expectedOutput = lines.flatMap(filterEmpties) + val expectedOutput = lines.filter(nonBlank) val actualOutput = { val opts = toolArgsParse(lines.take(1)) val (optsLine, inputLines) = if opts.isEmpty then ("", lines) else (lines.head, lines.drop(1)) @@ -80,7 +81,7 @@ extends ReplDriver(options, new PrintStream(out, true, StandardCharsets.UTF_8.na out.linesIterator.foreach(buf.append) nstate } - (optsLine :: buf.toList).flatMap(filterEmpties) + (optsLine :: buf.toList).filter(nonBlank) } if !FileDiff.matches(actualOutput, expectedOutput) then diff --git a/tests/neg/interpolator-dollar.check b/tests/neg/interpolator-dollar.check new file mode 100644 index 000000000000..2de0c843725e --- /dev/null +++ b/tests/neg/interpolator-dollar.check @@ -0,0 +1,4 @@ +-- Error: tests/neg/interpolator-dollar.scala:5:20 --------------------------------------------------------------------- +5 | def oops = f"$s%s $ Date: Tue, 25 Jan 2022 11:27:24 -0800 Subject: [PATCH 1148/1244] Pretty print type on f-interpolator, improve caret Tweak vulpix to show difference in expectations. --- .../transform/localopt/FormatChecker.scala | 18 +- .../dotty/tools/vulpix/ParallelTesting.scala | 88 ++++---- tests/neg/f-interpolator-neg.check | 200 ++++++++++++++++++ tests/neg/f-interpolator-neg.scala | 4 +- tests/neg/f-interpolator-tests.check | 8 + 5 files changed, 269 insertions(+), 49 deletions(-) create mode 100644 tests/neg/f-interpolator-neg.check create mode 100644 tests/neg/f-interpolator-tests.check diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala index 94b10a5b538e..0ba7bd14a9b6 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala @@ -15,6 +15,7 @@ import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Types._ import dotty.tools.dotc.core.Phases.typerPhase +import dotty.tools.dotc.util.Spans.Span /** Formatter string checker. */ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List[Tree])(using Context): @@ -33,7 +34,7 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List types.find(t => argConformsTo(argi, tpe, t)) .orElse(types.find(t => argConvertsTo(argi, tpe, t))) .getOrElse { - report.argError(s"Found: ${tpe.show}, Required: ${types.mkString(", ")}", argi) + report.argError(s"Found: ${tpe.show}, Required: ${types.map(_.show).mkString(", ")}", argi) actuals += args(argi) types.head } @@ -118,6 +119,7 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List extension (descriptor: Match) def at(g: SpecGroup): Int = descriptor.start(g.ordinal) + def end(g: SpecGroup): Int = descriptor.end(g.ordinal) def offset(g: SpecGroup, i: Int = 0): Int = at(g) + i def group(g: SpecGroup): Option[String] = Option(descriptor.group(g.ordinal)) def stringOf(g: SpecGroup): String = group(g).getOrElse("") @@ -243,8 +245,8 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List val i = flags.indexOf(f) match { case -1 => 0 case j => j } errorAt(Flags, i)(msg) - def errorAt(g: SpecGroup, i: Int = 0)(msg: String) = report.partError(msg, argi, descriptor.offset(g, i)) - def warningAt(g: SpecGroup, i: Int = 0)(msg: String) = report.partWarning(msg, argi, descriptor.offset(g, i)) + def errorAt(g: SpecGroup, i: Int = 0)(msg: String) = report.partError(msg, argi, descriptor.offset(g, i), descriptor.end(g)) + def warningAt(g: SpecGroup, i: Int = 0)(msg: String) = report.partWarning(msg, argi, descriptor.offset(g, i), descriptor.end(g)) object Conversion: def apply(m: Match, i: Int): Conversion = @@ -272,12 +274,14 @@ class TypedFormatChecker(partsElems: List[Tree], parts: List[String], args: List var reported = false - private def partPosAt(index: Int, offset: Int) = + private def partPosAt(index: Int, offset: Int, end: Int) = val pos = partsElems(index).sourcePos - pos.withSpan(pos.span.shift(offset)) + val bgn = pos.span.start + offset + val fin = if end < 0 then pos.span.end else pos.span.start + end + pos.withSpan(Span(bgn, fin, bgn)) extension (r: report.type) def argError(message: String, index: Int): Unit = r.error(message, args(index).srcPos).tap(_ => reported = true) - def partError(message: String, index: Int, offset: Int): Unit = r.error(message, partPosAt(index, offset)).tap(_ => reported = true) - def partWarning(message: String, index: Int, offset: Int): Unit = r.warning(message, partPosAt(index, offset)).tap(_ => reported = true) + def partError(message: String, index: Int, offset: Int, end: Int = -1): Unit = r.error(message, partPosAt(index, offset, end)).tap(_ => reported = true) + def partWarning(message: String, index: Int, offset: Int, end: Int = -1): Unit = r.warning(message, partPosAt(index, offset, end)).tap(_ => reported = true) end TypedFormatChecker diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index a497eed7072e..b2b4942ccb1b 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -14,13 +14,14 @@ import java.util.concurrent.{TimeUnit, TimeoutException, Executors => JExecutors import scala.collection.mutable import scala.io.{Codec, Source} +import scala.jdk.CollectionConverters.* import scala.util.{Random, Try, Failure => TryFailure, Success => TrySuccess, Using} import scala.util.control.NonFatal import scala.util.matching.Regex import scala.collection.mutable.ListBuffer import dotc.{Compiler, Driver} -import dotc.core.Contexts._ +import dotc.core.Contexts.* import dotc.decompiler import dotc.report import dotc.interfaces.Diagnostic.ERROR @@ -750,17 +751,26 @@ trait ParallelTesting extends RunnerOrchestration { self => def compilerCrashed = reporters.exists(_.compilerCrashed) lazy val (errorMap, expectedErrors) = getErrorMapAndExpectedCount(testSource.sourceFiles.toIndexedSeq) lazy val actualErrors = reporters.foldLeft(0)(_ + _.errorCount) - def hasMissingAnnotations = getMissingExpectedErrors(errorMap, reporters.iterator.flatMap(_.errors)) + lazy val (expected, unexpected) = getMissingExpectedErrors(errorMap, reporters.iterator.flatMap(_.errors)) + def hasMissingAnnotations = expected.nonEmpty || unexpected.nonEmpty def showErrors = "-> following the errors:\n" + - reporters.flatMap(_.allErrors.map(e => (e.pos.line + 1).toString + ": " + e.message)).mkString(start = "at ", sep = "\n at ", end = "") - - if (compilerCrashed) Some(s"Compiler crashed when compiling: ${testSource.title}") - else if (actualErrors == 0) Some(s"\nNo errors found when compiling neg test $testSource") - else if (expectedErrors == 0) Some(s"\nNo errors expected/defined in $testSource -- use // error or // nopos-error") - else if (expectedErrors != actualErrors) Some(s"\nWrong number of errors encountered when compiling $testSource\nexpected: $expectedErrors, actual: $actualErrors " + showErrors) - else if (hasMissingAnnotations) Some(s"\nErrors found on incorrect row numbers when compiling $testSource\n$showErrors") - else if (!errorMap.isEmpty) Some(s"\nExpected error(s) have {=}: $errorMap") - else None + reporters.flatMap(_.allErrors.sortBy(_.pos.line).map(e => s"${e.pos.line + 1}: ${e.message}")).mkString(" at ", "\n at ", "") + + Option { + if compilerCrashed then s"Compiler crashed when compiling: ${testSource.title}" + else if actualErrors == 0 then s"\nNo errors found when compiling neg test $testSource" + else if expectedErrors == 0 then s"\nNo errors expected/defined in $testSource -- use // error or // nopos-error" + else if expectedErrors != actualErrors then + s"""|Wrong number of errors encountered when compiling $testSource + |expected: $expectedErrors, actual: $actualErrors + |${expected.mkString("Unfulfilled expectations:\n", "\n", "")} + |${unexpected.mkString("Unexpected errors:\n", "\n", "")} + |$showErrors + |""".stripMargin.trim.linesIterator.mkString("\n", "\n", "") + else if hasMissingAnnotations then s"\nErrors found on incorrect row numbers when compiling $testSource\n$showErrors" + else if !errorMap.isEmpty then s"\nExpected error(s) have {=}: $errorMap" + else null + } } override def onSuccess(testSource: TestSource, reporters: Seq[TestReporter], logger: LoggedRunnable): Unit = @@ -783,7 +793,7 @@ trait ParallelTesting extends RunnerOrchestration { self => source.getLines.zipWithIndex.foreach { case (line, lineNbr) => val errors = line.toSeq.sliding("// error".length).count(_.unwrap == "// error") if (errors > 0) - errorMap.put(s"${file.getPath}:$lineNbr", errors) + errorMap.put(s"${file.getPath}:${lineNbr+1}", errors) val noposErrors = line.toSeq.sliding("// nopos-error".length).count(_.unwrap == "// nopos-error") if (noposErrors > 0) { @@ -813,34 +823,32 @@ trait ParallelTesting extends RunnerOrchestration { self => (errorMap, expectedErrors) } - def getMissingExpectedErrors(errorMap: HashMap[String, Integer], reporterErrors: Iterator[Diagnostic]) = !reporterErrors.forall { error => - val pos1 = error.pos.nonInlined - val key = if (pos1.exists) { - def toRelative(path: String): String = // For some reason, absolute paths leak from the compiler itself... - path.split(JFile.separatorChar).dropWhile(_ != "tests").mkString(JFile.separator) - val fileName = toRelative(pos1.source.file.toString) - s"$fileName:${pos1.line}" - - } else "nopos" - - val errors = errorMap.get(key) - - def missing = { echo(s"Error reported in ${pos1.source}, but no annotation found") ; false } - - if (errors ne null) { - if (errors == 1) errorMap.remove(key) - else errorMap.put(key, errors - 1) - true - } - else if key == "nopos" then - missing - else - errorMap.get("anypos") match - case null => missing - case 1 => errorMap.remove("anypos") ; true - case slack => if slack < 1 then missing - else errorMap.put("anypos", slack - 1) ; true - } + // return unfulfilled expected errors and unexpected diagnostics + def getMissingExpectedErrors(errorMap: HashMap[String, Integer], reporterErrors: Iterator[Diagnostic]): (List[String], List[String]) = + val unexpected, unpositioned = ListBuffer.empty[String] + // For some reason, absolute paths leak from the compiler itself... + def relativize(path: String): String = path.split(JFile.separatorChar).dropWhile(_ != "tests").mkString(JFile.separator) + def seenAt(key: String): Boolean = + errorMap.get(key) match + case null => false + case 1 => errorMap.remove(key) ; true + case n => errorMap.put(key, n - 1) ; true + def sawDiagnostic(d: Diagnostic): Unit = + d.pos.nonInlined match + case srcpos if srcpos.exists => + val key = s"${relativize(srcpos.source.file.toString)}:${srcpos.line + 1}" + if !seenAt(key) then unexpected += key + case srcpos => + if !seenAt("nopos") then unpositioned += relativize(srcpos.source.file.toString) + + reporterErrors.foreach(sawDiagnostic) + + errorMap.get("anypos") match + case n if n == unexpected.size => errorMap.remove("anypos") ; unexpected.clear() + case _ => + + (errorMap.asScala.keys.toList, (unexpected ++ unpositioned).toList) + end getMissingExpectedErrors } private final class NoCrashTest(testSources: List[TestSource], times: Int, threadLimit: Option[Int], suppressAllOutput: Boolean)(implicit summaryReport: SummaryReporting) diff --git a/tests/neg/f-interpolator-neg.check b/tests/neg/f-interpolator-neg.check new file mode 100644 index 000000000000..ea8df052589e --- /dev/null +++ b/tests/neg/f-interpolator-neg.check @@ -0,0 +1,200 @@ +-- Error: tests/neg/f-interpolator-neg.scala:4:4 ----------------------------------------------------------------------- +4 | new StringContext().f() // error + | ^^^^^^^^^^^^^^^^^^^^^ + | there are no parts +-- Error: tests/neg/f-interpolator-neg.scala:5:4 ----------------------------------------------------------------------- +5 | new StringContext("", " is ", "%2d years old").f(s) // error + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | too few arguments for interpolated string +-- Error: tests/neg/f-interpolator-neg.scala:6:4 ----------------------------------------------------------------------- +6 | new StringContext("", " is ", "%2d years old").f(s, d, d) // error + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | too many arguments for interpolated string +-- Error: tests/neg/f-interpolator-neg.scala:7:4 ----------------------------------------------------------------------- +7 | new StringContext("", "").f() // error + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | too few arguments for interpolated string +-- Error: tests/neg/f-interpolator-neg.scala:11:7 ---------------------------------------------------------------------- +11 | f"$s%b" // error + | ^ + | Found: (s : String), Required: Boolean, Null +-- Error: tests/neg/f-interpolator-neg.scala:12:7 ---------------------------------------------------------------------- +12 | f"$s%c" // error + | ^ + | Found: (s : String), Required: Char, Byte, Short, Int +-- Error: tests/neg/f-interpolator-neg.scala:13:7 ---------------------------------------------------------------------- +13 | f"$f%c" // error + | ^ + | Found: (f : Double), Required: Char, Byte, Short, Int +-- Error: tests/neg/f-interpolator-neg.scala:14:7 ---------------------------------------------------------------------- +14 | f"$s%x" // error + | ^ + | Found: (s : String), Required: Int, Long, Byte, Short, BigInt +-- Error: tests/neg/f-interpolator-neg.scala:15:7 ---------------------------------------------------------------------- +15 | f"$b%d" // error + | ^ + | Found: (b : Boolean), Required: Int, Long, Byte, Short, BigInt +-- Error: tests/neg/f-interpolator-neg.scala:16:7 ---------------------------------------------------------------------- +16 | f"$s%d" // error + | ^ + | Found: (s : String), Required: Int, Long, Byte, Short, BigInt +-- Error: tests/neg/f-interpolator-neg.scala:17:7 ---------------------------------------------------------------------- +17 | f"$f%o" // error + | ^ + | Found: (f : Double), Required: Int, Long, Byte, Short, BigInt +-- Error: tests/neg/f-interpolator-neg.scala:18:7 ---------------------------------------------------------------------- +18 | f"$s%e" // error + | ^ + | Found: (s : String), Required: Double, Float, BigDecimal +-- Error: tests/neg/f-interpolator-neg.scala:19:7 ---------------------------------------------------------------------- +19 | f"$b%f" // error + | ^ + | Found: (b : Boolean), Required: Double, Float, BigDecimal +-- Error: tests/neg/f-interpolator-neg.scala:20:9 ---------------------------------------------------------------------- +20 | f"$s%i" // error + | ^ + | illegal conversion character 'i' +-- Error: tests/neg/f-interpolator-neg.scala:24:9 ---------------------------------------------------------------------- +24 | f"$s%+ 0,(s" // error + | ^^^^^ + | Illegal flag '+' +-- Error: tests/neg/f-interpolator-neg.scala:25:9 ---------------------------------------------------------------------- +25 | f"$c%#+ 0,(c" // error + | ^^^^^^ + | Only '-' allowed for c conversion +-- Error: tests/neg/f-interpolator-neg.scala:26:9 ---------------------------------------------------------------------- +26 | f"$d%#d" // error + | ^ + | # not allowed for d conversion +-- Error: tests/neg/f-interpolator-neg.scala:27:9 ---------------------------------------------------------------------- +27 | f"$d%,x" // error + | ^ + | ',' only allowed for d conversion of integral types +-- Error: tests/neg/f-interpolator-neg.scala:28:9 ---------------------------------------------------------------------- +28 | f"$d%+ (x" // error + | ^^^ + | only use '+' for BigInt conversions to o, x, X +-- Error: tests/neg/f-interpolator-neg.scala:29:9 ---------------------------------------------------------------------- +29 | f"$f%,(a" // error + | ^^ + | ',' not allowed for a, A +-- Error: tests/neg/f-interpolator-neg.scala:30:9 ---------------------------------------------------------------------- +30 | f"$t%#+ 0,(tT" // error + | ^^^^^^ + | Only '-' allowed for date/time conversions +-- Error: tests/neg/f-interpolator-neg.scala:31:7 ---------------------------------------------------------------------- +31 | f"%-#+ 0,(n" // error + | ^^^^^^^ + | flags not allowed +-- Error: tests/neg/f-interpolator-neg.scala:32:7 ---------------------------------------------------------------------- +32 | f"%#+ 0,(%" // error + | ^^^^^^ + | Illegal flag '#' +-- Error: tests/neg/f-interpolator-neg.scala:36:9 ---------------------------------------------------------------------- +36 | f"$c%.2c" // error + | ^^ + | precision not allowed +-- Error: tests/neg/f-interpolator-neg.scala:37:9 ---------------------------------------------------------------------- +37 | f"$d%.2d" // error + | ^^ + | precision not allowed +-- Error: tests/neg/f-interpolator-neg.scala:38:7 ---------------------------------------------------------------------- +38 | f"%.2%" // error + | ^^ + | precision not allowed +-- Error: tests/neg/f-interpolator-neg.scala:39:7 ---------------------------------------------------------------------- +39 | f"%.2n" // error + | ^^ + | precision not allowed +-- Error: tests/neg/f-interpolator-neg.scala:40:9 ---------------------------------------------------------------------- +40 | f"$f%.2a" // error + | ^^ + | precision not allowed +-- Error: tests/neg/f-interpolator-neg.scala:41:9 ---------------------------------------------------------------------- +41 | f"$t%.2tT" // error + | ^^ + | precision not allowed +-- Error: tests/neg/f-interpolator-neg.scala:45:7 ---------------------------------------------------------------------- +45 | f"% Date: Thu, 3 Feb 2022 13:02:20 -0800 Subject: [PATCH 1149/1244] Use normal string escaping for f --- compiler/src/dotty/tools/dotc/parsing/Scanners.scala | 2 +- compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala | 2 +- .../src/scala/quoted/runtime/impl/printers/SourceCode.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index 1fee0f52f770..18f4f542b86c 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -1253,7 +1253,7 @@ object Scanners { nextChar() } } - val alt = if oct == LF then raw"\n" else f"${"\\"}u$oct%04x" + val alt = if oct == LF then raw"\n" else f"\\u$oct%04x" error(s"octal escape literals are unsupported: use $alt instead", start) putChar(oct.toChar) } diff --git a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala index 197a2e6ded9c..dd5d55b21f50 100644 --- a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -542,7 +542,7 @@ class PlainPrinter(_ctx: Context) extends Printer { case '"' => "\\\"" case '\'' => "\\\'" case '\\' => "\\\\" - case _ => if (ch.isControl) f"${"\\"}u${ch.toInt}%04x" else String.valueOf(ch) + case _ => if ch.isControl then f"\\u${ch.toInt}%04x" else String.valueOf(ch) } def toText(const: Constant): Text = const.tag match { diff --git a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala index b259b3f21b86..88ee3e985277 100644 --- a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala +++ b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala @@ -1423,7 +1423,7 @@ object SourceCode { case '"' => "\\\"" case '\'' => "\\\'" case '\\' => "\\\\" - case _ => if (ch.isControl) f"${"\\"}u${ch.toInt}%04x" else String.valueOf(ch) + case _ => if ch.isControl then f"\\u${ch.toInt}%04x" else String.valueOf(ch) } private def escapedString(str: String): String = str flatMap escapedChar From 563241f60c201cc13164e3ca6e36a3937fac2ed4 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Fri, 28 Jan 2022 04:16:46 -0800 Subject: [PATCH 1150/1244] Collect error comments Prefer a regex for collecting magic error comments. Allow arbitrary space after line comment but warn that no space `//error` disables that error, which is useful for testing and development. --- .../dotty/tools/vulpix/ParallelTesting.scala | 43 +++++++------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index b2b4942ccb1b..bd30e7fff98e 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -785,43 +785,32 @@ trait ParallelTesting extends RunnerOrchestration { self => // // We collect these in a map `"file:row" -> numberOfErrors`, for // nopos errors we save them in `"file" -> numberOfNoPosErrors` - def getErrorMapAndExpectedCount(files: Seq[JFile]): (HashMap[String, Integer], Int) = { + def getErrorMapAndExpectedCount(files: Seq[JFile]): (HashMap[String, Integer], Int) = + val comment = raw"//( *)(nopos-|anypos-)?error".r val errorMap = new HashMap[String, Integer]() var expectedErrors = 0 + def bump(key: String): Unit = + errorMap.get(key) match + case null => errorMap.put(key, 1) + case n => errorMap.put(key, n+1) + expectedErrors += 1 files.filter(isSourceFile).foreach { file => Using(Source.fromFile(file, StandardCharsets.UTF_8.name)) { source => source.getLines.zipWithIndex.foreach { case (line, lineNbr) => - val errors = line.toSeq.sliding("// error".length).count(_.unwrap == "// error") - if (errors > 0) - errorMap.put(s"${file.getPath}:${lineNbr+1}", errors) - - val noposErrors = line.toSeq.sliding("// nopos-error".length).count(_.unwrap == "// nopos-error") - if (noposErrors > 0) { - val nopos = errorMap.get("nopos") - val existing: Integer = if (nopos eq null) 0 else nopos - errorMap.put("nopos", noposErrors + existing) - } - - val anyposErrors = line.toSeq.sliding("// anypos-error".length).count(_.unwrap == "// anypos-error") - if (anyposErrors > 0) { - val anypos = errorMap.get("anypos") - val existing: Integer = if (anypos eq null) 0 else anypos - errorMap.put("anypos", anyposErrors + existing) - } - - val possibleTypos = List("//error" -> "// error", "//nopos-error" -> "// nopos-error", "//anypos-error" -> "// anypos-error") - for ((possibleTypo, expected) <- possibleTypos) { - if (line.contains(possibleTypo)) - echo(s"Warning: Possible typo in error tag in file ${file.getCanonicalPath}:$lineNbr: found `$possibleTypo` but expected `$expected`") + comment.findAllMatchIn(line).foreach { m => + m.group(2) match + case prefix if m.group(1).isEmpty => + val what = Option(prefix).getOrElse("") + echo(s"Warning: ${file.getCanonicalPath}:${lineNbr}: found `//${what}error` but expected `// ${what}error`, skipping comment") + case "nopos-" => bump("nopos") + case "anypos-" => bump("anypos") + case _ => bump(s"${file.getPath}:${lineNbr+1}") } - - expectedErrors += anyposErrors + noposErrors + errors } }.get } - (errorMap, expectedErrors) - } + end getErrorMapAndExpectedCount // return unfulfilled expected errors and unexpected diagnostics def getMissingExpectedErrors(errorMap: HashMap[String, Integer], reporterErrors: Iterator[Diagnostic]): (List[String], List[String]) = From df5f0c0b1de907560c0ac7222320e3d983a84aa4 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 8 Feb 2022 20:00:57 +0100 Subject: [PATCH 1151/1244] Add doc page for capture checking. Add doc page that explains what capture checking is, emphasizing that it is still a research project in a separate branch. --- docs/docs/reference/experimental/cc.md | 716 +++++++++++++++++++++++++ docs/sidebar.yml | 1 + 2 files changed, 717 insertions(+) create mode 100644 docs/docs/reference/experimental/cc.md diff --git a/docs/docs/reference/experimental/cc.md b/docs/docs/reference/experimental/cc.md new file mode 100644 index 000000000000..f7134e98d9ad --- /dev/null +++ b/docs/docs/reference/experimental/cc.md @@ -0,0 +1,716 @@ +--- +layout: doc-page +title: "Capture Checking" +movedTo: https://docs.scala-lang.org/scala3/reference/experimental/cc.html +--- + +Capture checking is a research project that modifies the Scala type system to track references to capabilities in values. It is currently +implemented in an experimental branch [cc-experiment](https://github.com/lampepfl/dotty/tree/cc-experiment) in the dotty +repo and can be enabled on this branch with a `-Ycc` compiler option. + +To get an idea what capture checking can do, let's start with a small example: +```scala +def usingLogFile[T](op: FileOutputStream => T): T = + val logFile = FileOutputStream("log") + val result = op(logFile) + logFile.close() + result +``` +The `usingLogFile` method invokes a given operation with a fresh log file as parameter. Once the operation has ended, the log file is closed and the +operation's result is returned. This is a typical _try-with-resources_ pattern, similar to many other such patterns which are often supported by special language constructs in other languages. + +The problem is that `usingLogFile`'s implementation is not entirely safe. One can +undermine it by passing an operation that performs the logging at some later point +after it has terminated. For instance: +```scala +val later = usingLogFile { file => () => file.write(0) } +later() // crash +``` +When `later` is executed it tries to write to a file that is already closed, which +results in an uncaught `IOException`. + +Capture checking gives us the mechanism to prevent such errors _statically_. To +prevent unsafe usages of `usingLogFile`, we can declare it like this: +```scala +def usingLogFile[T](op: ({*} FileOutputStream) => T): T = + // same body as before +``` +The only thing that's changed is that the `FileOutputStream` parameter of `op` is now +tagged with `{*}`. We'll see that this turns the parameter into a _capability_ whose lifetime is tracked. + +If we now try to define the problematic value `later`, we get a static error: +``` + | val later = usingLogFile { f => () => f.write(0) } + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |The expression's type {*} () -> Unit is not allowed to capture the root capability `*`. + |This usually means that a capability persists longer than its allowed lifetime. +``` +In this case, it was easy to see that the `logFile` capability escapes in the closure passed to `usingLogFile`. But capture checking also works for more complex cases. +For instance, capture checking is able to distinguish between the following safe code: +```scala +val xs = usingLogFile { f => + List(1, 2, 3).map { x => f.write(x); x * x } +} +``` +and the following unsafe one: +```scala +val xs = usingLogFile { f => + LazyList(1, 2, 3).map { x => f.write(x); x * x } +} +``` +An error would be issued in the second case, but not the first one (this assumes a capture-aware +formulation of `LazyList` which we will present later in this page). + +It turns out that capture checking has very broad applications. Besides the various +try-with-resources patterns, it can also be a key part to the solutions of many other long standing problems in programming languages. Among them: + + - How to have a simple and flexible system for checked exceptions. We show later + how capture checking enables a clean and fully safe system for checked exceptions in Scala. + - How to address the problem of effect polymorphism in general. + - How to solve the "what color is your function?" problem of mixing synchronous + and asynchronous computations. + - How to do region-based allocation, safely, + - How to reason about capabilities associated with memory locations. + +The following sections explain in detail how capture checking works in Scala 3. + + +## Overview + +The capture checker extension introduces a new kind of types and it enforces some rules for working with these types. + +Capture checking is enabled by the compiler option `-Ycc`. If the option is not given, the new +type forms can still be written but they are not checked for consistency, because they are +treated simply as certain uninterpreted annotated types. + +## Capabilities and Capturing Types + +Capture checking is done in terms of _capturing types_ of the form +`{c₁, ..., cᵢ} T`. Here `T` is a type, and `{c₁, ..., cᵢ}` is a _capture set_ consisting of references to capabilities `c₁, ..., cᵢ`. + +A _capability_ is syntactically a method- or class-parameter, a local variable, or the `this` of an enclosing class. The type of a capability +must be a capturing type with a non-empty capture set. We also say that +variables that are capabilities are _tracked_. + +In a sense, every +capability gets its authority from some other, more sweeping capability which it captures. The most sweeping capability, from which ultimately all others are derived is written `*`. We call it the _universal capability_. + +Here is an example: +```scala +class FileSystem + +class Logger(fs: {*} FileSystem): + def log(s: String): Unit = ... // Write to a log file, using `fs` + +def test(fs: {*} FileSystem) = + val l: {fs} Logger = Logger(fs) + l.log("hello world!") + val xs: {l} LazyList[Int] = + LazyList.from(1) + .map { i => + l.log(s"computing elem # $i") + i * i + } + xs +``` +Here, the `test` method takes a `FileSystem` as a parameter. `fs` is a capability since its type has a non-empty capture set. The capability is passed the `Logger` constructor +and retained as a field in class `Logger`. Hence, the local variable `l` has type +`{fs} Logger`: it is a `Logger` which retains the `fs` capability. + +The second variable defined in `test` is `xs`, a lazy list that is obtained from +`LazyList.from(1)` by logging and mapping consecutive numbers. Since the list is lazy, +it needs to retain the reference to the logger `l` for its computations. Hence, the +type of the list is `{l} LazyList[Int]`. On the other hand, since `xs` only logs but does +not do other file operations, it retains the `fs` capability only indirectly. That's why +`fs` does not show up in the capture set of `xs`. + +Capturing types come with a subtype relation where types with "smaller" capture sets are subtypes of types with larger sets (the _subcapturing_ relation is defined in more detail below). If a type `T` does not have a capture set, it is called _pure_, and is a subtype of +any capturing type that adds a capture set to `T`. + +## Function Types + +The usual function type `A => B` now stands for a function that can capture arbitrary capabilities. We call such functions +_impure_. By contrast, the new single arrow function type `A -> B` stands for a function that cannot capture any capabilities, or otherwise said, is _pure_. One can add a capture set in front of an otherwise pure function. +For instance, `{c, d} A -> B` would be a function that can capture capabilities `c` and `d`, but no others. + +The impure function type `A => B` is treated as an alias for `{*} A -> B`. That is, impure functions are functions that can capture anything. + +Function types and captures both associate to the right, so +```scala +{c} A -> {d} B -> C +``` +is the same as +```scala +{c} (A -> {d} (B -> C)) +``` +Contrast with +```scala +({c} A) -> ({d} B)) -> C +``` +which is a curried pure function over argument types that can capture `c` and `d`, respectively. + +Analogous conventions apply to context function types. `A ?=> B` is an impure context function, with `A ?-> B` as its pure complement. + +**Note 1:** The identifiers `->` and `?->` are now treated as soft keywords when used as infix type operators. They are +still available as regular identifiers for terms. For instance, the mapping syntax `Map("x" -> 1, "y" -> 2)` is still supported since it only applies to terms. + +**Note 2:** The distinctions between pure vs impure function types do not apply to methods. In fact, since methods are not values they never capture anything directly. References to +capabilities in a method are instead counted in the capture set of the enclosing object. + +## By-Name Parameter Types + +A convention analogous to function types also extends to by-name parameters. In +```scala +def f(x: => Int): Int +``` +the actual argument can refer to arbitrary capabilities. So the following would be OK: +```scala +f(if p(y) then throw Ex() else 1) +``` +On the other hand, if `f` was defined like this +```scala +def f(x: -> Int): Int +``` +the actual argument to `f` could not refer to any capabilities, so the call above would be rejected. +One can also allow specific capabilities like this: +```scala +def f(x: {c}-> Int): Int +``` +Here, the actual argument to `f` is allowed to use the `c` capability but no others. + +**Note**: It is strongly recommended to write the capability set and the arrow `->` without intervening spaces, +as otherwise the notation would look confusingly like a function type. + +## Subtyping and Subcapturing + +Capturing influences subtyping. As usual we write `T₁ <: T₂` to express that the type +`T₁` is a subtype of the type `T₂`, or equivalently, that `T₁` conforms to `T₂`. An +analogous _subcapturing_ relation applies to capture sets. If `C₁` and `C₂` are capture sets, we write `C₁ <: C₂` to express that `C₁` _is covered by_ `C₂`, or, swapping the operands, that `C₂` _covers_ `C₁`. + +Subtyping extends as follows to capturing types: + + - Pure types are subtypes of capturing types. That is, `T <: C T`, for any type `T`, capturing set `C`. + - For capturing types, smaller capturing sets produce subtypes: `C₁ T₁ <: C₂ T₂` if + `C₁ <: C₂` and `T₁ <: T₂`. + +A subcapturing relation `C₁ <: C₂` holds if `C₂` _accounts for_ every element `c` in `C₁`. This means one of the following three conditions must be true: + + - `c ∈ C₂`, + - `c` refers to a parameter of some class `Cls` and `C₂` contains `Cls.this`, + - `c`'s type has capturing set `C` and `C₂` accounts for every element of `C` (that is, `C <: C₂`). + + +**Example 1.** Given +```scala +fs: {*} FileSystem +ct: {*} CanThrow[Exception] +l : {fs} Logger +``` +we have +``` +{l} <: {fs} <: {*} +{fs} <: {fs, ct} <: {*} +{ct} <: {fs, ct} <: {*} +``` +The set consisting of the root capability `{*}` covers every other capture set. This is +a consequence of the fact that, ultimately, every capability is created from `*`. + +**Example 2.** Consider again the FileSystem/Logger example from before. `LazyList[Int]` is a proper subtype of `{l} LazyList[Int]`. So if the `test` method in that example +was declared with a result type `LazyList[Int]`, we'd get a type error. Here is the error message: +``` +11 |def test(using fs: {*} FileSystem): LazyList[Int] = { + | ^ + | Found: {fs} LazyList[Int] + | Required: LazyList[Int] +``` +Why does is say `{fs} LazyList[Int]` and not `{l} LazyList[Int]`, which is, after all, the type of the returned value `xs`? The reason is that `l` is a local variable in the body of `test`, so it cannot be referred to in a type outside that body. What happens instead is that the type is _widened_ to the smallest supertype that does not mention `l`. Since `l` has capture set `fs`, we have that `{fs}` covers `{l}`, and `{fs}` is acceptable as in a result type of `test`, so `{fs}` is the result of that widening. +This widening is called _avoidance_; it is not specific to capture checking but applies to all variable references in Scala types. + +## Capability Classes + +Classes like `CanThrow` or `FileSystem` have the property that their values are always intended to be capabilities. We can make this intention explicit and save boilerplate by declaring these classes with a `@capability` annotation. + +The capture set of a capability class type is always `{*}`. This means we could equivalently express the `FileSystem` and `Logger` classes as follows: +```scala +import annotation.capability + +@capability class FileSystem + +class Logger(using FileSystem): + def log(s: String): Unit = ??? + +def test(using fs: FileSystem) = + val l: {fs} Logger = Logger() + ... +``` +In this version, `FileSystem` is a capability class, which means that the `{*}` capture set is implied on the parameters of `Logger` and `test`. Writing the capture set explicitly produces a warning: +```scala +class Logger(using {*} FileSystem): + ^^^^^^^^^^^^^^ + redundant capture: FileSystem already accounts for * +``` +Another, unrelated change in the version of the last example here is that the `FileSystem` capability is now passed as an implicit parameter. It is quite natural to model capabilities with implicit parameters since it greatly reduces the wiring overhead once multiple capabilities are in play. + +## Capture Checking of Closures + +If a closure refers to capabilities in its body, it captures these capabilities in its type. For instance, consider: +```scala +def test(fs: FileSystem): {fs} String -> Unit = + (x: String) => Logger(fs).log(x) +``` +Here, the body of `test` is a lambda that refers to the capability `fs`, which means that `fs` is retained in the lambda. +Consequently, the type of the lambda is `{fs} String => Unit`. + +**Note:** Function values are always written with `=>` (or `?=>` for context functions). There is no syntactic +distinction for pure _vs_ impure function values. The distinction is only made in their types. + +A closure also captures all capabilities that are captured by the functions +it calls. For instance, in +```scala +def test(fs: FileSystem) = + def f() = g() + def g() = (x: String) => Logger(fs).log(x) + f +``` +the result of `test` has type `{fs} String => Unit` even though function `f` +itself does not refer to `fs`. + +## Capture Checking of Classes + +The principles for capture checking closures also applies to classes. For instance, consider: +```scala +class Logger(using fs: FileSystem): + def log(s: String): Unit = ... summon[FileSystem] ... + +def test(xfs: FileSystem): {xfs} Logger = + Logger(xfs) +``` +Here, class `Logger` retains the capability `fs` as a (private) field. Hence, the result +of `test` is of type `{xfs} Logger` + +Sometimes, a tracked capability is meant to be used only in the constructor of a class, but +is not intended to be retained as a field. This fact can be communicated to the capture +checker by declaring the parameter as `@constructorOnly`. Example: +```scala +import annotation.constructorOnly + +class NullLogger(using @constructorOnly fs: FileSystem): + ... +def test2(using fs: FileSystem): NullLogger = NullLogger() // OK +``` + +The captured references of a class include _local capabilities_ and _argument capabilities_. Local capabilities are capabilities defined outside the class and referenced from its body. Argument capabilities are passed as parameters to the primary constructor of the class. Local capabilities are inherited: +the local capabilities of a superclass are also local capabilities of its subclasses. Example: + +```scala +@capability class Cap + +def test(a: Cap, b: Cap, c: Cap) = + class Super(y: Cap): + def f = a + class Sub(x: Cap) extends Super(x) + def g = b + Sub(c) +``` +Here class `Super` has local capability `a`, which gets inherited by class +`Sub` and is combined with `Sub`'s own local capability `b`. Class `Sub` also has an argument capability corresponding to its parameter `x`. This capability gets instantiated to `c` in the final constructor call `Sub(c)`. Hence, +the capture set of that call is `{a, b, c}`. + +The capture set of the type of `this` of a class is inferred by the capture checker, unless the type is explicitly declared with a self type annotation like this one: +```scala +class C: + self: {a, b} D => ... +``` +The inference observes the following constraints: + + - The type of `this` of a class `C` includes all captured references of `C`. + - The type of `this` of a class `C` is a subtype of the type of `this` + of each parent class of `C`. + - The type of `this` must observe all constraints where `this` is used. + +For instance, in +```scala +@capability class Cap +def test(c: Cap) = + class A: + val x: A = this + def f = println(c) // error +``` +we know that the type of `this` must be pure, since `this` is the right hand side of a `val` with type `A`. However, in the last line we find that the capture set of the class, and with it the capture set of `this`, would include `c`. This leads to a contradiction, and hence to a checking error: +``` +16 | def f = println(c) // error + | ^ + |(c : Cap) cannot be referenced here; it is not included in the allowed capture set {} +``` + +## Capture Tunnelling + +Consider the following simple definition of a `Pair` class: +```scala +class Pair[+A, +B](x: A, y: B): + def fst: A = x + def snd: B = y +``` +What happens if `Pair` is instantiated like this (assuming `ct` and `fs` are two capabilities in scope)? +```scala +def x: {ct} Int -> String +def y: {fs} Logger +def p = Pair(x, y) +``` +The last line will be typed as follows: +```scala +def p: Pair[{ct} Int -> String, {fs} Logger] = Pair(x, y) +``` +This might seem surprising. The `Pair(x, y)` value does capture capabilities `ct` and `fs`. Why don't they show up in its type at the outside? + +The answer is capture tunnelling. Once a type variable is instantiated to a capturing type, the +capture is not propagated beyond this point. On the other hand, if the type variable is instantiated +again on access, the capture information "pops out" again. For instance, even though `p` is technically pure because its capture set is empty, writing `p.fst` would record a reference to the captured capability `ct`. So if this access was put in a closure, the capability would again form part of the outer capture set. E.g. +```scala +() => p.fst : {ct} () -> {ct} Int -> String +``` +In other words, references to capabilities "tunnel through" in generic instantiations from creation to access, they do not affect the capture set of the enclosing generic data constructor applications. +This principle may seem surprising at first, but it is the key to make capture checking concise and practical. + +## Escape Checking + +The universal capability `*` should be conceptually available only as a parameter to the main program. Indeed, if it was available everywhere, capability checking would be undermined since one could mint new capabilities +at will. In line with this reasoning, some capture sets are restricted so that +they are not allowed to contain the universal capability. + +Specifically, if a capturing type is an instance of a type variable, that capturing type +is not allowed to carry the universal capability `{*}`. There's a connection to tunnelling here. +The capture set of a type has to be present in the environment when a type is instantiated from +a type variable. But `*` is not itself available as a global entity in the environment. Hence, +an error should result. + +We can now reconstruct how this principle produced the error in the introductory example, where +`usingLogFile` was declared like this: +```scala +def usingLogFile[T](op: ({*} FileOutputStream) => T): T = ... +``` +The error message was: +``` + | val later = usingLogFile { f => () => f.write(0) } + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + |The expression's type {*} () -> Unit is not allowed to capture the root capability `*`. + |This usually means that a capability persists longer than its allowed lifetime. +``` +This error message was produced by the following logic: + + - The `f` parameter has type `{*} FileOutputStream`, which makes it a capability. + - Therefore, the type of the expression `() => f.write(0)` is `{f} () -> Unit`. + - This makes the whole type of the closure passed to `usingLogFile` the dependent function type + `(f: {*} FileOutputStream) -> {f} () -> Unit`. + - The expected type of the closure is a simple, parametric, impure function type `({*} FileOutputStream) => T`, + for some instantiation of the type variable `T`. + - The smallest supertype of the closure's dependent function type that is a parametric function type is + `({*} FileOutputStream) => {*} () -> Unit` + - Hence, the type variable `T` is instantiated to `* () -> Unit`, which causes the error. + +An analogous restriction applies to the type of a mutable variable. +Another way one could try to undermine capture checking would be to +assign a closure with a local capability to a global variable. Maybe +like this: +```scala +var loophole: {*} () -> Unit = () => () +usingLogFile { f => + loophole = () => f.write(0) +} +loophole() +``` +But this will not compile either, since mutable variables cannot have universal capture sets. + +One also needs to prevent returning or assigning a closure with a local capability in an argument of a parametric type. For instance, here is a +slightly more refined attack: +```scala +class Cell[+A](x: A) +val sneaky = usingLogFile { f => Cell(() => f.write(0)) } +sneaky.x() +``` +At the point where the `Cell` is created, the capture set of the argument is `f`, which +is OK. But at the point of use, it is `*`, which causes again an error: +``` + | sneaky.x() + | ^^^^^^^^ + |The expression's type {*} () -> Unit is not allowed to capture the root capability `*`. + |This usually means that a capability persists longer than its allowed lifetime. +``` + +## Checked Exceptions + +Scala enables checked exceptions through a language import. Here is an example, +taken from the [safer exceptions page](./canthrow.md), and also described in a +[paper](https://infoscience.epfl.ch/record/290885) presented at the + 2021 Scala Symposium. +```scala +import language.experimental.saferExceptions + +class LimitExceeded extends Exception + +val limit = 10e+10 +def f(x: Double): Double throws LimitExceeded = + if x < limit then x * x else throw LimitExceeded() +``` +The new `throws` clause expands into an implicit parameter that provides +a `CanThrow` capability. Hence, function `f` could equivalently be written +like this: +```scala +def f(x: Double)(using CanThrow[LimitExceeded]): Double = ... +``` +If the implicit parameter is missing, an error is reported. For instance, the function definition +```scala +def g(x: Double): Double = + if x < limit then x * x else throw LimitExceeded() +``` +is rejected with this error message: +``` + | if x < limit then x * x else throw LimitExceeded() + | ^^^^^^^^^^^^^^^^^^^^^ + |The capability to throw exception LimitExceeded is missing. + |The capability can be provided by one of the following: + | - Adding a using clause `(using CanThrow[LimitExceeded])` to the definition of the enclosing method + | - Adding `throws LimitExceeded` clause after the result type of the enclosing method + | - Wrapping this piece of code with a `try` block that catches LimitExceeded +``` +`CanThrow` capabilities are required by `throw` expressions and are created +by `try` expressions. For instance, the expression +```scala +try xs.map(f).sum +catch case ex: LimitExceeded => -1 +``` +would be expanded by the compiler to something like the following: +```scala +try + erased given ctl: CanThrow[LimitExceeded] = compiletime.erasedValue + xs.map(f).sum +catch case ex: LimitExceeded => -1 +``` +(The `ctl` capability is only used for type checking but need not show up in the generated code, so it can be declared as +erased.) + +As with other capability based schemes, one needs to guard against capabilities +that are captured in results. For instance, here is a problematic use case: +```scala +def escaped(xs: Double*): (() => Double) throws LimitExceeded = + try () => xs.map(f).sum + catch case ex: LimitExceeded => () => -1 +val crasher = escaped(1, 2, 10e+11) +crasher() +``` +This code needs to be rejected since otherwise the call to `later()` would cause +an unhandled `LimitExceeded` exception to be thrown. + +Under `-Ycc`, the code is indeed rejected +``` +14 | try () => xs.map(f).sum + | ^ + |The expression's type {*} () -> Double is not allowed to capture the root capability `*`. + |This usually means that a capability persists longer than its allowed lifetime. +15 | catch case ex: LimitExceeded => () => -1 +``` +To integrate exception and capture checking, only two changes are needed: + + - `CanThrow` is declared as a `@capability` class, so all references to `CanThrow` instances are tracked. + - Escape checking is extended to `try` expressions. The result type of a `try` is not allowed to + capture the universal capability. + + + +## A Larger Example + +As a larger example, we present an implementation of lazy lists and some use cases. For simplicity, +our lists are lazy only in their tail part. This corresponds to what the Scala-2 type `Stream` did, whereas Scala 3's `LazyList` type computes strictly less since it is also lazy in the first argument. + +Here is the base trait `LzyList` for our version of lazy lists: +```scala +trait LzyList[+A]: + def isEmpty: Boolean + def head: A + def tail: {this} LzyList[A] +``` +Note that `tail` carries a capture annotation. It says that the tail of a lazy list can +potentially capture the same references as the lazy list as a whole. + +The empty case of a `LzyList` is written as usual: +```scala +object LzyNil extends LzyList[Nothing]: + def isEmpty = true + def head = ??? + def tail = ??? +``` +Here is a formulation of the class for lazy cons nodes: +```scala +import scala.compiletime.uninitialized + +final class LzyCons[+A](hd: A, tl: () => {*} LzyList[A]) extends LzyList[A]: + private var forced = false + private var cache: {this} LzyList[A] = uninitialized + private def force = + if !forced then { cache = tl(); forced = true } + cache + + def isEmpty = false + def head = hd + def tail: {this} LzyList[A] = force +end LzyCons +``` +The `LzyCons` class takes two parameters: A head `hd` and a tail `tl`, which is a function +returning a `LzyList`. Both the function and its result can capture arbitrary capabilities. +The result of applying the function is memoized after the first dereference of `tail` in +the private mutable field `cache`. + +Here is an extension method to define an infix cons operator `#:` for lazy lists. It is analogous +to `::` but it produces a lazy list (without evaluating its right operand) instead of a strict list. +```scala +extension [A](x: A) + def #:(xs1: => {*} LzyList[A]): {xs1} LzyList[A] = + LzyCons(x, () => xs1) +``` +Note that `#:` takes an impure call-by-name parameter `xs1` as its right argument. The result +of `#:` is a lazy list that captures that argument. + +As an example usage of `#:`, here is a method `tabulate` that creates a lazy list +of given length with a generator function `gen`. The generator function is allowed +to have side effects. +```scala +def tabulate[A](n: Int)(gen: Int => A) = + def recur(i: Int): {gen} LzyList[A] = + if i == n then LzyNil + else gen(i) #: recur(i + 1) + recur(0) +``` +Here is a use of `tabulate`: +```scala +class LimitExceeded extends Exception +def squares(n: Int)(using ct: CanThrow[LimitExceeded]) = + tabulate(10) { i => + if i > 9 then throw Ex1() + i * i + } +``` +The inferred result type of `squares` is `{ct} LzyList[Int]`, i.e it is a lazy list of +`Int`s that can throw the `LimitExceeded` exception when it is elaborated by calling `tail` +one or more times. + +Here are some further extension methods for mapping, filtering, and concatenating lazy lists: +```scala +extension [A](xs: {*} LzyList[A]) + def map[B](f: A => B): {xs, f} LzyList[B] = + if xs.isEmpty then LzyNil + else f(xs.head) #: xs.tail.map(f) + + def filter(p: A => Boolean): {xs, p} LzyList[A] = + if xs.isEmpty then LzyNil + else if p(xs.head) then xs.head #: xs.tail.filter(p) + else xs.tail.filter(p) + + def concat(ys: {*} LzyList[A]): {xs, ys} LzyList[A] = + if xs.isEmpty then ys + else xs.head #: xs.tail.concat(ys) + + def drop(n: Int): {xs} LzyList[A] = + if n == 0 then xs else xs.tail.drop(n - 1) +``` +Their capture annotations are all as one would expect: + + - Mapping a lazy list produces a lazy list that captures the original list as well + as the (possibly impure) mapping function. Of course, it would also be possible to + pass a concrete function argument that is pure. + - Filtering a lazy list produces a lazy list that captures the original list as well + as the (possibly impure) filtering predicate. + - Concatenating two lazy lists produces a lazy list that captures both arguments. + - Dropping elements from a lazy list gives a safe approximation where the original list is captured in the result. In fact, it's only some suffix of the list that is retained at run time, but our modelling identifies lazy lists and their suffixes, so this additional knowledge would not be useful. + +Of course the function passed to `map` or `filter` could also be pure. After all, `A -> B` is a subtype of `{*} A -> B` which is the same as `A => B`. In that case, the pure function +argument will _not_ show up in the result type of `map` or `filter`. For instance: +```scala +val xs = squares(10) +val ys: {xs} LzyList[Int] = xs.map(_ + 1) +``` +The type of the mapped list `ys` has only `xs` in its capture set. The actual function +argument does not show up since it is pure. Likewise, if the lazy list +`xs` was pure, it would not show up in any of the method results. +This demonstrates that capability-based +effect systems with capture checking are naturally _effect polymorphic_. + +This concludes our example. It's worth mentioning that an equivalent program defining and using standard, strict lists would require no capture annotations whatsoever. It would compile exactly as written now in standard Scala 3. This fact is probably one of the greatest plus points of our approach to capture checking. + +## Function Type Shorthands + +TBD + +## Compilation Options + +The following options are relevant for capture checking. + + - **-Ycc** Enables capture checking. + - **-Xprint:cc** Prints the program with capturing types as inferred by capture checking. + - **-Ycc-debug** Gives more detailed, implementation-oriented information about capture checking, as described in the next section. + + The implementation supporting capture checking with these options is currently in branch `cc-experiment` on dotty.epfl.ch. + +## Capture Checking Internals + +The capture checker is architected as a propagation constraint solver, which runs as a separate phase after type-checking and some initial transformations. + +Constraint variables stand for unknown capture sets. A constraint variable is introduced + + - for every part of a previously inferred type, + - for the accessed references of every method, class, anonymous function, or by-name argument, + - for the parameters passed in a class constructor call. + +Capture sets in explicitly written types are treated as constants (before capture checking, such sets are simply ignored). + +The capture checker essentially rechecks the program with the usual typing rules. Every time a subtype requirement between capturing types is checked, this translates to a subcapturing test on capture sets. If the two sets are constant, this is simply as yes/no question, where a no will produce an error message. + +If the lower set `C₁` of a comparison `C₁ <: C₂` is a variable, the set `C₂` is recorded +as a _superset_ of `C₁`. If the upper set `C₂` is a variable, the elements of `C₁` are _propagated_ to `C₂`. Propagation of an element `x` to a set `C` means that `x` is included as an element in `C`, and it is also propagated +to all known supersets of `C`. If such a superset is a constant, it is checked that `x` is included in it. If that's not the case, the original comparison `C₁ <: C₂` has no solution and an error is reported. + +The type checker also performs various maps on types, for instance when substituting actual argument types for formal parameter types in dependent functions, or mapping +member types with as "as-seen-from" in a selection. Maps keep track of the variance +of positions in a type. The variance is initially covariant, it flips to +contravariant in function parameter positions, and can be either covariant, +contravariant, or nonvariant in type arguments, depending on the variance of +the type parameter. + +When capture checking, the same maps are also performed on capture sets. If a capture set is a constant, its elements (which are capabilities) are mapped as regular types. If the result of such a map is not a capability, the result is approximated according to the variance of the type. A covariant approximation replaces a type by its capture set. +A contravariant approximation replaces it with the empty capture set. A nonvariant +approximation replaces the enclosing capturing type with a range of possible types +that gets propagated and resolved further out. + +When a mapping `m` is performed on a capture set variable `C`, a new variable `Cm` is created that contains the mapped elements and that is linked with `C`. If `C` subsequently acquires further elements through propagation, these are also propagated to `Cm` after being transformed by the `m` mapping. `Cm` also gets the same supersets as `C`, mapped again using `m`. + +The `-Ycc-debug` option provides some insight into the workings of the capture checker. +When it is turned on, capture set variables are printed with an ID and some information about their provenance. For instance, the string `{f, xs}33M5V` indicates a capture set +variable that is known to hold elements `f` and `xs`. The variable's ID is `33`. The `M` +indicates that the variable was created through a mapping from a variable with ID `5`. The latter is a regular variable, as indicated + by `V`. + +Generally, the string following the capture set consists of alternating numbers and letters where each number gives a variable ID and each letter gives the provenance of the variable. Possible letters are + + - `V` : a regular variable, + - `M` : a variable resulting from a _mapping_ of the variable indicated by the string to the right, + - `B` : similar to `M` but where the mapping is a _bijection_, + - `F` : a variable resulting from _filtering_ the elements of the variable indicated by the string to the right, + - `I` : a variable resulting from an _intersection_ of two capture sets, + - `D` : a variable resulting from the set _difference_ of two capture sets. + +At the end of a compilation run, `-Ycc-debug` will print all variable dependencies of variables referred to in previous output. Here is an example: +``` +Capture set dependencies: + {}2V :: + {}3V :: + {}4V :: + {f, xs}5V :: {f, xs}31M5V, {f, xs}32M5V + {f, xs}31M5V :: {xs, f} + {f, xs}32M5V :: +``` +This section lists all variables that appeared in previous diagnostics and their dependencies, recursively. For instance, we learn that + + - variables 2, 3, 4 are empty and have no dependencies, + - variable `5` has two dependencies: variables `31` and `32` which both result from mapping variable `5`, + - variable `31` has a constant fixed superset `{xs, f}` + - variable `32` has no dependencies. + diff --git a/docs/sidebar.yml b/docs/sidebar.yml index 0a0e8acae652..be2d0d0e59d9 100644 --- a/docs/sidebar.yml +++ b/docs/sidebar.yml @@ -116,6 +116,7 @@ sidebar: - page: docs/reference/experimental/named-typeargs.md - page: docs/reference/experimental/numeric-literals.md - page: docs/reference/experimental/explicit-nulls.md + - page: docs/reference/experimental/cc.md - page: docs/reference/syntax.md - title: Language Versions index: docs/reference/language-versions/language-versions.md From aec53c696e457db2d6da242bbe7d55a5ec76990e Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Tue, 8 Feb 2022 10:40:38 -0800 Subject: [PATCH 1152/1244] Revert eager use of escape in interpolator --- compiler/src/dotty/tools/dotc/parsing/Scanners.scala | 2 +- compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala | 2 +- .../src/scala/quoted/runtime/impl/printers/SourceCode.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index 18f4f542b86c..1fee0f52f770 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -1253,7 +1253,7 @@ object Scanners { nextChar() } } - val alt = if oct == LF then raw"\n" else f"\\u$oct%04x" + val alt = if oct == LF then raw"\n" else f"${"\\"}u$oct%04x" error(s"octal escape literals are unsupported: use $alt instead", start) putChar(oct.toChar) } diff --git a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala index dd5d55b21f50..157b424b6251 100644 --- a/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala +++ b/compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala @@ -542,7 +542,7 @@ class PlainPrinter(_ctx: Context) extends Printer { case '"' => "\\\"" case '\'' => "\\\'" case '\\' => "\\\\" - case _ => if ch.isControl then f"\\u${ch.toInt}%04x" else String.valueOf(ch) + case _ => if ch.isControl then f"${"\\"}u${ch.toInt}%04x" else String.valueOf(ch) } def toText(const: Constant): Text = const.tag match { diff --git a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala index 88ee3e985277..7f77f8fa5eb2 100644 --- a/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala +++ b/compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala @@ -1423,7 +1423,7 @@ object SourceCode { case '"' => "\\\"" case '\'' => "\\\'" case '\\' => "\\\\" - case _ => if ch.isControl then f"\\u${ch.toInt}%04x" else String.valueOf(ch) + case _ => if ch.isControl then f"${"\\"}u${ch.toInt}%04x" else String.valueOf(ch) } private def escapedString(str: String): String = str flatMap escapedChar From e546a7e0aa61ba88af0a65cf2edf0c39981b7936 Mon Sep 17 00:00:00 2001 From: Ondrej Lhotak Date: Wed, 9 Feb 2022 11:59:57 +0100 Subject: [PATCH 1153/1244] fix typos in capture checking doc page --- docs/docs/reference/experimental/cc.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/docs/reference/experimental/cc.md b/docs/docs/reference/experimental/cc.md index f7134e98d9ad..dea4252cc349 100644 --- a/docs/docs/reference/experimental/cc.md +++ b/docs/docs/reference/experimental/cc.md @@ -113,7 +113,7 @@ def test(fs: {*} FileSystem) = } xs ``` -Here, the `test` method takes a `FileSystem` as a parameter. `fs` is a capability since its type has a non-empty capture set. The capability is passed the `Logger` constructor +Here, the `test` method takes a `FileSystem` as a parameter. `fs` is a capability since its type has a non-empty capture set. The capability is passed to the `Logger` constructor and retained as a field in class `Logger`. Hence, the local variable `l` has type `{fs} Logger`: it is a `Logger` which retains the `fs` capability. @@ -223,7 +223,7 @@ was declared with a result type `LazyList[Int]`, we'd get a type error. Here is | Found: {fs} LazyList[Int] | Required: LazyList[Int] ``` -Why does is say `{fs} LazyList[Int]` and not `{l} LazyList[Int]`, which is, after all, the type of the returned value `xs`? The reason is that `l` is a local variable in the body of `test`, so it cannot be referred to in a type outside that body. What happens instead is that the type is _widened_ to the smallest supertype that does not mention `l`. Since `l` has capture set `fs`, we have that `{fs}` covers `{l}`, and `{fs}` is acceptable as in a result type of `test`, so `{fs}` is the result of that widening. +Why does it say `{fs} LazyList[Int]` and not `{l} LazyList[Int]`, which is, after all, the type of the returned value `xs`? The reason is that `l` is a local variable in the body of `test`, so it cannot be referred to in a type outside that body. What happens instead is that the type is _widened_ to the smallest supertype that does not mention `l`. Since `l` has capture set `fs`, we have that `{fs}` covers `{l}`, and `{fs}` is acceptable in a result type of `test`, so `{fs}` is the result of that widening. This widening is called _avoidance_; it is not specific to capture checking but applies to all variable references in Scala types. ## Capability Classes @@ -277,7 +277,7 @@ itself does not refer to `fs`. ## Capture Checking of Classes -The principles for capture checking closures also applies to classes. For instance, consider: +The principles for capture checking closures also apply to classes. For instance, consider: ```scala class Logger(using fs: FileSystem): def log(s: String): Unit = ... summon[FileSystem] ... @@ -369,7 +369,7 @@ again on access, the capture information "pops out" again. For instance, even th ```scala () => p.fst : {ct} () -> {ct} Int -> String ``` -In other words, references to capabilities "tunnel through" in generic instantiations from creation to access, they do not affect the capture set of the enclosing generic data constructor applications. +In other words, references to capabilities "tunnel through" in generic instantiations from creation to access; they do not affect the capture set of the enclosing generic data constructor applications. This principle may seem surprising at first, but it is the key to make capture checking concise and practical. ## Escape Checking @@ -429,7 +429,7 @@ val sneaky = usingLogFile { f => Cell(() => f.write(0)) } sneaky.x() ``` At the point where the `Cell` is created, the capture set of the argument is `f`, which -is OK. But at the point of use, it is `*`, which causes again an error: +is OK. But at the point of use, it is `*` (because `f` is no longer in scope), which causes again an error: ``` | sneaky.x() | ^^^^^^^^ @@ -662,14 +662,14 @@ Constraint variables stand for unknown capture sets. A constraint variable is in Capture sets in explicitly written types are treated as constants (before capture checking, such sets are simply ignored). -The capture checker essentially rechecks the program with the usual typing rules. Every time a subtype requirement between capturing types is checked, this translates to a subcapturing test on capture sets. If the two sets are constant, this is simply as yes/no question, where a no will produce an error message. +The capture checker essentially rechecks the program with the usual typing rules. Every time a subtype requirement between capturing types is checked, this translates to a subcapturing test on capture sets. If the two sets are constant, this is simply a yes/no question, where a no will produce an error message. If the lower set `C₁` of a comparison `C₁ <: C₂` is a variable, the set `C₂` is recorded as a _superset_ of `C₁`. If the upper set `C₂` is a variable, the elements of `C₁` are _propagated_ to `C₂`. Propagation of an element `x` to a set `C` means that `x` is included as an element in `C`, and it is also propagated to all known supersets of `C`. If such a superset is a constant, it is checked that `x` is included in it. If that's not the case, the original comparison `C₁ <: C₂` has no solution and an error is reported. The type checker also performs various maps on types, for instance when substituting actual argument types for formal parameter types in dependent functions, or mapping -member types with as "as-seen-from" in a selection. Maps keep track of the variance +member types with "as-seen-from" in a selection. Maps keep track of the variance of positions in a type. The variance is initially covariant, it flips to contravariant in function parameter positions, and can be either covariant, contravariant, or nonvariant in type arguments, depending on the variance of From 2ba981f91c5bf9d1255ea492632060ffdbf31075 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 1 Feb 2022 17:50:48 +0100 Subject: [PATCH 1154/1244] Infer parameters of eta applications with vararg parameters Fixes #14367 --- compiler/src/dotty/tools/dotc/typer/Typer.scala | 11 +++++++---- tests/neg/i14367.check | 7 +++++++ tests/neg/i14367.scala | 5 +++++ tests/pos/i14367.scala | 7 +++++++ 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 tests/neg/i14367.check create mode 100644 tests/neg/i14367.scala create mode 100644 tests/pos/i14367.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 02f3f6b4f164..f16af293fe83 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1227,8 +1227,11 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer case mtpe: MethodType => val pos = paramIndex(param.name) if pos < mtpe.paramInfos.length then - val ptype = mtpe.paramInfos(pos) - if ptype.isRepeatedParam then NoType else ptype + mtpe.paramInfos(pos) + // This works only if vararg annotations match up. + // See neg/i14367.scala for an example where the inferred type is mispredicated. + // Nevertheless, the alternative would be to give up completely, so this is + // defensible. else NoType case _ => NoType if target.exists then formal <:< target @@ -1317,10 +1320,10 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer */ var fnBody = tree.body - def refersTo(arg: untpd.Tree, param: untpd.ValDef): Boolean = arg match { + def refersTo(arg: untpd.Tree, param: untpd.ValDef): Boolean = arg match case Ident(name) => name == param.name + case Typed(arg1, _) if untpd.isWildcardStarArg(arg) => refersTo(arg1, param) case _ => false - } /** If parameter `param` appears exactly once as an argument in `args`, * the singleton list consisting of its position in `args`, otherwise `Nil`. diff --git a/tests/neg/i14367.check b/tests/neg/i14367.check new file mode 100644 index 000000000000..92d974db120f --- /dev/null +++ b/tests/neg/i14367.check @@ -0,0 +1,7 @@ +-- [E007] Type Mismatch Error: tests/neg/i14367.scala:2:16 ------------------------------------------------------------- +2 |val h2 = i => p(i) // error: Found (i : Seq[Int]), Required: Int + | ^ + | Found: (i : Seq[Int]) + | Required: Int + +longer explanation available when compiling with `-explain` diff --git a/tests/neg/i14367.scala b/tests/neg/i14367.scala new file mode 100644 index 000000000000..2778ade8dfa1 --- /dev/null +++ b/tests/neg/i14367.scala @@ -0,0 +1,5 @@ +def p(i: Int*) = i.sum +val h2 = i => p(i) // error: Found (i : Seq[Int]), Required: Int + // It would be more logical to fail with a "missing parameter type", however. + + diff --git a/tests/pos/i14367.scala b/tests/pos/i14367.scala new file mode 100644 index 000000000000..d74f0aa8373e --- /dev/null +++ b/tests/pos/i14367.scala @@ -0,0 +1,7 @@ +def m(i: Int*) = i.sum +val f1 = m +val f2 = i => m(i*) + +def n(i: Seq[Int]) = i.sum +val g1 = n +val g2 = i => n(i) From 51279e7b69ac6fb6399c690165cddf520b33eac9 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 1 Feb 2022 22:19:04 +0100 Subject: [PATCH 1155/1244] Drop invalid test --- compiler/test-resources/repl/errorThenValid | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 compiler/test-resources/repl/errorThenValid diff --git a/compiler/test-resources/repl/errorThenValid b/compiler/test-resources/repl/errorThenValid deleted file mode 100644 index bfe97c5a7400..000000000000 --- a/compiler/test-resources/repl/errorThenValid +++ /dev/null @@ -1,10 +0,0 @@ -scala> val xs = scala.collection.mutable.ListBuffer[Int] --- [E081] Type Error: ---------------------------------------------------------- -1 | val xs = scala.collection.mutable.ListBuffer[Int] - | ^ - | Missing parameter type - | - | I could not infer the type of the parameter elems. -1 error found -scala> val xs = scala.collection.mutable.ListBuffer[Int]() -val xs: scala.collection.mutable.ListBuffer[Int] = ListBuffer() From 0868c9b19859ade0cd28a108b141c5b0b3f33a96 Mon Sep 17 00:00:00 2001 From: odersky Date: Tue, 1 Feb 2022 17:53:35 +0100 Subject: [PATCH 1156/1244] Update compiler/src/dotty/tools/dotc/typer/Typer.scala --- compiler/src/dotty/tools/dotc/typer/Typer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index f16af293fe83..09acde2ac845 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1229,7 +1229,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer if pos < mtpe.paramInfos.length then mtpe.paramInfos(pos) // This works only if vararg annotations match up. - // See neg/i14367.scala for an example where the inferred type is mispredicated. + // See neg/i14367.scala for an example where the inferred type is mispredicted. // Nevertheless, the alternative would be to give up completely, so this is // defensible. else NoType From 922f9c0426faf35c57c60342c6e3a88d706c9905 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Wed, 19 Jan 2022 10:45:13 +0000 Subject: [PATCH 1157/1244] For generic tuples, call Tuples.apply instead of _1/_2/.. --- .../tools/dotc/transform/PatternMatcher.scala | 22 +++++++++++----- tests/run/i13968.scala | 26 +++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 tests/run/i13968.scala diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala index 5ba43253e8b3..d740cb4053e2 100644 --- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -235,8 +235,8 @@ object PatternMatcher { case _ => tree.tpe - /** Plan for matching `selectors` against argument patterns `args` */ - def matchArgsPlan(selectors: List[Tree], args: List[Tree], onSuccess: Plan): Plan = { + /** Plan for matching `components` against argument patterns `args` */ + def matchArgsPlan(components: List[Tree], args: List[Tree], onSuccess: Plan): Plan = { /* For a case with arguments that have some test on them such as * ``` * case Foo(1, 2) => someCode @@ -253,9 +253,9 @@ object PatternMatcher { * } else () * ``` */ - def matchArgsSelectorsPlan(selectors: List[Tree], syms: List[Symbol]): Plan = - selectors match { - case selector :: selectors1 => letAbstract(selector, selector.avoidPatBoundType())(sym => matchArgsSelectorsPlan(selectors1, sym :: syms)) + def matchArgsComponentsPlan(components: List[Tree], syms: List[Symbol]): Plan = + components match { + case component :: components1 => letAbstract(component, component.avoidPatBoundType())(sym => matchArgsComponentsPlan(components1, sym :: syms)) case Nil => matchArgsPatternPlan(args, syms.reverse) } def matchArgsPatternPlan(args: List[Tree], syms: List[Symbol]): Plan = @@ -267,7 +267,7 @@ object PatternMatcher { assert(syms.isEmpty) onSuccess } - matchArgsSelectorsPlan(selectors, Nil) + matchArgsComponentsPlan(components, Nil) } /** Plan for matching the sequence in `seqSym` against sequence elements `args`. @@ -330,7 +330,15 @@ object PatternMatcher { sym.isAllOf(SyntheticCase) && sym.owner.is(Scala2x) if (isSyntheticScala2Unapply(unapp.symbol) && caseAccessors.length == args.length) - matchArgsPlan(caseAccessors.map(ref(scrutinee).select(_)), args, onSuccess) + def tupleSel(sym: Symbol) = ref(scrutinee).select(sym) + def tupleApp(i: Int) = // manually inlining the call to NonEmptyTuple#apply, because it's an inline method + ref(defn.RuntimeTuplesModule) + .select(defn.RuntimeTuples_apply) + .appliedTo(ref(scrutinee), Literal(Constant(i))) + .cast(args(i).tpe.widen) + val isGenericTuple = defn.isTupleClass(caseClass) && !defn.isTupleNType(tree.tpe) + val components = if isGenericTuple then caseAccessors.indices.toList.map(tupleApp) else caseAccessors.map(tupleSel) + matchArgsPlan(components, args, onSuccess) else if (unapp.tpe <:< (defn.BooleanType)) TestPlan(GuardTest, unapp, unapp.span, onSuccess) else diff --git a/tests/run/i13968.scala b/tests/run/i13968.scala new file mode 100644 index 000000000000..8e63d57ecf1b --- /dev/null +++ b/tests/run/i13968.scala @@ -0,0 +1,26 @@ +object Bar { + def unapply(x: Any): Option[Int *: Int *: EmptyTuple] = Some(1 *: 2 *: Tuple()) +} + +object Bar23 { + def unapply(x: Any): Option[ + Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *: + Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *: Int *: + Int *: Int *: Int *: EmptyTuple + ] = Some( + 1 *: 2 *: 3 *: 4 *: 5 *: 6 *: 7 *: 8 *: 9 *: 10 *: + 11 *: 12 *: 13 *: 14 *: 15 *: 16 *: 17 *: 18 *: 19 *: 20 *: + 21 *: 22 *: 23 *: Tuple() + ) +} + +@main def Test() = + "" match + case Bar((a, b)) => assert(a == 1 && b == 2, (a, b)) + + "" match + case Bar23(( + u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, + u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, + u21, u22, u23 + )) => assert(u1 == 1 && u23 == 23, (u1, u23)) From e2986a4386616aabe0b545344e830cd8290909da Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 9 Feb 2022 10:26:22 +0100 Subject: [PATCH 1158/1244] Capture checking doc page changes Addresses earlier review comments and gives some more details --- docs/docs/reference/experimental/cc.md | 46 ++++++++++++++++++++------ 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/docs/docs/reference/experimental/cc.md b/docs/docs/reference/experimental/cc.md index dea4252cc349..5278c7f2cf8a 100644 --- a/docs/docs/reference/experimental/cc.md +++ b/docs/docs/reference/experimental/cc.md @@ -1,7 +1,6 @@ --- layout: doc-page title: "Capture Checking" -movedTo: https://docs.scala-lang.org/scala3/reference/experimental/cc.html --- Capture checking is a research project that modifies the Scala type system to track references to capabilities in values. It is currently @@ -145,7 +144,7 @@ is the same as ``` Contrast with ```scala -({c} A) -> ({d} B)) -> C +({c} A) -> ({d} B) -> C ``` which is a curried pure function over argument types that can capture `c` and `d`, respectively. @@ -437,6 +436,10 @@ is OK. But at the point of use, it is `*` (because `f` is no longer in scope), w |This usually means that a capability persists longer than its allowed lifetime. ``` +Looking at object graphs, we observe a monotonicity property: The capture set of an object `x` covers the capture sets of all objects reachable through `x`. This property is reflected in the type system by the following _monotonicity rule_: + + - In a class `C` with a field `f`, the capture set `{this}` covers the capture set `{this.f}` as well as any application of the latter set to pure arguments. + ## Checked Exceptions Scala enables checked exceptions through a language import. Here is an example, @@ -515,8 +518,6 @@ To integrate exception and capture checking, only two changes are needed: - Escape checking is extended to `try` expressions. The result type of a `try` is not allowed to capture the universal capability. - - ## A Larger Example As a larger example, we present an implementation of lazy lists and some use cases. For simplicity, @@ -558,10 +559,10 @@ end LzyCons The `LzyCons` class takes two parameters: A head `hd` and a tail `tl`, which is a function returning a `LzyList`. Both the function and its result can capture arbitrary capabilities. The result of applying the function is memoized after the first dereference of `tail` in -the private mutable field `cache`. +the private mutable field `cache`. Note that the typing of the assignment `cache = tl()` relies on the monotonicity rule for `{this}` capture sets. Here is an extension method to define an infix cons operator `#:` for lazy lists. It is analogous -to `::` but it produces a lazy list (without evaluating its right operand) instead of a strict list. +to `::` but instead of a strict list it produces a lazy list without evaluating its right operand. ```scala extension [A](x: A) def #:(xs1: => {*} LzyList[A]): {xs1} LzyList[A] = @@ -585,7 +586,7 @@ Here is a use of `tabulate`: class LimitExceeded extends Exception def squares(n: Int)(using ct: CanThrow[LimitExceeded]) = tabulate(10) { i => - if i > 9 then throw Ex1() + if i > 9 then throw LimitExceeded() i * i } ``` @@ -615,8 +616,7 @@ extension [A](xs: {*} LzyList[A]) Their capture annotations are all as one would expect: - Mapping a lazy list produces a lazy list that captures the original list as well - as the (possibly impure) mapping function. Of course, it would also be possible to - pass a concrete function argument that is pure. + as the (possibly impure) mapping function. - Filtering a lazy list produces a lazy list that captures the original list as well as the (possibly impure) filtering predicate. - Concatenating two lazy lists produces a lazy list that captures both arguments. @@ -634,7 +634,19 @@ argument does not show up since it is pure. Likewise, if the lazy list This demonstrates that capability-based effect systems with capture checking are naturally _effect polymorphic_. -This concludes our example. It's worth mentioning that an equivalent program defining and using standard, strict lists would require no capture annotations whatsoever. It would compile exactly as written now in standard Scala 3. This fact is probably one of the greatest plus points of our approach to capture checking. +This concludes our example. It's worth mentioning that an equivalent program defining and using standard, strict lists would require no capture annotations whatsoever. It would compile exactly as written now in standard Scala 3, yet one gets the capture checking for free. Essentially, `=>` already means "can capture anything" and since in a strict list side effecting operations are not retained in the result, there are no additional captures to record. A strict list could of course capture side-effecting closures in its elements but then tunnelling applies, since +these elements are represented by a type variable. This means we don't need to annotate anything there either. + +Another possibility would be a variant of lazy lists that requires all functions passed to `map`, `filter` and other operations like it to be pure. E.g. `map` on such a list would be defined like this: +```scala +extension [A](xs: LzyList[A]) + def map[B](f: A -> B): LzyList[B] = ... +``` +That variant would not require any capture annotations either. + +To summarize, there are two "sweet spots" of data structure design: strict lists in +side-effecting or resource-aware code and lazy lists in purely functional code. +Both are already correctly capture-typed without requiring any explicit annotations. Capture annotations only come into play where the semantics gets more complicated because we deal with delayed effects such as in impure lazy lists or side-effecting iterators over strict lists. This property is probably one of the greatest plus points of our approach to capture checking compared to previous techniques which tend to be more noisy. ## Function Type Shorthands @@ -682,8 +694,20 @@ that gets propagated and resolved further out. When a mapping `m` is performed on a capture set variable `C`, a new variable `Cm` is created that contains the mapped elements and that is linked with `C`. If `C` subsequently acquires further elements through propagation, these are also propagated to `Cm` after being transformed by the `m` mapping. `Cm` also gets the same supersets as `C`, mapped again using `m`. +One interesting aspect of the capture checker concerns the implementation of capture tunnelling. The [foundational theory](https://infoscience.epfl.ch/record/290885) on which capture checking is based makes tunnelling explicit through so-called _box_ and +_unbox_ operations. Boxing hides a capture set and unboxing recovers it. The capture checker inserts virtual box and unbox operations based on actual and expected types similar to the way the type checker inserts implicit conversions. When capture set variables are first introduced, any capture set in a capturing type that is an instance of a type parameter instance is marked as "boxed". A boxing operation is +inserted if the expected type of an expression is a capturing type with +a boxed capture set variable. The effect of the insertion is that any references +to capabilities in the boxed expression are forgotten, which means that capture +propagation is stopped. Dually, if the actual type of an expression has +a boxed variable as capture set, an unbox operation is inserted, which adds all +elements of the capture set to the environment. + +Boxing and unboxing has no runtime effect, so the insertion of these operations is only simulated; the only visible effect is the retraction and insertion +of variables in the capture sets representing the environment of the currently checked expression. + The `-Ycc-debug` option provides some insight into the workings of the capture checker. -When it is turned on, capture set variables are printed with an ID and some information about their provenance. For instance, the string `{f, xs}33M5V` indicates a capture set +When it is turned on, boxed sets are marked explicitly and capture set variables are printed with an ID and some information about their provenance. For instance, the string `{f, xs}33M5V` indicates a capture set variable that is known to hold elements `f` and `xs`. The variable's ID is `33`. The `M` indicates that the variable was created through a mapping from a variable with ID `5`. The latter is a regular variable, as indicated by `V`. From 214f8b48cc04b68eab6648df94081bf990d4787d Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 10 Feb 2022 09:56:26 +0100 Subject: [PATCH 1159/1244] Fix more typos in CC doc page --- docs/docs/reference/experimental/cc.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/docs/reference/experimental/cc.md b/docs/docs/reference/experimental/cc.md index 5278c7f2cf8a..40434c518587 100644 --- a/docs/docs/reference/experimental/cc.md +++ b/docs/docs/reference/experimental/cc.md @@ -258,7 +258,7 @@ def test(fs: FileSystem): {fs} String -> Unit = (x: String) => Logger(fs).log(x) ``` Here, the body of `test` is a lambda that refers to the capability `fs`, which means that `fs` is retained in the lambda. -Consequently, the type of the lambda is `{fs} String => Unit`. +Consequently, the type of the lambda is `{fs} String -> Unit`. **Note:** Function values are always written with `=>` (or `?=>` for context functions). There is no syntactic distinction for pure _vs_ impure function values. The distinction is only made in their types. @@ -271,8 +271,7 @@ def test(fs: FileSystem) = def g() = (x: String) => Logger(fs).log(x) f ``` -the result of `test` has type `{fs} String => Unit` even though function `f` -itself does not refer to `fs`. +the result of `test` has type `{fs} String -> Unit` even though function `f` itself does not refer to `fs`. ## Capture Checking of Classes @@ -438,7 +437,7 @@ is OK. But at the point of use, it is `*` (because `f` is no longer in scope), w Looking at object graphs, we observe a monotonicity property: The capture set of an object `x` covers the capture sets of all objects reachable through `x`. This property is reflected in the type system by the following _monotonicity rule_: - - In a class `C` with a field `f`, the capture set `{this}` covers the capture set `{this.f}` as well as any application of the latter set to pure arguments. + - In a class `C` with a field `f`, the capture set `{this}` covers the capture set `{this.f}` as well as the capture set of any application of `this.f` to pure arguments. ## Checked Exceptions From 0ed6f118d8c15d2517fb03579232e2fa1e38cb9e Mon Sep 17 00:00:00 2001 From: Vadim Chelyshov Date: Thu, 10 Jun 2021 20:04:55 +0300 Subject: [PATCH 1160/1244] Interactive: fix `contextOfPath` for Template --- .../tools/dotc/interactive/Interactive.scala | 8 +++-- .../tools/languageserver/CompletionTest.scala | 29 +++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/interactive/Interactive.scala b/compiler/src/dotty/tools/dotc/interactive/Interactive.scala index aa2359f33eb2..20a746ceb5ac 100644 --- a/compiler/src/dotty/tools/dotc/interactive/Interactive.scala +++ b/compiler/src/dotty/tools/dotc/interactive/Interactive.scala @@ -293,8 +293,10 @@ object Interactive { // in subsequent parameter sections localCtx case tree: MemberDef => - assert(tree.symbol.exists) - outer.localContext(tree, tree.symbol) + if (tree.symbol.exists) + outer.localContext(tree, tree.symbol) + else + outer case tree @ Block(stats, expr) => val localCtx = outer.fresh.setNewScope stats.foreach { @@ -310,7 +312,7 @@ object Interactive { } localCtx case tree @ Template(constr, parents, self, _) => - if ((constr :: self :: parents).contains(nested)) ctx + if ((constr :: self :: parents).contains(nested)) outer else contextOfStat(tree.body, nested, tree.symbol, outer.inClassContext(self.symbol)) case _ => outer diff --git a/language-server/test/dotty/tools/languageserver/CompletionTest.scala b/language-server/test/dotty/tools/languageserver/CompletionTest.scala index afee53328857..b9b0ca1f037f 100644 --- a/language-server/test/dotty/tools/languageserver/CompletionTest.scala +++ b/language-server/test/dotty/tools/languageserver/CompletionTest.scala @@ -994,4 +994,33 @@ class CompletionTest { ("annotation", Module, "scala.annotation") ) ) + @Test def completeTemplateConstrArgType: Unit = { + val expected = Set( + ("Future", Class, "scala.concurrent.Future"), + ("Future", Module, "scala.concurrent.Future") + ) + code"""import scala.concurrent.Future + |class Foo(x: Fut${m1})""".withSource + .completion(m1, expected) + } + + @Test def completeTemplateParents: Unit = { + val expected = Set( + ("Future", Class, "scala.concurrent.Future"), + ("Future", Module, "scala.concurrent.Future") + ) + code"""import scala.concurrent.Future + |class Foo extends Futu${m1}""".withSource + .completion(m1, expected) + } + + @Test def completeTemplateSelfType: Unit = { + val expected = Set( + ("Future", Class, "scala.concurrent.Future"), + ("Future", Module, "scala.concurrent.Future") + ) + code"""import scala.concurrent.Future + |class Foo[A]{ self: Futu${m1} => }""".withSource + .completion(m1, expected) + } } From 90f952fa3790d0d174e650960edadf709208f378 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 10 Feb 2022 13:32:39 +0100 Subject: [PATCH 1161/1244] Add regression test Closes https://github.com/lampepfl/dotty-feature-requests/issues/112 --- tests/pos/f112.scala | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 tests/pos/f112.scala diff --git a/tests/pos/f112.scala b/tests/pos/f112.scala new file mode 100644 index 000000000000..ad19fc5c4b04 --- /dev/null +++ b/tests/pos/f112.scala @@ -0,0 +1,6 @@ +type X +val x: X = ??? +extension (x: X) def unapply(arg: Any): Boolean = true +def test = + ??? match + case x() => From 572806655c58abe8165c954a545d8341a2f27327 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Fri, 28 Jan 2022 18:53:29 +0100 Subject: [PATCH 1162/1244] Issue Tsardom role specification --- MAINTENANCE.md | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 MAINTENANCE.md diff --git a/MAINTENANCE.md b/MAINTENANCE.md new file mode 100644 index 000000000000..73fdd0d7de6a --- /dev/null +++ b/MAINTENANCE.md @@ -0,0 +1,43 @@ +# Issue Tsar Role +This document formally defines the Issue Tsar role. This is a repository maintenance role that is assigned to core contributors on rotating basis. + +## Responsibilities +Issue Tsar is responsible for: +- Health of the CI, nightly releases and benchmark infrastructure. +- PRs of external contributors: assigning someone to review, or handling themselves. +- Triaging issues (especially new): + - Each issue needs to be assigned an `itype` and 1 or more `area` labels. + - Where applicable, new issues need to be designated for the Spree or Semester projects with the corresponding labels. + - Regressions from an earlier Scala 3 release must be classified with the “regression” label and assigned to the next release’s milestone. + - Modifying issue labels to best capture information about the issues + - Attempting to reproduce the issue (or label “stat:cannot reproduce”) + - Further minimising the issue or asking the reporter of the issue to minimize it correctly (or label “stat:needs minimization”) + +Other core teammates are responsible for providing information to the Issue Tsar in a timely manner when it is requested if they have that information. + +## Assignment +Issue Tsar is rotated according to a well-defined, ordered list. They are appointed for 7 days and are responsible for what is specified in the “Responsibilities” section during those 7 days. Their assumption of the role starts on Monday and ends on Friday (both inclusive), and the scope of their responsibilities extends to all events that took place during the weekend before the Monday of their assignment. + +## Prerequisites +An issue tasr needs to have all the accesses and privileges required to get their job done. This might include: +Admin rights in lampepfl/dotty repository +Admin rights in lampepfl/dotty-feature-requests repository +Permissions to create new repositories in lampepfl organization (needed to fork repositories for the community build) + +## Procedures +To ensure proper health of the infrastructure, the Tsar regularly monitors its proper operation. If a malfunction is detected, it is the Tsar's job to ensure that there’s someone working on it (or solve it on their own). + +If it is unclear what area an issue belongs to, the Tsar asks for advice from other team members, on Slack or GitHub. If, after asking for advice, it turns out that nobody in the team knows how to classify it, the issue must be classified with a “stat:needs triage” label. + +If it is unclear who should review an external PR, the Tsar asks for advice from the rest of the core team. If after asking for advice, it is still unclear who should do it, the reviewer for such a PR will be decided at the next Dotty meeting. + +In general, if anything else is unclear for proper fulfilment of responsibilities, the Tsar must proactively seek advice from other team members on Slack or other channels. + +## Reporting +At the end of their Tsardom, the Tsar reports to the team during the Dotty meeting on the following points: + +- Whether there were any incidents with the CI, nightlies and benchmarks, how they were resolved and what steps were taken to prevent them from happening in the future. +- How many new external contributors’ PRs were there and what they were about (in brief). +- How many new issues were opened during their Tsardom period? Were there any areas that got a lot of issues? How many regressions from a prior Scala 3 release were there? Which were designated for an MSc project or an Issue Spree? +- If new labels were created or old ones were removed, or there is any other feedback on how to improve the Tsardom, mention that. +- Unassigned PRs and issues that the team failed to classify: bring them one by one so that the team can make a decision on them. From c3c561d0946571cd71a82368f969a67d08b7988c Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Mon, 31 Jan 2022 16:52:43 +0100 Subject: [PATCH 1163/1244] Fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Michał Pałka --- MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 73fdd0d7de6a..efbdd74ad1a6 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -19,7 +19,7 @@ Other core teammates are responsible for providing information to the Issue Tsar Issue Tsar is rotated according to a well-defined, ordered list. They are appointed for 7 days and are responsible for what is specified in the “Responsibilities” section during those 7 days. Their assumption of the role starts on Monday and ends on Friday (both inclusive), and the scope of their responsibilities extends to all events that took place during the weekend before the Monday of their assignment. ## Prerequisites -An issue tasr needs to have all the accesses and privileges required to get their job done. This might include: +An issue tsar needs to have all the accesses and privileges required to get their job done. This might include: Admin rights in lampepfl/dotty repository Admin rights in lampepfl/dotty-feature-requests repository Permissions to create new repositories in lampepfl organization (needed to fork repositories for the community build) From 5504dbfd6890109a8a376baf823f4f404bda04ff Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Mon, 31 Jan 2022 17:01:18 +0100 Subject: [PATCH 1164/1244] Tsardom role spec updated according to the Dotty meeting of 31/01/22 --- MAINTENANCE.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index efbdd74ad1a6..f6308baa7024 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -16,13 +16,18 @@ Issue Tsar is responsible for: Other core teammates are responsible for providing information to the Issue Tsar in a timely manner when it is requested if they have that information. ## Assignment -Issue Tsar is rotated according to a well-defined, ordered list. They are appointed for 7 days and are responsible for what is specified in the “Responsibilities” section during those 7 days. Their assumption of the role starts on Monday and ends on Friday (both inclusive), and the scope of their responsibilities extends to all events that took place during the weekend before the Monday of their assignment. +Issue Tsar is appointed for 7 days and is responsible for what is specified in the “Responsibilities” section during those 7 days. Their assumption of the role starts from the Dotty Meeting on Monday and ends on the next Dotty Meeting on Monday. + +During the Dotty Meeting, an Issue Tsar is assigned for the current week and for the week after that. + +Issue Tsardom schedule is maintained in the [Issue Tsardom Statistics spreadsheet](https://docs.google.com/spreadsheets/d/19IAqNzHfJ9rsii3EsjIGwPz5BLTFJs_byGM3FprmX3E/edit?usp=sharing). So, someone who knows their availability several weeks ahead into the future can assign themselves to be an issue tsar well ahead of time. ## Prerequisites An issue tsar needs to have all the accesses and privileges required to get their job done. This might include: -Admin rights in lampepfl/dotty repository -Admin rights in lampepfl/dotty-feature-requests repository -Permissions to create new repositories in lampepfl organization (needed to fork repositories for the community build) +- Admin rights in lampepfl/dotty repository +- Admin rights in lampepfl/dotty-feature-requests repository +- Permissions to create new repositories in lampepfl organization (needed to fork repositories for the community build) +- Access to the LAMP slack to be able to ask for help with the infrastructure, triaging and such ## Procedures To ensure proper health of the infrastructure, the Tsar regularly monitors its proper operation. If a malfunction is detected, it is the Tsar's job to ensure that there’s someone working on it (or solve it on their own). From e1471b74d968780adc7e7cae0a12087311debe29 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Tue, 8 Feb 2022 16:09:22 +0100 Subject: [PATCH 1165/1244] Maintenance list added --- MAINTENANCE.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index f6308baa7024..0d84107f1b35 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -46,3 +46,30 @@ At the end of their Tsardom, the Tsar reports to the team during the Dotty meeti - How many new issues were opened during their Tsardom period? Were there any areas that got a lot of issues? How many regressions from a prior Scala 3 release were there? Which were designated for an MSc project or an Issue Spree? - If new labels were created or old ones were removed, or there is any other feedback on how to improve the Tsardom, mention that. - Unassigned PRs and issues that the team failed to classify: bring them one by one so that the team can make a decision on them. + +# Maintenance List +The following is the list of all the principal areas of the compiler and the core teams members who are responsible for their maintenance: + +- Typer: @odersky, @smarter, (@dwijnand) +- Erasure: @smarter, @odersky +- Enums: @bishabosha +- Pattern Matching: @dwijnand, (@liufengyun), @sjrd +- Inline: @nicolasstucki, @odersky +- Metaprogramming (Quotes, Reflect, Staging): @nicolasstucki, @aherlihy +- Match types: @OlivierBlanvillain, @dwijnand +- GADT: @abgruszecki, @dwijnand +- Scaladoc: @KacperFKorban, @BarkingBad, @pikinier20 +- Initialization checker: @olhotak, @liufengyun, @anatoliykmetyuk +- Safe nulls: @noti0na1, @olhotak +- tailrec: @sjrd, @mbovel +- JS backend: @sjrd +- forward compat (-scala-release): @prolativ, @Kordyjan, (@nicolasstucki) +- Benchmarks: @anatoliykmetyuk, @mbovel +- REPL: Dale, @anatoliykmetyuk, @prolativ +- CI: @anatoliykmetyuk +- Community Build: @anatoliykmetyuk +- Vulpix: Dale, @prolativ +- JVM backend: @sjrd (review only), @Kordyjan +- Derivation & Mirrors: @bishabosha, (@dwijnand) +- Linting (especially unused warnings) / Reporting UX : VirtusLab TBD? +- Java-compat: @Kordyjan From 146d50d32b98ab0c394aa79b0630d208f1aa43c5 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 9 Feb 2022 12:15:54 +0100 Subject: [PATCH 1166/1244] Fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Paweł Marks --- MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 0d84107f1b35..bcb29235d518 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -65,7 +65,7 @@ The following is the list of all the principal areas of the compiler and the cor - JS backend: @sjrd - forward compat (-scala-release): @prolativ, @Kordyjan, (@nicolasstucki) - Benchmarks: @anatoliykmetyuk, @mbovel -- REPL: Dale, @anatoliykmetyuk, @prolativ +- REPL: @dwijnand, @anatoliykmetyuk, @prolativ - CI: @anatoliykmetyuk - Community Build: @anatoliykmetyuk - Vulpix: Dale, @prolativ From 2d69c2bac3da055865dd09fd98a15a5a1f3f272b Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 9 Feb 2022 12:16:04 +0100 Subject: [PATCH 1167/1244] Fix typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Paweł Marks --- MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index bcb29235d518..5915a8b7b755 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -68,7 +68,7 @@ The following is the list of all the principal areas of the compiler and the cor - REPL: @dwijnand, @anatoliykmetyuk, @prolativ - CI: @anatoliykmetyuk - Community Build: @anatoliykmetyuk -- Vulpix: Dale, @prolativ +- Vulpix: @dwijnand, @prolativ - JVM backend: @sjrd (review only), @Kordyjan - Derivation & Mirrors: @bishabosha, (@dwijnand) - Linting (especially unused warnings) / Reporting UX : VirtusLab TBD? From baa99ed4db44bf6e8723a3adbe0bf1d0f1f6f0d9 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 9 Feb 2022 12:16:19 +0100 Subject: [PATCH 1168/1244] Make JVM backed maintenance more precise MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Paweł Marks --- MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 5915a8b7b755..95d60d494f13 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -69,7 +69,7 @@ The following is the list of all the principal areas of the compiler and the cor - CI: @anatoliykmetyuk - Community Build: @anatoliykmetyuk - Vulpix: @dwijnand, @prolativ -- JVM backend: @sjrd (review only), @Kordyjan +- JVM backend: @Kordyjan, (@sjrd) - Derivation & Mirrors: @bishabosha, (@dwijnand) - Linting (especially unused warnings) / Reporting UX : VirtusLab TBD? - Java-compat: @Kordyjan From 1e66185b43bdafad20a741465be68a09788fdec9 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Thu, 10 Feb 2022 11:07:18 +0100 Subject: [PATCH 1169/1244] Typo fix Co-authored-by: Nicolas Stucki --- MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 95d60d494f13..6710f331a8d2 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -11,7 +11,7 @@ Issue Tsar is responsible for: - Regressions from an earlier Scala 3 release must be classified with the “regression” label and assigned to the next release’s milestone. - Modifying issue labels to best capture information about the issues - Attempting to reproduce the issue (or label “stat:cannot reproduce”) - - Further minimising the issue or asking the reporter of the issue to minimize it correctly (or label “stat:needs minimization”) + - Further minimizing the issue or asking the reporter of the issue to minimize it correctly (or label “stat:needs minimization”) Other core teammates are responsible for providing information to the Issue Tsar in a timely manner when it is requested if they have that information. From 9426340ede016aa30fc230a22348becdc1a87096 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Thu, 10 Feb 2022 11:07:26 +0100 Subject: [PATCH 1170/1244] Typo fix Co-authored-by: Nicolas Stucki --- MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 6710f331a8d2..434fed6315ae 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -36,7 +36,7 @@ If it is unclear what area an issue belongs to, the Tsar asks for advice from ot If it is unclear who should review an external PR, the Tsar asks for advice from the rest of the core team. If after asking for advice, it is still unclear who should do it, the reviewer for such a PR will be decided at the next Dotty meeting. -In general, if anything else is unclear for proper fulfilment of responsibilities, the Tsar must proactively seek advice from other team members on Slack or other channels. +In general, if anything else is unclear for proper fulfillment of responsibilities, the Tsar must proactively seek advice from other team members on Slack or other channels. ## Reporting At the end of their Tsardom, the Tsar reports to the team during the Dotty meeting on the following points: From 9b85dc165dc72c6decfe9f0afcc8f715e71f9746 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Thu, 10 Feb 2022 11:07:38 +0100 Subject: [PATCH 1171/1244] Typo fix Co-authored-by: Nicolas Stucki --- MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 434fed6315ae..aafb9b31d471 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -32,7 +32,7 @@ An issue tsar needs to have all the accesses and privileges required to get thei ## Procedures To ensure proper health of the infrastructure, the Tsar regularly monitors its proper operation. If a malfunction is detected, it is the Tsar's job to ensure that there’s someone working on it (or solve it on their own). -If it is unclear what area an issue belongs to, the Tsar asks for advice from other team members, on Slack or GitHub. If, after asking for advice, it turns out that nobody in the team knows how to classify it, the issue must be classified with a “stat:needs triage” label. +If it is unclear what area an issue belongs to, the Tsar asks for advice from other team members on Slack or GitHub. If, after asking for advice, it turns out that nobody in the team knows how to classify it, the issue must be classified with a “stat:needs triage” label. If it is unclear who should review an external PR, the Tsar asks for advice from the rest of the core team. If after asking for advice, it is still unclear who should do it, the reviewer for such a PR will be decided at the next Dotty meeting. From 2d4042c6202c6721471aa6d89ddfe4dc3ae35fb4 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Thu, 10 Feb 2022 11:08:07 +0100 Subject: [PATCH 1172/1244] Reword MAINTENANCE Co-authored-by: Nicolas Stucki --- MAINTENANCE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index aafb9b31d471..621b9b526f5d 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -30,7 +30,7 @@ An issue tsar needs to have all the accesses and privileges required to get thei - Access to the LAMP slack to be able to ask for help with the infrastructure, triaging and such ## Procedures -To ensure proper health of the infrastructure, the Tsar regularly monitors its proper operation. If a malfunction is detected, it is the Tsar's job to ensure that there’s someone working on it (or solve it on their own). +To ensure proper health of the infrastructure, the Tsar regularly monitors its proper operation. If a malfunction is detected, the Tsar's job is to ensure that someone is working on it (or solve it on their own). If it is unclear what area an issue belongs to, the Tsar asks for advice from other team members on Slack or GitHub. If, after asking for advice, it turns out that nobody in the team knows how to classify it, the issue must be classified with a “stat:needs triage” label. From f9a347ce529c9542ec83496f5780d77d38411c2a Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Thu, 10 Feb 2022 12:29:48 +0100 Subject: [PATCH 1173/1244] Update MAINTENANCE.md Co-authored-by: Jamie Thompson --- MAINTENANCE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 621b9b526f5d..cb98344e1ea0 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -53,6 +53,7 @@ The following is the list of all the principal areas of the compiler and the cor - Typer: @odersky, @smarter, (@dwijnand) - Erasure: @smarter, @odersky - Enums: @bishabosha +- Export: @bishabosha, @odersky - Pattern Matching: @dwijnand, (@liufengyun), @sjrd - Inline: @nicolasstucki, @odersky - Metaprogramming (Quotes, Reflect, Staging): @nicolasstucki, @aherlihy From d9ef712029bccb81488b2685efc53a4a1f2998b5 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 25 Nov 2021 13:28:19 +0100 Subject: [PATCH 1174/1244] Improve -explain rendering --- .../dotc/reporting/ConsoleReporter.scala | 4 - .../dotc/reporting/MessageRendering.scala | 13 ++ .../tools/dotc/typer/ErrorReporting.scala | 9 +- compiler/test-resources/repl/errmsgs | 39 ++++-- .../test-resources/repl/i13208.default.scala | 3 +- compiler/test-resources/repl/i2063 | 9 +- compiler/test-resources/repl/i2213 | 3 +- compiler/test-resources/repl/i4217 | 3 +- compiler/test-resources/repl/i4566 | 3 +- compiler/test-resources/repl/i7644 | 6 +- compiler/test-resources/repl/importFromObj | 3 +- compiler/test-resources/repl/notFound | 6 +- compiler/test-resources/repl/nowarn.scala | 9 +- compiler/test-resources/repl/overrides | 6 +- compiler/test-resources/repl/reset-command | 3 +- .../test-resources/type-printer/type-mismatch | 3 +- .../explicit-nulls/byname-nullables.check | 4 +- .../explicit-nulls/i7883.check | 8 +- tests/neg-custom-args/i11637.check | 97 ++++++++------- tests/neg-custom-args/i13026.check | 8 +- tests/neg-custom-args/i13838.check | 4 +- tests/neg-custom-args/jdk-9-app.check | 4 +- .../kind-projector-underscores.check | 8 +- .../nowarn/nowarn-parser-error.check | 8 +- .../nowarn/nowarn-typer-error.check | 4 +- tests/neg-custom-args/nowarn/nowarn.check | 24 ++-- .../beta-reduce-inline-result.check | 4 +- tests/neg-macros/i6436.check | 4 +- .../type-splice-in-val-pattern.check | 4 +- .../jsconstructorof-error-in-typer.check | 12 +- tests/neg-scalajs/type-mismatch.check | 4 +- tests/neg/3559d.check | 4 +- tests/neg/6697.check | 4 +- tests/neg/EmptyCaseClassParams.check | 12 +- tests/neg/EmptyEnum.check | 4 +- tests/neg/SummonFrom.check | 8 +- tests/neg/abstract-givens.check | 4 +- tests/neg/ambiref.check | 16 +-- tests/neg/annot-printing.check | 4 +- tests/neg/bad-unapplies.check | 24 ++-- tests/neg/enumWithType.check | 4 +- tests/neg/i10268.check | 4 +- tests/neg/i10757.check | 4 +- tests/neg/i11437.check | 4 +- tests/neg/i11544.check | 4 +- tests/neg/i11561.check | 4 +- tests/neg/i12049.check | 4 +- tests/neg/i12150.check | 8 +- tests/neg/i12284.check | 4 +- tests/neg/i13435.check | 4 +- tests/neg/i13769.check | 4 +- tests/neg/i13960.check | 4 +- tests/neg/i14367.check | 4 +- tests/neg/i2033.check | 4 +- tests/neg/i4382.check | 16 +-- tests/neg/i5101.check | 4 +- tests/neg/i5311.check | 4 +- tests/neg/i6183.check | 4 +- tests/neg/i6205.check | 4 +- tests/neg/i6762b.check | 4 +- tests/neg/i6779.check | 8 +- tests/neg/i7195.check | 4 +- tests/neg/i7359-g.check | 4 +- tests/neg/i8569.check | 4 +- tests/neg/i8569a.check | 4 +- tests/neg/i8623.check | 4 +- tests/neg/i8736.check | 12 +- tests/neg/i8752.check | 4 +- tests/neg/i8988.check | 4 +- tests/neg/i9436.check | 4 +- tests/neg/i9437.check | 4 +- tests/neg/i9803.check | 4 +- tests/neg/i9958.check | 4 +- tests/neg/if-error.check | 4 +- tests/neg/kinds2.check | 4 +- tests/neg/leading-infix-miss.check | 4 +- tests/neg/matchtype-seq.check | 116 +++++++++--------- tests/neg/missing-implicit-2.check | 4 +- tests/neg/missing-implicit-3.check | 4 +- tests/neg/module-class-name.check | 16 +-- tests/neg/multi-file-error.check | 8 +- tests/neg/print-infix-type.check | 4 +- tests/neg/singleton-ops-any.check | 24 ++-- tests/neg/spaces-vs-tabs.check | 4 +- tests/neg/splice-pat.check | 4 +- tests/neg/t6124.check | 4 +- tests/neg/t6663.check | 4 +- 87 files changed, 401 insertions(+), 362 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala b/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala index f872968006b0..0d2292318a71 100644 --- a/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala +++ b/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala @@ -32,10 +32,6 @@ object ConsoleReporter { /** Prints the message with the given position indication. */ def doReport(dia: Diagnostic)(using Context): Unit = { printMessage(messageAndPos(dia)) - if Diagnostic.shouldExplain(dia) then - printMessage(explanation(dia.msg)) - else if dia.msg.canExplain then - printMessage("\nlonger explanation available when compiling with `-explain`") } } } diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala index b8f2d763fc83..813475799a2b 100644 --- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala +++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala @@ -249,6 +249,19 @@ trait MessageRendering { else sb.append(msg.message) if (dia.isVerbose) appendFilterHelp(dia, sb) + + if Diagnostic.shouldExplain(dia) then + sb.append(EOL).append(newBox()) + sb.append(EOL).append(offsetBox).append(" Explanation (enabled by `-explain`)") + sb.append(EOL).append(newBox(soft = true)) + dia.msg.explanation.split(EOL).foreach { line => + sb.append(EOL).append(offsetBox).append(if line.isEmpty then "" else " ").append(line) + } + sb.append(EOL).append(endBox) + else if dia.msg.canExplain then + sb.append(EOL).append(offsetBox) + sb.append(EOL).append(offsetBox).append(" longer explanation available when compiling with `-explain`") + sb.toString } diff --git a/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala b/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala index f64b970b5c80..733977734329 100644 --- a/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala +++ b/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala @@ -142,7 +142,7 @@ object ErrorReporting { |conforms to | $expected |but the comparison trace ended with `false`: - """ + |""" val c = ctx.typerState.constraint val constraintText = if c.domainLambdas.isEmpty then @@ -150,10 +150,9 @@ object ErrorReporting { else i"""a constraint with: |$c""" - i""" - |${TypeComparer.explained(_.isSubType(found, expected), header)} - | - |The tests were made under $constraintText""" + i"""${TypeComparer.explained(_.isSubType(found, expected), header)} + | + |The tests were made under $constraintText""" /** Format `raw` implicitNotFound or implicitAmbiguous argument, replacing * all occurrences of `${X}` where `X` is in `paramNames` with the diff --git a/compiler/test-resources/repl/errmsgs b/compiler/test-resources/repl/errmsgs index 14e9d44fa0b8..9819c1cb089f 100644 --- a/compiler/test-resources/repl/errmsgs +++ b/compiler/test-resources/repl/errmsgs @@ -6,7 +6,8 @@ scala> val x: List[String] = List(1) | ^ | Found: (1 : Int) | Required: String -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> val y: List[List[String]] = List(List(1)) -- [E007] Type Mismatch Error: ------------------------------------------------- @@ -14,7 +15,8 @@ scala> val y: List[List[String]] = List(List(1)) | ^ | Found: (1 : Int) | Required: String -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> val z: (List[String], List[Int]) = (List(1), List("a")) -- [E007] Type Mismatch Error: ------------------------------------------------- @@ -22,13 +24,15 @@ scala> val z: (List[String], List[Int]) = (List(1), List("a")) | ^ | Found: (1 : Int) | Required: String -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: ------------------------------------------------- 1 | val z: (List[String], List[Int]) = (List(1), List("a")) | ^^^ | Found: ("a" : String) | Required: Int -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 2 errors found scala> val a: Inv[String] = new Inv(new Inv(1)) -- [E007] Type Mismatch Error: ------------------------------------------------- @@ -36,7 +40,8 @@ scala> val a: Inv[String] = new Inv(new Inv(1)) | ^^^^^^^^^^ | Found: Inv[Int] | Required: String -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> val b: Inv[String] = new Inv(1) -- [E007] Type Mismatch Error: ------------------------------------------------- @@ -44,7 +49,8 @@ scala> val b: Inv[String] = new Inv(1) | ^ | Found: (1 : Int) | Required: String -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> abstract class C { type T; val x: T; val s: Unit = { type T = String; var y: T = x; locally { def f() = { type T = Int; val z: T = y }; f() } }; } -- [E007] Type Mismatch Error: ------------------------------------------------- @@ -55,7 +61,8 @@ scala> abstract class C { type T; val x: T; val s: Unit = { type T = String; var | |where: T is a type in class C | T² is a type in the initializer of value s which is an alias of String -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: ------------------------------------------------- 1 | abstract class C { type T; val x: T; val s: Unit = { type T = String; var y: T = x; locally { def f() = { type T = Int; val z: T = y }; f() } }; } | ^ @@ -64,7 +71,8 @@ longer explanation available when compiling with `-explain` | |where: T is a type in the initializer of value s which is an alias of String | T² is a type in method f which is an alias of Int -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 2 errors found scala> class Foo() { def bar: Int = 1 }; val foo = new Foo(); foo.barr -- [E008] Not Found Error: ----------------------------------------------------- @@ -78,33 +86,38 @@ scala> val x: List[Int] = "foo" :: List(1) | ^^^^^ | Found: ("foo" : String) | Required: Int -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> while ((( foo ))) {} -- [E006] Not Found Error: ----------------------------------------------------- 1 | while ((( foo ))) {} | ^^^ | Not found: foo -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> val a: iDontExist = 1 -- [E006] Not Found Error: ----------------------------------------------------- 1 | val a: iDontExist = 1 | ^^^^^^^^^^ | Not found: type iDontExist -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> def foo1(x: => Int) = x _ -- [E099] Syntax Error: -------------------------------------------------------- 1 | def foo1(x: => Int) = x _ | ^^^ |Only function types can be followed by _ but the current expression has type Int -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> def foo2(x: => Int): () => Int = x _ -- [E099] Syntax Error: -------------------------------------------------------- 1 | def foo2(x: => Int): () => Int = x _ | ^^^ |Only function types can be followed by _ but the current expression has type Int -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found diff --git a/compiler/test-resources/repl/i13208.default.scala b/compiler/test-resources/repl/i13208.default.scala index 586b5862a67f..9a18f9a67c66 100644 --- a/compiler/test-resources/repl/i13208.default.scala +++ b/compiler/test-resources/repl/i13208.default.scala @@ -5,5 +5,6 @@ scala> try 1 | ^^^^^ | A try without catch or finally is equivalent to putting | its body in a block; no exceptions are handled. -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` val res0: Int = 1 diff --git a/compiler/test-resources/repl/i2063 b/compiler/test-resources/repl/i2063 index e1da25588cdf..7245f677bfe6 100644 --- a/compiler/test-resources/repl/i2063 +++ b/compiler/test-resources/repl/i2063 @@ -3,19 +3,22 @@ scala> class Foo extends Bar // with one tab 1 | class Foo extends Bar // with one tab | ^^^ | Not found: type Bar -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> class Foo extends Bar // with spaces -- [E006] Not Found Error: ----------------------------------------------------- 1 | class Foo extends Bar // with spaces | ^^^ | Not found: type Bar -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> class Foo extends Bar // with tabs -- [E006] Not Found Error: ----------------------------------------------------- 1 | class Foo extends Bar // with tabs | ^^^ | Not found: type Bar -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found diff --git a/compiler/test-resources/repl/i2213 b/compiler/test-resources/repl/i2213 index b4f703b42167..b75b2056c959 100644 --- a/compiler/test-resources/repl/i2213 +++ b/compiler/test-resources/repl/i2213 @@ -3,7 +3,8 @@ scala> def x 1 | def x | ^ | Missing return type -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` scala> def x: Int -- [E067] Syntax Error: -------------------------------------------------------- 1 | def x: Int diff --git a/compiler/test-resources/repl/i4217 b/compiler/test-resources/repl/i4217 index 61dfcdc3a955..d4e113271073 100644 --- a/compiler/test-resources/repl/i4217 +++ b/compiler/test-resources/repl/i4217 @@ -6,5 +6,6 @@ scala> def foo(x: Option[Int]) = x match { case None => } | match may not be exhaustive. | | It would fail on pattern case: Some(_) -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` def foo(x: Option[Int]): Unit diff --git a/compiler/test-resources/repl/i4566 b/compiler/test-resources/repl/i4566 index 27516a98b0c1..32d84a6403d4 100644 --- a/compiler/test-resources/repl/i4566 +++ b/compiler/test-resources/repl/i4566 @@ -4,5 +4,6 @@ scala> object test { type ::[A, B]; def a: Int :: Int = ???; def b: Int = a } | ^ | Found: Int :: Int | Required: Int -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found diff --git a/compiler/test-resources/repl/i7644 b/compiler/test-resources/repl/i7644 index 4b6fd33acefa..8ceaf8b00804 100644 --- a/compiler/test-resources/repl/i7644 +++ b/compiler/test-resources/repl/i7644 @@ -3,7 +3,8 @@ scala> class T extends CanEqual 1 | class T extends CanEqual | ^ | Cannot extend sealed trait CanEqual in a different source file -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E056] Syntax Error: -------------------------------------------------------- 1 | class T extends CanEqual | ^^^^^^^^ @@ -14,7 +15,8 @@ scala> class T extends CanEqual 1 | class T extends CanEqual | ^ | Cannot extend sealed trait CanEqual in a different source file -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E056] Syntax Error: -------------------------------------------------------- 1 | class T extends CanEqual | ^^^^^^^^ diff --git a/compiler/test-resources/repl/importFromObj b/compiler/test-resources/repl/importFromObj index 58e8c5370f72..281025af45f5 100644 --- a/compiler/test-resources/repl/importFromObj +++ b/compiler/test-resources/repl/importFromObj @@ -10,7 +10,8 @@ scala> buf += xs | ^^ | Found: (o.xs : List[Int]) | Required: Int -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> buf ++= xs val res0: scala.collection.mutable.ListBuffer[Int] = ListBuffer(1, 2, 3) diff --git a/compiler/test-resources/repl/notFound b/compiler/test-resources/repl/notFound index e6b251d8b723..689854ef2700 100644 --- a/compiler/test-resources/repl/notFound +++ b/compiler/test-resources/repl/notFound @@ -3,12 +3,14 @@ scala> Foo 1 | Foo | ^^^ | Not found: Foo -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> Bar -- [E006] Not Found Error: ----------------------------------------------------- 1 | Bar | ^^^ | Not found: Bar -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found diff --git a/compiler/test-resources/repl/nowarn.scala b/compiler/test-resources/repl/nowarn.scala index 3236d60f9805..db6ea24465e7 100644 --- a/compiler/test-resources/repl/nowarn.scala +++ b/compiler/test-resources/repl/nowarn.scala @@ -5,7 +5,8 @@ scala> @annotation.nowarn def f = try 1 // @nowarn doesn't work on first line, c | ^^^^^ | A try without catch or finally is equivalent to putting | its body in a block; no exceptions are handled. -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` def f: Int scala> @annotation.nowarn def f = try 1 def f: Int @@ -16,7 +17,8 @@ scala> def f = try 1 | ^^^^^ | A try without catch or finally is equivalent to putting | its body in a block; no exceptions are handled. -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` def f: Int scala> @annotation.nowarn def f = { 1; 2 } def f: Int @@ -26,5 +28,6 @@ scala> def f = { 1; 2 } 1 | def f = { 1; 2 } | ^ |A pure expression does nothing in statement position; you may be omitting necessary parentheses -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` def f: Int diff --git a/compiler/test-resources/repl/overrides b/compiler/test-resources/repl/overrides index a32d4b18d404..5bad603801a4 100644 --- a/compiler/test-resources/repl/overrides +++ b/compiler/test-resources/repl/overrides @@ -3,7 +3,8 @@ scala> class B { override def foo(i: Int): Unit = {}; } 1 | class B { override def foo(i: Int): Unit = {}; } | ^ | method foo overrides nothing -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala> class A { def foo: Unit = {}; } // defined class A @@ -12,5 +13,6 @@ scala> class B extends A { override def foo(i: Int): Unit = {}; } 1 | class B extends A { override def foo(i: Int): Unit = {}; } | ^ | method foo has a different signature than the overridden declaration -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found diff --git a/compiler/test-resources/repl/reset-command b/compiler/test-resources/repl/reset-command index e47b3c45f696..ad38c9e9a867 100644 --- a/compiler/test-resources/repl/reset-command +++ b/compiler/test-resources/repl/reset-command @@ -22,7 +22,8 @@ scala> resetNoArgsStillWorks 1 | resetNoArgsStillWorks | ^^^^^^^^^^^^^^^^^^^^^ | Not found: resetNoArgsStillWorks -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found scala>:settings "-Dfoo=bar baz" diff --git a/compiler/test-resources/type-printer/type-mismatch b/compiler/test-resources/type-printer/type-mismatch index 363065320b9d..d139f9dff74b 100644 --- a/compiler/test-resources/type-printer/type-mismatch +++ b/compiler/test-resources/type-printer/type-mismatch @@ -8,5 +8,6 @@ scala> val x: Foo[String] = res0 | ^^^^ | Found: (res0 : Foo[Int]) | Required: Foo[String] -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` 1 error found diff --git a/tests/neg-custom-args/explicit-nulls/byname-nullables.check b/tests/neg-custom-args/explicit-nulls/byname-nullables.check index efe94a496c19..ffd0a637563e 100644 --- a/tests/neg-custom-args/explicit-nulls/byname-nullables.check +++ b/tests/neg-custom-args/explicit-nulls/byname-nullables.check @@ -3,8 +3,8 @@ | ^ | Found: (x : String | Null) | Required: String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- Error: tests/neg-custom-args/explicit-nulls/byname-nullables.scala:43:32 -------------------------------------------- 43 | if x != null then f(identity(x), 1) // error: dropping not null check fails typing | ^^^^^^^^^^^ diff --git a/tests/neg-custom-args/explicit-nulls/i7883.check b/tests/neg-custom-args/explicit-nulls/i7883.check index 9a1165a6440e..579ea0b4cd00 100644 --- a/tests/neg-custom-args/explicit-nulls/i7883.check +++ b/tests/neg-custom-args/explicit-nulls/i7883.check @@ -10,11 +10,11 @@ 6 | case r(hd, tl) => Some((hd, tl)) // error // error // error | ^^ | Not found: hd - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E006] Not Found Error: tests/neg-custom-args/explicit-nulls/i7883.scala:6:34 --------------------------------------- 6 | case r(hd, tl) => Some((hd, tl)) // error // error // error | ^^ | Not found: tl - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg-custom-args/i11637.check b/tests/neg-custom-args/i11637.check index eca2cf91b99f..41c49d81e9d0 100644 --- a/tests/neg-custom-args/i11637.check +++ b/tests/neg-custom-args/i11637.check @@ -2,56 +2,55 @@ 11 | var h = new HKT3_1[FunctorImpl](); // error // error | ^ | Type argument test2.FunctorImpl does not conform to upper bound [Generic2[T <: String] <: Set[T]] =>> Any - -Explanation -=========== - -I tried to show that - test2.FunctorImpl -conforms to - [Generic2[T <: String] <: Set[T]] =>> Any -but the comparison trace ended with `false`: - - ==> test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any - ==> type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] - ==> [T <: String] =>> Set[T] <: Iterable - ==> type bounds [] <: type bounds [ <: String] - ==> Any <: String - ==> Any <: String - <== Any <: String = false - <== Any <: String = false - <== type bounds [] <: type bounds [ <: String] = false - <== [T <: String] =>> Set[T] <: Iterable = false - <== type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] = false - <== test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any = false - -The tests were made under the empty constraint - + |-------------------------------------------------------------------------------------------------------------------- + | Explanation (enabled by `-explain`) + |···················································································································· + | I tried to show that + | test2.FunctorImpl + | conforms to + | [Generic2[T <: String] <: Set[T]] =>> Any + | but the comparison trace ended with `false`: + | + | ==> test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any + | ==> type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] + | ==> [T <: String] =>> Set[T] <: Iterable + | ==> type bounds [] <: type bounds [ <: String] + | ==> Any <: String + | ==> Any <: String + | <== Any <: String = false + | <== Any <: String = false + | <== type bounds [] <: type bounds [ <: String] = false + | <== [T <: String] =>> Set[T] <: Iterable = false + | <== type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] = false + | <== test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any = false + | + | The tests were made under the empty constraint + ·-------------------------------------------------------------------------------------------------------------------- -- [E057] Type Mismatch Error: tests/neg-custom-args/i11637.scala:11:21 ------------------------------------------------ 11 | var h = new HKT3_1[FunctorImpl](); // error // error | ^ | Type argument test2.FunctorImpl does not conform to upper bound [Generic2[T <: String] <: Set[T]] =>> Any - -Explanation -=========== - -I tried to show that - test2.FunctorImpl -conforms to - [Generic2[T <: String] <: Set[T]] =>> Any -but the comparison trace ended with `false`: - - ==> test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any - ==> type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] - ==> [T <: String] =>> Set[T] <: Iterable - ==> type bounds [] <: type bounds [ <: String] - ==> Any <: String - ==> Any <: String - <== Any <: String = false - <== Any <: String = false - <== type bounds [] <: type bounds [ <: String] = false - <== [T <: String] =>> Set[T] <: Iterable = false - <== type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] = false - <== test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any = false - -The tests were made under the empty constraint + |-------------------------------------------------------------------------------------------------------------------- + | Explanation (enabled by `-explain`) + |···················································································································· + | I tried to show that + | test2.FunctorImpl + | conforms to + | [Generic2[T <: String] <: Set[T]] =>> Any + | but the comparison trace ended with `false`: + | + | ==> test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any + | ==> type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] + | ==> [T <: String] =>> Set[T] <: Iterable + | ==> type bounds [] <: type bounds [ <: String] + | ==> Any <: String + | ==> Any <: String + | <== Any <: String = false + | <== Any <: String = false + | <== type bounds [] <: type bounds [ <: String] = false + | <== [T <: String] =>> Set[T] <: Iterable = false + | <== type bounds [[T <: String] <: Set[T]] <: type bounds [[T] <: Iterable[T]] = false + | <== test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any = false + | + | The tests were made under the empty constraint + ·-------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-custom-args/i13026.check b/tests/neg-custom-args/i13026.check index ec729f1968b1..e610aa51336c 100644 --- a/tests/neg-custom-args/i13026.check +++ b/tests/neg-custom-args/i13026.check @@ -3,15 +3,15 @@ | ^^^^^^^^^^^^ | Found: ("not an int" : String) | Required: Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg-custom-args/i13026.scala:2:13 ------------------------------------------------- 2 |val y: Int = "not an int" // error | ^^^^^^^^^^^^ | Found: ("not an int" : String) | Required: Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E008] Not Found Error: tests/neg-custom-args/i13026.scala:3:20 ----------------------------------------------------- 3 |def foo(x: Any) = x.foo // error | ^^^^^ diff --git a/tests/neg-custom-args/i13838.check b/tests/neg-custom-args/i13838.check index 5730cb144e52..f6866dc6bf2a 100644 --- a/tests/neg-custom-args/i13838.check +++ b/tests/neg-custom-args/i13838.check @@ -22,5 +22,5 @@ | You can change the behavior by setting the `-Ximplicit-search-limit` value. | Smaller values cause the search to fail faster. | Larger values might make a very large search problem succeed. - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg-custom-args/jdk-9-app.check b/tests/neg-custom-args/jdk-9-app.check index e2b94e2cb115..0eacc7510766 100644 --- a/tests/neg-custom-args/jdk-9-app.check +++ b/tests/neg-custom-args/jdk-9-app.check @@ -2,5 +2,5 @@ 4 | println(ProcessHandle.current().pid()) // error: not found | ^^^^^^^^^^^^^ | Not found: ProcessHandle - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg-custom-args/kind-projector-underscores.check b/tests/neg-custom-args/kind-projector-underscores.check index bf4cdcfce30d..2a832ae3d7a2 100644 --- a/tests/neg-custom-args/kind-projector-underscores.check +++ b/tests/neg-custom-args/kind-projector-underscores.check @@ -6,14 +6,14 @@ 10 | type -_ = Int // error -_ not allowed as a type def name without backticks | ^ | =, >:, or <: expected, but '_' found - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E095] Syntax Error: tests/neg-custom-args/kind-projector-underscores.scala:11:8 ------------------------------------ 11 | type +_ = Int // error +_ not allowed as a type def name without backticks | ^ | =, >:, or <: expected, but '_' found - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- Error: tests/neg-custom-args/kind-projector-underscores.scala:14:51 ------------------------------------------------- 14 |class BacktickUnderscoreIsNotFine extends Foo[List[`_`]] // error wildcard invalid as backquoted identifier | ^ diff --git a/tests/neg-custom-args/nowarn/nowarn-parser-error.check b/tests/neg-custom-args/nowarn/nowarn-parser-error.check index 049d3b5b1a18..ce0d9113cf7f 100644 --- a/tests/neg-custom-args/nowarn/nowarn-parser-error.check +++ b/tests/neg-custom-args/nowarn/nowarn-parser-error.check @@ -2,12 +2,12 @@ 3 | def def // error | ^^^ | an identifier expected, but 'def' found - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E000] Syntax Warning: tests/neg-custom-args/nowarn/nowarn-parser-error.scala:2:10 ---------------------------------- 2 | def a = try 1 // warn | ^^^^^ | A try without catch or finally is equivalent to putting | its body in a block; no exceptions are handled. - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg-custom-args/nowarn/nowarn-typer-error.check b/tests/neg-custom-args/nowarn/nowarn-typer-error.check index da143965006b..a6c915807dca 100644 --- a/tests/neg-custom-args/nowarn/nowarn-typer-error.check +++ b/tests/neg-custom-args/nowarn/nowarn-typer-error.check @@ -2,5 +2,5 @@ 4 | def t1 = / // error | ^ | Not found: / - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg-custom-args/nowarn/nowarn.check b/tests/neg-custom-args/nowarn/nowarn.check index 736d9f82e910..d542643dbbbc 100644 --- a/tests/neg-custom-args/nowarn/nowarn.check +++ b/tests/neg-custom-args/nowarn/nowarn.check @@ -3,22 +3,22 @@ | ^^^^^ | A try without catch or finally is equivalent to putting | its body in a block; no exceptions are handled. - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E000] Syntax Warning: tests/neg-custom-args/nowarn/nowarn.scala:23:25 ---------------------------------------------- 23 |@nowarn(o.inl) def t2d = try 1 // two warnings (`inl` is not a compile-time constant) | ^^^^^ | A try without catch or finally is equivalent to putting | its body in a block; no exceptions are handled. - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E000] Syntax Warning: tests/neg-custom-args/nowarn/nowarn.scala:31:26 ---------------------------------------------- 31 |@nowarn("id=1") def t4d = try 1 // error and warning (unused nowarn, wrong id) | ^^^^^ | A try without catch or finally is equivalent to putting | its body in a block; no exceptions are handled. - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E000] Syntax Warning: tests/neg-custom-args/nowarn/nowarn.scala:33:28 ---------------------------------------------- 33 |@nowarn("verbose") def t5 = try 1 // warning with details | ^^^^^ @@ -27,14 +27,14 @@ longer explanation available when compiling with `-explain` Matching filters for @nowarn or -Wconf: - id=E0 - name=EmptyCatchOrFinallyBlock - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E129] Potential Issue Warning: tests/neg-custom-args/nowarn/nowarn.scala:13:11 ------------------------------------- 13 |def t2 = { 1; 2 } // warning (the invalid nowarn doesn't silence anything) | ^ | A pure expression does nothing in statement position; you may be omitting necessary parentheses - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- Warning: tests/neg-custom-args/nowarn/nowarn.scala:12:8 ------------------------------------------------------------- 12 |@nowarn("wat?") // warning (typer, invalid filter) | ^^^^^^ @@ -44,8 +44,8 @@ longer explanation available when compiling with `-explain` 16 |def t2a = { 1; 2 } // warning (invalid nowarn doesn't silence) | ^ | A pure expression does nothing in statement position; you may be omitting necessary parentheses - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- Warning: tests/neg-custom-args/nowarn/nowarn.scala:15:8 ------------------------------------------------------------- 15 |@nowarn(t1a.toString) // warning (typer, argument not a compile-time constant) | ^^^^^^^^^^^^ diff --git a/tests/neg-macros/beta-reduce-inline-result.check b/tests/neg-macros/beta-reduce-inline-result.check index 0dd6098fb820..7b615feef308 100644 --- a/tests/neg-macros/beta-reduce-inline-result.check +++ b/tests/neg-macros/beta-reduce-inline-result.check @@ -4,5 +4,5 @@ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | Found: Int | Required: (4 : Int) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg-macros/i6436.check b/tests/neg-macros/i6436.check index d861ad90717d..0b04bb9ddae2 100644 --- a/tests/neg-macros/i6436.check +++ b/tests/neg-macros/i6436.check @@ -6,5 +6,5 @@ 6 | val ps: Seq[Expr[String]] = parts // error | ^^^^^ | Not found: parts - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg-macros/type-splice-in-val-pattern.check b/tests/neg-macros/type-splice-in-val-pattern.check index 26a457127acb..627aa2d5755d 100644 --- a/tests/neg-macros/type-splice-in-val-pattern.check +++ b/tests/neg-macros/type-splice-in-val-pattern.check @@ -2,5 +2,5 @@ 5 | val '[ *:[$t] ] = ??? // error | ^^ | Type splices cannot be used in val patterns. Consider using `match` instead. - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg-scalajs/jsconstructorof-error-in-typer.check b/tests/neg-scalajs/jsconstructorof-error-in-typer.check index 391ffa4c6933..c0d25674dec5 100644 --- a/tests/neg-scalajs/jsconstructorof-error-in-typer.check +++ b/tests/neg-scalajs/jsconstructorof-error-in-typer.check @@ -2,17 +2,17 @@ 9 | val a = js.constructorOf[ScalaClass] // error | ^ | Type argument ScalaClass does not conform to upper bound scala.scalajs.js.Any - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E057] Type Mismatch Error: tests/neg-scalajs/jsconstructorof-error-in-typer.scala:10:27 ---------------------------- 10 | val b = js.constructorOf[ScalaTrait] // error | ^ | Type argument ScalaTrait does not conform to upper bound scala.scalajs.js.Any - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E057] Type Mismatch Error: tests/neg-scalajs/jsconstructorof-error-in-typer.scala:11:27 ---------------------------- 11 | val c = js.constructorOf[ScalaObject.type] // error | ^ | Type argument ScalaObject.type does not conform to upper bound scala.scalajs.js.Any - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg-scalajs/type-mismatch.check b/tests/neg-scalajs/type-mismatch.check index 2ea5f1f23945..73bb52079e3d 100644 --- a/tests/neg-scalajs/type-mismatch.check +++ b/tests/neg-scalajs/type-mismatch.check @@ -3,5 +3,5 @@ | ^^^ | Found: (msg : String) | Required: Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/3559d.check b/tests/neg/3559d.check index 128093d8579a..0f0e05f784b2 100644 --- a/tests/neg/3559d.check +++ b/tests/neg/3559d.check @@ -2,5 +2,5 @@ 7 | this(f) // error | ^ | Not found: f - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/6697.check b/tests/neg/6697.check index b2aeaa94d859..3249ad7aa4af 100644 --- a/tests/neg/6697.check +++ b/tests/neg/6697.check @@ -9,5 +9,5 @@ | failed since selector O | does not match case Test.Of[sup, sub] => sub | and cannot be shown to be disjoint from it either. - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/EmptyCaseClassParams.check b/tests/neg/EmptyCaseClassParams.check index 6cd019571c73..67ecda360cd4 100644 --- a/tests/neg/EmptyCaseClassParams.check +++ b/tests/neg/EmptyCaseClassParams.check @@ -2,17 +2,17 @@ 2 | case class A[T] // error | ^ | A case class must have at least one parameter list - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E004] Syntax Error: tests/neg/EmptyCaseClassParams.scala:5:13 ------------------------------------------------------ 5 | case class B[T] // error | ^ | A case class must have at least one parameter list - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E004] Syntax Error: tests/neg/EmptyCaseClassParams.scala:9:9 ------------------------------------------------------- 9 | case D[T] extends Foo[T] // error | ^ | A case class must have at least one parameter list - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/EmptyEnum.check b/tests/neg/EmptyEnum.check index 91281e6904e7..2ee3b74b4c15 100644 --- a/tests/neg/EmptyEnum.check +++ b/tests/neg/EmptyEnum.check @@ -2,5 +2,5 @@ 1 |enum EmptyEnum {} // error | ^^^^^^^^^ | Enumerations must contain at least one case - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/SummonFrom.check b/tests/neg/SummonFrom.check index e8bb4ad521f5..f0a3d4d1dbee 100644 --- a/tests/neg/SummonFrom.check +++ b/tests/neg/SummonFrom.check @@ -2,11 +2,11 @@ 4 | case x => ??? // error | ^ | Unexpected pattern for summonFrom. Expected `x: T` or `_` - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E153] Syntax Error: tests/neg/SummonFrom.scala:8:7 ----------------------------------------------------------------- 8 | case x@String => ??? // error | ^^^^^^^^ | Unexpected pattern for summonFrom. Expected `x: T` or `_` - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/abstract-givens.check b/tests/neg/abstract-givens.check index ee58afd3e76d..a74d0097b091 100644 --- a/tests/neg/abstract-givens.check +++ b/tests/neg/abstract-givens.check @@ -12,5 +12,5 @@ | ^ | error overriding given instance z in trait T of type [T](using x$1: T): List[T]; | given instance z of type [T](using x$1: T): Seq[T] has incompatible type - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/ambiref.check b/tests/neg/ambiref.check index d222940e0dbc..95b542c7aae3 100644 --- a/tests/neg/ambiref.check +++ b/tests/neg/ambiref.check @@ -4,29 +4,29 @@ | Reference to x is ambiguous, | it is both defined in object Test | and inherited subsequently in class D - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E049] Reference Error: tests/neg/ambiref.scala:10:14 --------------------------------------------------------------- 10 | println(x) // error | ^ | Reference to x is ambiguous, | it is both defined in object Test | and inherited subsequently in anonymous class test1.C {...} - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E049] Reference Error: tests/neg/ambiref.scala:17:14 --------------------------------------------------------------- 17 | println(y) // error | ^ | Reference to y is ambiguous, | it is both defined in method c | and inherited subsequently in anonymous class D {...} - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E049] Reference Error: tests/neg/ambiref.scala:25:16 --------------------------------------------------------------- 25 | println(y) // error | ^ | Reference to y is ambiguous, | it is both defined in method c | and inherited subsequently in class E - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/annot-printing.check b/tests/neg/annot-printing.check index 8c413e37a07e..c16112fe18b9 100644 --- a/tests/neg/annot-printing.check +++ b/tests/neg/annot-printing.check @@ -3,5 +3,5 @@ | ^^^^^ | Found: ("abc" : String) | Required: Int @nowarn() @main @Foo @Bar("hello") - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/bad-unapplies.check b/tests/neg/bad-unapplies.check index a2ee445b7db5..44633ca6950a 100644 --- a/tests/neg/bad-unapplies.check +++ b/tests/neg/bad-unapplies.check @@ -5,35 +5,35 @@ | (x: B): Option[String] | (x: A): Option[String] | both match arguments (C) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E127] Syntax Error: tests/neg/bad-unapplies.scala:23:9 ------------------------------------------------------------- 23 | case B("2") => // error (cannot be used as an extractor) | ^ | B cannot be used as an extractor in a pattern because it lacks an unapply or unapplySeq method - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E127] Syntax Error: tests/neg/bad-unapplies.scala:24:9 ------------------------------------------------------------- 24 | case D("2") => // error (cannot be used as an extractor) | ^ | D cannot be used as an extractor in a pattern because it lacks an unapply or unapplySeq method - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E050] Type Error: tests/neg/bad-unapplies.scala:25:9 --------------------------------------------------------------- 25 | case E("2") => // error (value unapply in object E does not take parameters) | ^ | value unapply in object E does not take parameters - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E107] Syntax Error: tests/neg/bad-unapplies.scala:26:10 ------------------------------------------------------------ 26 | case F("2") => // error (Wrong number of argument patterns for F; expected: ()) | ^^^^^^ | Wrong number of argument patterns for F; expected: () - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E006] Not Found Error: tests/neg/bad-unapplies.scala:27:9 ---------------------------------------------------------- 27 | case G("2") => // error (Not found: G) | ^ | Not found: G - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/enumWithType.check b/tests/neg/enumWithType.check index fcc06d3532a4..76bc966e2955 100644 --- a/tests/neg/enumWithType.check +++ b/tests/neg/enumWithType.check @@ -2,5 +2,5 @@ 2 | case C[U](u: U) // error | ^ | explicit extends clause needed because both enum case and enum class have type parameters - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i10268.check b/tests/neg/i10268.check index e08571f7463d..abe39586b373 100644 --- a/tests/neg/i10268.check +++ b/tests/neg/i10268.check @@ -2,5 +2,5 @@ 2 | def test[T] = ?//test // error | ^ | Not found: ? - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i10757.check b/tests/neg/i10757.check index d60d2eea0b41..3a46c4e6cc53 100644 --- a/tests/neg/i10757.check +++ b/tests/neg/i10757.check @@ -2,5 +2,5 @@ 4 | case Var(name, _) => name: String // error | ^^^^^^^^^^^^ | Wrong number of argument patterns for Var; expected: (String) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i11437.check b/tests/neg/i11437.check index f327d6a6a8d2..c8d7a2535964 100644 --- a/tests/neg/i11437.check +++ b/tests/neg/i11437.check @@ -2,5 +2,5 @@ 1 |transparent inline def foo = error // error | ^^^^^ | Not found: error - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i11544.check b/tests/neg/i11544.check index b4dba8a072c4..15469f0c37a5 100644 --- a/tests/neg/i11544.check +++ b/tests/neg/i11544.check @@ -7,5 +7,5 @@ | both match arguments ((23 : Int)) | | Note: Overloaded definitions introduced by refinements cannot be resolved - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i11561.check b/tests/neg/i11561.check index b1792511b0d0..96bf1ec6accf 100644 --- a/tests/neg/i11561.check +++ b/tests/neg/i11561.check @@ -9,5 +9,5 @@ 3 | val updateText2 = copy(text = (_: String)) // error | ^^^^^^^^^^^^^^^^^^ | Reassignment to val text - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i12049.check b/tests/neg/i12049.check index 0efc803477a8..44b8897605f0 100644 --- a/tests/neg/i12049.check +++ b/tests/neg/i12049.check @@ -13,8 +13,8 @@ | Therefore, reduction cannot advance to the remaining case | | case B => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- Error: tests/neg/i12049.scala:14:23 --------------------------------------------------------------------------------- 14 |val y3: String = ??? : Last[Int *: Int *: Boolean *: String *: EmptyTuple] // error | ^ diff --git a/tests/neg/i12150.check b/tests/neg/i12150.check index 44f09d772b43..60f559cde474 100644 --- a/tests/neg/i12150.check +++ b/tests/neg/i12150.check @@ -2,11 +2,11 @@ 1 |def f: Unit = // error | ^ | expression expected but end found - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E129] Potential Issue Warning: tests/neg/i12150.scala:1:11 --------------------------------------------------------- 1 |def f: Unit = // error | ^ | A pure expression does nothing in statement position; you may be omitting necessary parentheses - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i12284.check b/tests/neg/i12284.check index 00e445d3c41c..7d61acd012a5 100644 --- a/tests/neg/i12284.check +++ b/tests/neg/i12284.check @@ -5,5 +5,5 @@ | Required: Vector[F[Any]] | | where: F is a type in method magic with bounds <: [_] =>> Any - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i13435.check b/tests/neg/i13435.check index d60bea7ab588..ee2027a3dfe2 100644 --- a/tests/neg/i13435.check +++ b/tests/neg/i13435.check @@ -4,8 +4,8 @@ | match may not be exhaustive. | | It would fail on pattern case: (_), ((_, _), (_, _)) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- Error: tests/neg/i13435.scala:8:10 ---------------------------------------------------------------------------------- 8 | case (dim: Axis, size: Int) => dim // error | ^^^^^^^^^ diff --git a/tests/neg/i13769.check b/tests/neg/i13769.check index 7785fbf4d198..3d7af1bd06a1 100644 --- a/tests/neg/i13769.check +++ b/tests/neg/i13769.check @@ -6,5 +6,5 @@ 2 |val te = tup.map((x: _ <: Int) => List(x)) // error // error | ^ | Not found: x - -longer explanation available when compiling with `-explain` \ No newline at end of file + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i13960.check b/tests/neg/i13960.check index ce280f48be4c..190f55690a5b 100644 --- a/tests/neg/i13960.check +++ b/tests/neg/i13960.check @@ -2,5 +2,5 @@ 13 | case A() => // error | ^^^ | A is not a valid result type of an unapply method of an extractor. - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i14367.check b/tests/neg/i14367.check index 92d974db120f..94158bf73923 100644 --- a/tests/neg/i14367.check +++ b/tests/neg/i14367.check @@ -3,5 +3,5 @@ | ^ | Found: (i : Seq[Int]) | Required: Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i2033.check b/tests/neg/i2033.check index 0c5a9da975bd..5751d91f4f3a 100644 --- a/tests/neg/i2033.check +++ b/tests/neg/i2033.check @@ -7,8 +7,8 @@ | ^^^^^^^ | Found: Unit | Required: String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- Warning: tests/neg/i2033.scala:6:37 --------------------------------------------------------------------------------- 6 | val out = new ObjectOutputStream(println) | ^^^^^^^ diff --git a/tests/neg/i4382.check b/tests/neg/i4382.check index 3d21702ffe0f..4905638ab62a 100644 --- a/tests/neg/i4382.check +++ b/tests/neg/i4382.check @@ -2,23 +2,23 @@ 3 | def v1: Id[_] = ??? // error | ^^^^^ | unreducible application of higher-kinded type App.Id to wildcard arguments - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E043] Type Error: tests/neg/i4382.scala:6:10 ----------------------------------------------------------------------- 6 | def v2: HkL[_] = ??? // error | ^^^^^^ | unreducible application of higher-kinded type App.HkL to wildcard arguments - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E043] Type Error: tests/neg/i4382.scala:9:10 ----------------------------------------------------------------------- 9 | def v3: HkU[_] = ??? // error | ^^^^^^ | unreducible application of higher-kinded type App.HkU to wildcard arguments - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E043] Type Error: tests/neg/i4382.scala:12:10 ---------------------------------------------------------------------- 12 | def v4: HkAbs[_] = ??? // error | ^^^^^^^^ | unreducible application of higher-kinded type App.HkAbs to wildcard arguments - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i5101.check b/tests/neg/i5101.check index 151b8cf2dd4e..4f4bac89aa44 100644 --- a/tests/neg/i5101.check +++ b/tests/neg/i5101.check @@ -2,5 +2,5 @@ 11 | case A0(_) => // error | ^^ | Not found: A0 - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i5311.check b/tests/neg/i5311.check index bd2940afc7a9..eb9122b94ed6 100644 --- a/tests/neg/i5311.check +++ b/tests/neg/i5311.check @@ -3,5 +3,5 @@ | ^^^^^^^^^^^^^^^^^^^ | Found: s.T[Int] => s.T[Int] | Required: m.Foo - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i6183.check b/tests/neg/i6183.check index acb2a58766ec..70c1afaae621 100644 --- a/tests/neg/i6183.check +++ b/tests/neg/i6183.check @@ -17,5 +17,5 @@ | [B](b: B)(using x$2: DummyImplicit): Char | [A](a: A): String | both match arguments ((42 : Int)) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i6205.check b/tests/neg/i6205.check index caca487ee2db..9f35c21b5ef3 100644 --- a/tests/neg/i6205.check +++ b/tests/neg/i6205.check @@ -2,5 +2,5 @@ 4 | def foo = // error | ^ | Type argument Nothing does not conform to lower bound Null in inferred type Contra[Nothing] - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i6762b.check b/tests/neg/i6762b.check index 9c0d571dd77b..a844fcf280bf 100644 --- a/tests/neg/i6762b.check +++ b/tests/neg/i6762b.check @@ -3,5 +3,5 @@ | ^^^^^^^^^^^ | Found: Expr[String] | Required: Expr[G[String]] - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i6779.check b/tests/neg/i6779.check index d2953c80f2b4..d895203221ec 100644 --- a/tests/neg/i6779.check +++ b/tests/neg/i6779.check @@ -3,8 +3,8 @@ | ^^^^^^^^^^^^^^^^^^^^^^^^ | Found: F[T] | Required: F[G[T]] - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E008] Not Found Error: tests/neg/i6779.scala:12:31 ----------------------------------------------------------------- 12 | def g2[T](x: T): F[G[T]] = x.f // error | ^^^ @@ -20,5 +20,5 @@ longer explanation available when compiling with `-explain` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | Found: F[T] | Required: F[G[T]] - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i7195.check b/tests/neg/i7195.check index 0d393ca0e979..3c95a2073b58 100644 --- a/tests/neg/i7195.check +++ b/tests/neg/i7195.check @@ -6,5 +6,5 @@ | | where: T is a type in object B | T² is a type in object A - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i7359-g.check b/tests/neg/i7359-g.check index 43257ae2a596..e3f0c89715e4 100644 --- a/tests/neg/i7359-g.check +++ b/tests/neg/i7359-g.check @@ -3,5 +3,5 @@ | ^^^^^^^^^^^^^ | Found: () => String | Required: SAMTrait - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i8569.check b/tests/neg/i8569.check index c33cb68d750c..89173e1a8334 100644 --- a/tests/neg/i8569.check +++ b/tests/neg/i8569.check @@ -2,5 +2,5 @@ 13 | val x = outer.Inner(2) // error (at posttyper) | ^^^^^^^^^^^^^^ | Outer is not a valid class prefix, since it is not an immutable path - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i8569a.check b/tests/neg/i8569a.check index b6ba88cba3b6..966e80133d31 100644 --- a/tests/neg/i8569a.check +++ b/tests/neg/i8569a.check @@ -2,5 +2,5 @@ 13 | val x = new outer2.Inner(2) // error (at typer) | ^^^^^^ | (Test.outer2 : => Outer2) is not a valid type prefix, since it is not an immutable path - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i8623.check b/tests/neg/i8623.check index 9b9a20ce7bf5..b9d6e244e70e 100644 --- a/tests/neg/i8623.check +++ b/tests/neg/i8623.check @@ -7,5 +7,5 @@ | But the part corresponding to `` is not a reference that can be generated. | This might be because resolution yielded as given instance a function that is not | known to be total and side-effect free. - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i8736.check b/tests/neg/i8736.check index 80986464d035..e7a0d62cb4af 100644 --- a/tests/neg/i8736.check +++ b/tests/neg/i8736.check @@ -3,15 +3,15 @@ | ^^^^^^^^^^^^ | Found: Any | Required: String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/i8736.scala:30:29 ------------------------------------------------------------- 30 | def res2: Int = rec.get("v") // error: type mismatch | ^^^^^^^^^^^^ | Found: Any | Required: Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E051] Reference Error: tests/neg/i8736.scala:31:26 ----------------------------------------------------------------- 31 | def res3: Boolean = rec.get("z") // error: ambiguous | ^^^^^^^ @@ -22,5 +22,5 @@ longer explanation available when compiling with `-explain` | all match arguments (("z" : String)) | | Note: Overloaded definitions introduced by refinements cannot be resolved - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i8752.check b/tests/neg/i8752.check index cf2feb0cc7c6..3ccdee55e676 100644 --- a/tests/neg/i8752.check +++ b/tests/neg/i8752.check @@ -3,8 +3,8 @@ | ^^^^ | C does not take type parameters | (Note that F-bounds of type parameters may not be type lambdas) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- Error: tests/neg/i8752.scala:3:39 ----------------------------------------------------------------------------------- 3 |trait Arround1[C <:[X]=>>IterableOps[X,C,C[X]] ] // error // error | ^ diff --git a/tests/neg/i8988.check b/tests/neg/i8988.check index 6952837128ed..d34e2cfd0047 100644 --- a/tests/neg/i8988.check +++ b/tests/neg/i8988.check @@ -3,5 +3,5 @@ | ^^ | Found: (ys : List[Int]) | Required: String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i9436.check b/tests/neg/i9436.check index 8938dbacb6cb..b5f9b5c470b1 100644 --- a/tests/neg/i9436.check +++ b/tests/neg/i9436.check @@ -2,8 +2,8 @@ 8 | println(x.f1) // error | ^^^^ | method f1 must be called with () argument - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- Error: tests/neg/i9436.scala:9:14 ----------------------------------------------------------------------------------- 9 | println(x.f2(1)) // error | ^^^^^^^ diff --git a/tests/neg/i9437.check b/tests/neg/i9437.check index d0b2226e5a0c..3bac99b07571 100644 --- a/tests/neg/i9437.check +++ b/tests/neg/i9437.check @@ -2,5 +2,5 @@ 7 | println(x.f1()) // error | ^^^^ | method selectDynamic in trait Selectable does not take parameters - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i9803.check b/tests/neg/i9803.check index 57e184487504..cc7d56d585b0 100644 --- a/tests/neg/i9803.check +++ b/tests/neg/i9803.check @@ -4,5 +4,5 @@ | Reference to f421 is ambiguous, | it is both imported by name by import bugs.shadowing.x.f421 | and imported by name subsequently by import bugs.shadowing.y.f421 - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i9958.check b/tests/neg/i9958.check index 3657c466dc8b..4da24bb23c7e 100644 --- a/tests/neg/i9958.check +++ b/tests/neg/i9958.check @@ -7,5 +7,5 @@ | ^ | Found: G[[A <: Int] =>> List[A]] | Required: G[List] - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/if-error.check b/tests/neg/if-error.check index c2f1b02b2067..d8350da1872b 100644 --- a/tests/neg/if-error.check +++ b/tests/neg/if-error.check @@ -4,5 +4,5 @@ | Found: Unit | Required: Int | Maybe you are missing an else part for the conditional? - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/kinds2.check b/tests/neg/kinds2.check index 2921c7baf022..3a978c635836 100644 --- a/tests/neg/kinds2.check +++ b/tests/neg/kinds2.check @@ -2,5 +2,5 @@ 14 | f[C] // error: missing type parameter(s) | ^ | Missing type parameter for Test.C - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/leading-infix-miss.check b/tests/neg/leading-infix-miss.check index df9c4d8dd3e0..c6bfa458d1ad 100644 --- a/tests/neg/leading-infix-miss.check +++ b/tests/neg/leading-infix-miss.check @@ -11,5 +11,5 @@ | ^ | Found: Unit | Required: Boolean - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/matchtype-seq.check b/tests/neg/matchtype-seq.check index 07db895b9006..aba1e312da01 100644 --- a/tests/neg/matchtype-seq.check +++ b/tests/neg/matchtype-seq.check @@ -29,8 +29,8 @@ | Therefore, reduction cannot advance to the remaining case | | case (2 : Int) => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:12:20 ----------------------------------------------------- 12 | identity[T1[Int]](1) // error | ^ @@ -46,8 +46,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case (2 : Int) => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:21:20 ----------------------------------------------------- 21 | identity[T2[Int]]("") // error | ^^ @@ -63,15 +63,15 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case _ => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:22:18 ----------------------------------------------------- 22 | identity[T2[2]](1) // error | ^ | Found: (1 : Int) | Required: String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:23:20 ----------------------------------------------------- 23 | identity[T2[Int]](1) // error | ^ @@ -87,8 +87,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case _ => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:36:18 ----------------------------------------------------- 36 | identity[T3[A]](1) // error | ^ @@ -104,8 +104,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.C => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:37:18 ----------------------------------------------------- 37 | identity[T3[A]]("") // error | ^^ @@ -121,8 +121,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.C => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:55:18 ----------------------------------------------------- 55 | identity[T5[A]](1) // error | ^ @@ -138,8 +138,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.A => Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:56:18 ----------------------------------------------------- 56 | identity[T5[A]]("") // error | ^^ @@ -155,8 +155,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.A => Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:82:18 ----------------------------------------------------- 82 | identity[T7[D]]("") // error | ^^ @@ -172,8 +172,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.D => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:83:18 ----------------------------------------------------- 83 | identity[T7[D]](1) // error | ^ @@ -189,8 +189,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.D => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:94:19 ----------------------------------------------------- 94 | identity[T8[E2]](1) // error | ^ @@ -206,15 +206,15 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.E2 => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:95:19 ----------------------------------------------------- 95 | identity[T8[E1]]("") // error | ^^ | Found: ("" : String) | Required: Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:96:19 ----------------------------------------------------- 96 | identity[T8[E2]]("") // error | ^^ @@ -230,8 +230,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.E2 => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:105:40 ---------------------------------------------------- 105 | identity[T9[Tuple2[Nothing, String]]](1) // error | ^ @@ -243,8 +243,8 @@ longer explanation available when compiling with `-explain` | trying to reduce Test.T9[(Nothing, String)] | failed since selector (Nothing, String) | is uninhabited (there are no values of that type). - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:106:40 ---------------------------------------------------- 106 | identity[T9[Tuple2[String, Nothing]]]("1") // error | ^^^ @@ -256,8 +256,8 @@ longer explanation available when compiling with `-explain` | trying to reduce Test.T9[(String, Nothing)] | failed since selector (String, Nothing) | is uninhabited (there are no values of that type). - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:107:37 ---------------------------------------------------- 107 | identity[T9[Tuple2[Int, Nothing]]](1) // error | ^ @@ -269,8 +269,8 @@ longer explanation available when compiling with `-explain` | trying to reduce Test.T9[(Int, Nothing)] | failed since selector (Int, Nothing) | is uninhabited (there are no values of that type). - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:108:37 ---------------------------------------------------- 108 | identity[T9[Tuple2[Nothing, Int]]]("1") // error | ^^^ @@ -282,8 +282,8 @@ longer explanation available when compiling with `-explain` | trying to reduce Test.T9[(Nothing, Int)] | failed since selector (Nothing, Int) | is uninhabited (there are no values of that type). - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:109:29 ---------------------------------------------------- 109 | identity[T9[Tuple2[_, _]]]("") // error | ^^ @@ -299,8 +299,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case (String, Int) => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:110:29 ---------------------------------------------------- 110 | identity[T9[Tuple2[_, _]]](1) // error | ^ @@ -316,8 +316,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case (String, Int) => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:111:33 ---------------------------------------------------- 111 | identity[T9[Tuple2[Any, Any]]]("") // error | ^^ @@ -333,8 +333,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case (String, Int) => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:112:33 ---------------------------------------------------- 112 | identity[T9[Tuple2[Any, Any]]](1) // error | ^ @@ -350,8 +350,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case (String, Int) => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:122:39 ---------------------------------------------------- 122 | identity[TA[Box2[Int, Int, String]]](1) // error | ^ @@ -367,8 +367,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.Box2[Int, Int, String] => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:123:39 ---------------------------------------------------- 123 | identity[TA[Box2[Int, Int, String]]]("") // error | ^^ @@ -384,8 +384,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.Box2[Int, Int, String] => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:144:41 ---------------------------------------------------- 144 | identity[TD[Box2_C[Int, Int, String]]]("") // error | ^^ @@ -401,8 +401,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Test.Box2_C[Int, Int, String] => String - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:153:25 ---------------------------------------------------- 153 | def a[A]: M[Some[A]] = 1 // error | ^ @@ -418,8 +418,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Some[_] => Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:154:25 ---------------------------------------------------- 154 | def b[A]: M[Some[A]] = "" // error | ^^ @@ -435,8 +435,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case Some[_] => Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:168:23 ---------------------------------------------------- 168 | val a: M[Inv[A]] = 1 // error | ^ @@ -452,8 +452,8 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case _ => Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/matchtype-seq.scala:187:25 ---------------------------------------------------- 187 | val a: M[Inv[A]] = 1 // error | ^ @@ -469,5 +469,5 @@ longer explanation available when compiling with `-explain` | Therefore, reduction cannot advance to the remaining case | | case _ => Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/missing-implicit-2.check b/tests/neg/missing-implicit-2.check index 4ec525f4a34e..e1994c4bf02d 100644 --- a/tests/neg/missing-implicit-2.check +++ b/tests/neg/missing-implicit-2.check @@ -26,5 +26,5 @@ | | where: Byte is a class in package scala | Byte² is a class in package java.lang - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/missing-implicit-3.check b/tests/neg/missing-implicit-3.check index a41f2bba8a3e..45837ce11576 100644 --- a/tests/neg/missing-implicit-3.check +++ b/tests/neg/missing-implicit-3.check @@ -12,8 +12,8 @@ | | import concurrent.duration.pairIntToDuration | - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E008] Not Found Error: tests/neg/missing-implicit-3.scala:8:48 ----------------------------------------------------- 8 |val d2: scala.concurrent.duration.Duration = 10.days // error | ^^^^^^^ diff --git a/tests/neg/module-class-name.check b/tests/neg/module-class-name.check index 0888689553fb..448eebf240b4 100644 --- a/tests/neg/module-class-name.check +++ b/tests/neg/module-class-name.check @@ -3,29 +3,29 @@ | ^ | Found: Test.C.type | Required: Test.C - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/module-class-name.scala:9:15 -------------------------------------------------- 9 | val y: C = f(C) // error | ^ | Found: Test.C.type | Required: Test.C - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/module-class-name.scala:12:14 ------------------------------------------------- 12 | val z1: C = z // error | ^ | Found: Test.C.type | Required: Test.C - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/module-class-name.scala:13:16 ------------------------------------------------- 13 | val z2: Int = z // error | ^ | Found: Test.C.type | Required: Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E008] Not Found Error: tests/neg/module-class-name.scala:15:4 ------------------------------------------------------ 15 | C.foo // error: value foo is not a member of object Test.C | ^^^^^ diff --git a/tests/neg/multi-file-error.check b/tests/neg/multi-file-error.check index bf3547333361..716023fc9ce8 100644 --- a/tests/neg/multi-file-error.check +++ b/tests/neg/multi-file-error.check @@ -2,11 +2,11 @@ 2 | foo() // error | ^^^ | Not found: foo - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E006] Not Found Error: tests/neg/multi-file-error/B.scala:2:2 ------------------------------------------------------ 2 | bar() // error | ^^^ | Not found: bar - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/print-infix-type.check b/tests/neg/print-infix-type.check index bb96c0cbb5de..21ba753f2408 100644 --- a/tests/neg/print-infix-type.check +++ b/tests/neg/print-infix-type.check @@ -3,5 +3,5 @@ | ^ | Found: Int over String | Required: String over Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/singleton-ops-any.check b/tests/neg/singleton-ops-any.check index be234d405b4e..caab2b24e037 100644 --- a/tests/neg/singleton-ops-any.check +++ b/tests/neg/singleton-ops-any.check @@ -3,40 +3,40 @@ | ^^^^ | Found: (true : Boolean) | Required: (false : Boolean) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:7:22 -------------------------------------------------- 7 | val t35: 10 == 10 = false // error | ^^^^^ | Found: (false : Boolean) | Required: (true : Boolean) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:12:24 ------------------------------------------------- 12 | val t38: false != 5 = false // error | ^^^^^ | Found: (false : Boolean) | Required: (true : Boolean) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:13:22 ------------------------------------------------- 13 | val t39: 10 != 10 = true // error | ^^^^ | Found: (true : Boolean) | Required: (false : Boolean) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:18:27 ------------------------------------------------- 18 | val t04: ToString[Int] = "Int" // error | ^^^^^ | Found: ("Int" : String) | Required: compiletime.ops.any.ToString[Int] - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E007] Type Mismatch Error: tests/neg/singleton-ops-any.scala:32:26 ------------------------------------------------- 32 | val t48: IsConst[Any] = true // error | ^^^^ | Found: (true : Boolean) | Required: (false : Boolean) - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/spaces-vs-tabs.check b/tests/neg/spaces-vs-tabs.check index 862465a18dbe..f513dbdf31b7 100644 --- a/tests/neg/spaces-vs-tabs.check +++ b/tests/neg/spaces-vs-tabs.check @@ -32,5 +32,5 @@ 13 | 1 | ^ | A pure expression does nothing in statement position; you may be omitting necessary parentheses - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/splice-pat.check b/tests/neg/splice-pat.check index 68fda3e96e72..32af3ad6308e 100644 --- a/tests/neg/splice-pat.check +++ b/tests/neg/splice-pat.check @@ -2,8 +2,8 @@ 12 | case '{ foo(${ // error: pattern expected | ^ | pattern expected - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` -- [E040] Syntax Error: tests/neg/splice-pat.scala:15:5 ---------------------------------------------------------------- 15 | })} => ??? // error | ^ diff --git a/tests/neg/t6124.check b/tests/neg/t6124.check index 9c7498d60f88..871533bf80c8 100644 --- a/tests/neg/t6124.check +++ b/tests/neg/t6124.check @@ -62,5 +62,5 @@ 21 | val x1 = _52 // error | ^^^ | Not found: _52 - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/t6663.check b/tests/neg/t6663.check index 806f3357a0f6..4adb6f365082 100644 --- a/tests/neg/t6663.check +++ b/tests/neg/t6663.check @@ -3,5 +3,5 @@ | ^^^^^^^^^^^^^^^^^^^^^^^^^ | Found: String | Required: Int - -longer explanation available when compiling with `-explain` + | + | longer explanation available when compiling with `-explain` From 550f14a7550806abd5e0cd612f76dce21edd027b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 11 Jan 2022 17:30:44 +0100 Subject: [PATCH 1175/1244] Refactor static-site loading --- docs/docs/usage/scaladoc/index.md | 2 +- docs/sidebar.yml | 36 ++- scaladoc-testcases/docs/sidebar.yml | 13 +- .../tools/scaladoc/renderers/Locations.scala | 6 +- .../tools/scaladoc/renderers/Renderer.scala | 63 +---- .../tools/scaladoc/site/SidebarParser.scala | 39 ++- .../scaladoc/site/StaticSiteContext.scala | 252 ++++-------------- .../scaladoc/site/StaticSiteLoader.scala | 155 +++++++++++ .../tools/scaladoc/site/StaticSiteRoot.scala | 12 + .../dotty/tools/scaladoc/site/templates.scala | 41 ++- scaladoc/test-documentations/basic/index.md | 8 - .../tools/scaladoc/site/NavigationTest.scala | 2 +- .../scaladoc/site/SidebarParserTest.scala | 25 +- .../scaladoc/site/SiteGeneratationTest.scala | 8 +- 14 files changed, 361 insertions(+), 301 deletions(-) create mode 100644 scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala create mode 100644 scaladoc/src/dotty/tools/scaladoc/site/StaticSiteRoot.scala delete mode 100644 scaladoc/test-documentations/basic/index.md diff --git a/docs/docs/usage/scaladoc/index.md b/docs/docs/usage/scaladoc/index.md index edb56fc7dea5..dc53c01db666 100644 --- a/docs/docs/usage/scaladoc/index.md +++ b/docs/docs/usage/scaladoc/index.md @@ -3,6 +3,6 @@ layout: doc-page title: "Scaladoc" --- -![scaladoc logo](images/scaladoc_logo.svg) +![scaladoc logo](images/scaladoc-logo.png) scaladoc is a tool to generate the API documentation of your Scala 3 projects. It provides similar features to `javadoc` as well as `jekyll` or `docusaurus`. diff --git a/docs/sidebar.yml b/docs/sidebar.yml index be2d0d0e59d9..10b4bd5c34e1 100644 --- a/docs/sidebar.yml +++ b/docs/sidebar.yml @@ -1,11 +1,20 @@ -sidebar: - - title: Blog +rootIndex: docs/index.md +pages: + # - title: Blog - title: Usage subsection: - page: docs/usage/sbt-projects.md - page: docs/usage/ide-support.md - page: docs/usage/cbt-projects.md - - page: docs/usage/scaladoc + - title: Scaladoc + index: docs/usage/scaladoc/index.md + subsection: + - page: docs/usage/scaladoc/docstrings.md + - page: docs/usage/scaladoc/linking.md + - page: docs/usage/scaladoc/search-engine.md + - page: docs/usage/scaladoc/settings.md + - page: docs/usage/scaladoc/site-versioning.md + - page: docs/usage/scaladoc/static-site.md - title: Reference subsection: - page: docs/reference/overview.md @@ -13,10 +22,14 @@ sidebar: index: docs/reference/new-types/new-types.md subsection: - page: docs/reference/new-types/intersection-types.md + - page: docs/reference/new-types/intersection-types-spec.md - page: docs/reference/new-types/union-types.md + - page: docs/reference/new-types/union-types-spec.md - page: docs/reference/new-types/type-lambdas.md + - page: docs/reference/new-types/type-lambdas-spec.md - page: docs/reference/new-types/match-types.md - page: docs/reference/new-types/dependent-function-types.md + - page: docs/reference/new-types/dependent-function-types-spec.md - page: docs/reference/new-types/polymorphic-function-types.md - title: Enums index: docs/reference/enums/enums-index.md @@ -26,16 +39,20 @@ sidebar: - page: docs/reference/enums/desugarEnums.md - title: Contextual Abstractions index: docs/reference/contextual/contextual.md + directory: contextual subsection: - page: docs/reference/contextual/givens.md - page: docs/reference/contextual/using-clauses.md - page: docs/reference/contextual/context-bounds.md - page: docs/reference/contextual/given-imports.md - page: docs/reference/contextual/extension-methods.md + - page: docs/reference/contextual/right-associative-extension-methods.md - page: docs/reference/contextual/type-classes.md - page: docs/reference/contextual/derivation.md + - page: docs/reference/contextual/derivation-macro.md - page: docs/reference/contextual/multiversal-equality.md - page: docs/reference/contextual/context-functions.md + - page: docs/reference/contextual/context-functions-spec.md - page: docs/reference/contextual/conversions.md - page: docs/reference/contextual/by-name-context-parameters.md - page: docs/reference/contextual/relationship-implicits.md @@ -45,6 +62,7 @@ sidebar: - page: docs/reference/metaprogramming/inline.md - page: docs/reference/metaprogramming/compiletime-ops.md - page: docs/reference/metaprogramming/macros.md + - page: docs/reference/metaprogramming/macros-spec.md - page: docs/reference/metaprogramming/staging.md - page: docs/reference/metaprogramming/reflection.md - page: docs/reference/metaprogramming/tasty-inspect.md @@ -56,8 +74,10 @@ sidebar: - page: docs/reference/other-new-features/creator-applications.md - page: docs/reference/other-new-features/export.md - page: docs/reference/other-new-features/opaques.md + - page: docs/reference/other-new-features/opaques-details.md - page: docs/reference/other-new-features/open-classes.md - page: docs/reference/other-new-features/parameter-untupling.md + - page: docs/reference/other-new-features/parameter-untupling-spec.md - page: docs/reference/other-new-features/kind-polymorphism.md - page: docs/reference/other-new-features/matchable.md - page: docs/reference/other-new-features/threadUnsafe-annotation.md @@ -68,10 +88,12 @@ sidebar: - page: docs/reference/other-new-features/type-test.md - page: docs/reference/other-new-features/experimental-defs.md - title: Other Changed Features + directory: changed-features index: docs/reference/changed-features/changed-features.md subsection: - page: docs/reference/changed-features/numeric-literals.md - page: docs/reference/changed-features/structural-types.md + - page: docs/reference/changed-features/structural-types-spec.md - page: docs/reference/changed-features/operators.md - page: docs/reference/changed-features/wildcards.md - page: docs/reference/changed-features/imports.md @@ -79,12 +101,14 @@ sidebar: - page: docs/reference/changed-features/type-inference.md - page: docs/reference/changed-features/implicit-resolution.md - page: docs/reference/changed-features/implicit-conversions.md + - page: docs/reference/changed-features/implicit-conversions-spec.md - page: docs/reference/changed-features/overload-resolution.md - page: docs/reference/changed-features/match-syntax.md - page: docs/reference/changed-features/vararg-splices.md - page: docs/reference/changed-features/pattern-bindings.md - page: docs/reference/changed-features/pattern-matching.md - page: docs/reference/changed-features/eta-expansion.md + - page: docs/reference/changed-features/eta-expansion-spec.md - page: docs/reference/changed-features/compiler-plugins.md - page: docs/reference/changed-features/lazy-vals-init.md - page: docs/reference/changed-features/main-functions.md @@ -100,15 +124,18 @@ sidebar: - page: docs/reference/dropped-features/package-objects.md - page: docs/reference/dropped-features/early-initializers.md - page: docs/reference/dropped-features/class-shadowing.md + - page: docs/reference/dropped-features/class-shadowing-spec.md - page: docs/reference/dropped-features/limit22.md - page: docs/reference/dropped-features/xml.md - page: docs/reference/dropped-features/symlits.md - page: docs/reference/dropped-features/auto-apply.md - page: docs/reference/dropped-features/weak-conformance.md + - page: docs/reference/dropped-features/weak-conformance-spec.md - page: docs/reference/dropped-features/nonlocal-returns.md - page: docs/reference/dropped-features/this-qualifier.md - page: docs/reference/dropped-features/wildcard-init.md - title: Experimental Features + directory: experimental subsection: - page: docs/reference/experimental/overview.md - page: docs/reference/experimental/canthrow.md @@ -123,6 +150,8 @@ sidebar: subsection: - page: docs/reference/language-versions/source-compatibility.md - page: docs/reference/language-versions/binary-compatibility.md + - page: docs/reference/soft-modifier.md + - page: docs/reference/features-classification.md - title: Contributing subsection: - page: docs/contributing/contribute-knowledge.md @@ -131,6 +160,7 @@ sidebar: - page: docs/contributing/testing.md - page: docs/contributing/debugging.md - title: IDEs and Tools + directory: tools subsection: - page: docs/contributing/tools/ide.md - page: docs/contributing/tools/mill.md diff --git a/scaladoc-testcases/docs/sidebar.yml b/scaladoc-testcases/docs/sidebar.yml index 6ab7a4936ede..f08a0b3e3ffe 100644 --- a/scaladoc-testcases/docs/sidebar.yml +++ b/scaladoc-testcases/docs/sidebar.yml @@ -1,7 +1,6 @@ -sidebar: - - title: Docs - subsection: - - page: docs/docs/f1.md - - page: docs/docs/f2.md - - page: docs/docs/f3.md - - page: docs/docs/f4.md +rootIndex: docs/index.md +pages: + - page: docs/docs/f1.md + - page: docs/docs/f2.md + - page: docs/docs/f3.md + - page: docs/docs/f4.md diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala index bcdaa2bb5a5a..58627ecc7964 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala @@ -34,9 +34,9 @@ trait Locations(using ctx: DocContext): cache.get(dri) match case null => val path = dri match - case `docsRootDRI` => List("docs", "index") + // case `docsRootDRI` => List("docs", "index") case `apiPageDRI` => - if ctx.staticSiteContext.fold(false)(_.hasIndexFile) + if ctx.args.apiSubdirectory && ctx.staticSiteContext.nonEmpty then List("api", "index") else List("index") case dri if dri.isStaticFile => @@ -88,6 +88,6 @@ trait Locations(using ctx: DocContext): def pathToRoot(dri: DRI): String = rawLocation(dri).drop(1).map(_ => "..") match case Nil => "" - case seq => seq.mkString("", "/", "/") + case seq => seq.mkString("", "/" , "/") def driExists(dri: DRI) = effectiveMembers.get(dri).isDefined || dri.isStaticFile diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala index d0b51bf54e6f..ffdd864942e9 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala @@ -40,20 +40,12 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot staticSite match case None => rootPckPage.withTitle(args.name) case Some(siteContext) => - val (indexes, templates) = siteContext.templates.partition(f => - f.templateFile.isIndexPage() && f.file.toPath.getParent() == siteContext.docsPath) - if (indexes.size > 1) - val msg = s"ERROR: Multiple index pages for doc found ${indexes.map(_.file)}" - report.error(msg) + val rootTemplate = siteContext.staticSiteRoot.rootTemplate // Below code is for walking in order the tree and modifing its nodes basing on its neighbours - // First we flatten templates to get them sorted in-order - def flattenedTemplates(template: LoadedTemplate): Seq[LoadedTemplate] = - template +: template.children.flatMap(flattenedTemplates) - // We add dummy guards - val allTemplates: Seq[Option[LoadedTemplate]] = None +: templates.flatMap(flattenedTemplates).map(Some(_)) :+ None + val allTemplates: Seq[Option[LoadedTemplate]] = None +: siteContext.allTemplates.map(Some(_)) :+ None // Let's gather the list of maps for each template with its in-order neighbours val newSettings: List[Map[String, Object]] = allTemplates.sliding(size = 3, step = 1).map { @@ -82,34 +74,17 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot ) updatedTemplates.result() - val newTemplates = updateSettings(templates, newSettings.to(ListBuffer)) + val newTemplates = updateSettings(Seq(siteContext.staticSiteRoot.rootTemplate), newSettings.to(ListBuffer)) val templatePages = newTemplates.map(templateToPage(_, siteContext)) - indexes.headOption match - case None if templatePages.isEmpty=> - rootPckPage.withTitle(args.name) - case None => - Page(Link(args.name, docsRootDRI),"", templatePages :+ rootPckPage.withTitle("API")) - case Some(indexPage) => - val newChildren = templatePages :+ rootPckPage.withTitle("API") - templateToPage(indexPage, siteContext).withNewChildren(newChildren) - - val hiddenPages: Seq[Page] = - staticSite match - case None => - Seq(navigablePage.copy( // Add index page that is a copy of api/index.html - link = navigablePage.link.copy(dri = docsRootDRI), - children = Nil - )) - case Some(siteContext) => - // In case that we do not have an index page and we do not have any API entries - // we want to create empty index page, so there is one - val actualIndexTemplate = siteContext.indexTemplate() match { - case None if effectiveMembers.isEmpty => Seq(siteContext.emptyIndexTemplate) - case templates => templates.toSeq - } + val newRoot = newTemplates.head - (siteContext.orphanedTemplates ++ actualIndexTemplate).map(templateToPage(_, siteContext)) + if newRoot.children.size == 0 && newRoot.templateFile.rawCode == "" + then rootPckPage.withTitle(args.name) + else { + val newRootPage = templateToPage(newRoot, siteContext) + newRootPage.withNewChildren(Seq(rootPckPage.withTitle("API"))) + } val redirectPages: Seq[Page] = staticSite.fold(Seq.empty)(siteContext => siteContext.redirectTemplates.map { case (template, driFrom, driTo) => @@ -121,22 +96,10 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot * Here we have to retrive index pages from hidden pages and replace fake index pages in navigable page tree. */ val allPages: Seq[Page] = - def traversePages(page: Page): (Page, Seq[Page]) = - val (newChildren, newPagesToRemove): (Seq[Page], Seq[Page]) = page.children.map(traversePages(_)).foldLeft((Seq[Page](), Seq[Page]())) { - case ((pAcc, ptrAcc), (p, ptr)) => (pAcc :+ p, ptrAcc ++ ptr) - } - hiddenPages.find(_.link == page.link) match - case None => - (page.copy(children = newChildren), newPagesToRemove) - case Some(newPage) => - (newPage.copy(children = newChildren), newPagesToRemove :+ newPage) - - val (newNavigablePage, pagesToRemove) = traversePages(navigablePage) - - val all = newNavigablePage +: (hiddenPages.filterNot(pagesToRemove.contains) ++ redirectPages) - // We need to check for conflicts only if we have top-level member called blog or docs + val all = navigablePage +: redirectPages + // We need to check for conflicts only if we have top-level member called docs val hasPotentialConflict = - rootPackage.members.exists(m => m.name.startsWith("docs") || m.name.startsWith("blog")) + rootPackage.members.exists(m => m.name.startsWith("docs")) if hasPotentialConflict then def walk(page: Page): Unit = diff --git a/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala b/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala index 718ce816d001..2b3ddd552207 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala @@ -8,29 +8,46 @@ import collection.JavaConverters._ import java.util.Optional enum Sidebar: - case Category(title: Option[String], indexPath: Option[String], nested: List[Sidebar]) + case Root(index: Option[String], pages: List[Sidebar]) + case Category(title: Option[String], indexPath: Option[String], nested: List[Sidebar], directory: Option[String]) case Page(title: Option[String], pagePath: String) object Sidebar: - case class RawInput(var title: String, var page: String, var index: String, var subsection: JList[RawInput]): - def this() = this("", "", "", JList()) + case class RawRoot(var rootIndex: String, var pages: JList[RawInput]): + def this() = this("", JList()) + + def setRootIndex(s: String) = rootIndex = s + def setPages(l: JList[RawInput]) = pages = l + + case class RawInput(var title: String, var page: String, var index: String, var subsection: JList[RawInput], var directory: String): + def this() = this("", "", "", JList(), "") def setTitle(t: String) = this.title = t def setPage(p: String) = this.page = p def setIndex(i: String) = this.index = i def setSubsection(s: JList[RawInput]) = this.subsection = s + def setDirectory(d: String) = this.directory = d - type RawInnerTpe = JMap[String, JList[RawInput]] - private object RawTypeRef extends TypeReference[RawInnerTpe] + private object RootTypeRef extends TypeReference[RawRoot] private def toSidebar(r: RawInput): Sidebar = r match - case RawInput(title, page, index, subsection) if page.nonEmpty && index.isEmpty && subsection.isEmpty() || title == "Blog" => + case RawInput(title, page, index, subsection, dir) if page.nonEmpty && index.isEmpty && subsection.isEmpty() || title == "Blog" => Sidebar.Page(Option.when(title.nonEmpty)(title), page) - case RawInput(title, page, index, subsection) if page.isEmpty && !subsection.isEmpty() => - Sidebar.Category(Option.when(title.nonEmpty)(title), Option.when(index.nonEmpty)(index), subsection.asScala.map(toSidebar).toList) + case RawInput(title, page, index, subsection, dir) if page.isEmpty && (!subsection.isEmpty() || !index.isEmpty()) => + Sidebar.Category(Option.when(title.nonEmpty)(title), Option.when(index.nonEmpty)(index), subsection.asScala.map(toSidebar).toList, Option.when(dir.nonEmpty)(dir)) + + def load(content: String): Sidebar.Root = + val mapper = ObjectMapper(YAMLFactory()) + val root: RawRoot = mapper.readValue(content, RootTypeRef) + + val rootIndex: String = root.rootIndex + val pages: List[Sidebar] = root.pages.asScala.toList.map(toSidebar) + Sidebar.Root(Option.when(rootIndex.nonEmpty)(rootIndex), pages) - def load(content: String): Seq[Sidebar] = + def load(file: java.io.File): Sidebar.Root = val mapper = ObjectMapper(YAMLFactory()) - val raw: RawInnerTpe = mapper.readValue(content, RawTypeRef) + val root: RawRoot = mapper.readValue(file, RootTypeRef) - raw.get("sidebar").asScala.toList.map(toSidebar) + val rootIndex: String = root.rootIndex + val pages: List[Sidebar] = root.pages.asScala.toList.map(toSidebar) + Sidebar.Root(Option.when(rootIndex.nonEmpty)(rootIndex), pages) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala index 3610c8163649..21c600fe282b 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala @@ -9,6 +9,7 @@ import java.nio.file.Paths import scala.util.Try import collection.JavaConverters._ +import scala.annotation.static class StaticSiteContext( val root: File, @@ -19,63 +20,29 @@ class StaticSiteContext( var memberLinkResolver: String => Option[DRI] = _ => None - private def indexFiles = - val files = List(new File(root, "index.html"), new File(root, "index.md")).filter { _.exists() } - - if files.size > 1 then - val msg = s"ERROR: Multiple root index pages found: ${files.map(_.getAbsolutePath)}" - report.error(msg) - - files.headOption - - def hasIndexFile = indexFiles.nonEmpty + val docsPath = root.toPath.resolve("docs") - def emptyIndexTemplate = - val fakeFile = new File(root, "index.html") - LoadedTemplate(emptyTemplate(fakeFile, "index"), List.empty, fakeFile) + val relativizeFrom = if args.apiSubdirectory then docsPath else root.toPath - def indexTemplate(): Option[LoadedTemplate] = - indexFiles.flatMap(loadTemplate(_, isBlog = false)) + val siteExtensions = Set(".html", ".md") lazy val layouts: Map[String, TemplateFile] = val layoutRoot = new File(root, "_layouts") val dirs: Array[File] = Option(layoutRoot.listFiles()).getOrElse(Array()) dirs.map { it => loadTemplateFile(it)(using this) }.map { it => it.name -> it }.toMap - lazy val sideBarConfig = - val sidebarFile = root.toPath.resolve("sidebar.yml") - if (!Files.exists(sidebarFile)) None - else Some(Sidebar.load(Files.readAllLines(sidebarFile).asScala.mkString("\n"))) - - lazy val templates: Seq[LoadedTemplate] = - sideBarConfig.fold(loadAllFiles().sortBy(_.templateFile.title.name))(_.map(loadSidebarContent)) - - lazy val orphanedTemplates: Seq[LoadedTemplate] = { - def doFlatten(t: LoadedTemplate): Seq[Path] = - t.file.toPath +: t.children.flatMap(doFlatten) - val mainFiles = templates.flatMap(doFlatten) - - val allPaths = - if !Files.exists(docsPath) then Nil - else Files.walk(docsPath, FileVisitOption.FOLLOW_LINKS).iterator().asScala.toList - - val orphanedFiles = allPaths.filterNot { p => - def name = p.getFileName.toString - def isMain = name == "index.html" || name == "index.md" - mainFiles.contains(p) || (isMain && mainFiles.contains(p.getParent)) - }.filter { p => - val name = p.getFileName.toString - name.endsWith(".md") || name.endsWith(".html") - } - - orphanedFiles.flatMap(p => loadTemplate(p.toFile, isBlog = false)) - } - - lazy val redirectTemplates: Seq[(LoadedTemplate, DRI, DRI)] = { - def doFlatten(t: LoadedTemplate): Seq[LoadedTemplate] = - t +: t.children.flatMap(doFlatten) - val mainFiles = templates.flatMap(doFlatten) - mainFiles.flatMap { loadedTemplate => + lazy val staticSiteRoot: StaticSiteRoot = StaticSiteLoader(root, args)(using this, outerCtx).load() + + lazy val allTemplates = + def process(l: LoadedTemplate): List[LoadedTemplate] = + l +: l.children.flatMap(process) + process(staticSiteRoot.rootTemplate) + /** Handles redirecting from multiple locations to one page + * + * For each entry in redirectFrom setting, create a page which contains code that redirects you to the page where the redirectFrom is defined. + */ + lazy val redirectTemplates: Seq[(LoadedTemplate, DRI, DRI)] = + allTemplates.flatMap { loadedTemplate => val redirectFrom = loadedTemplate.templateFile.settings.getOrElse("page", Map.empty).asInstanceOf[Map[String, Object]].get("redirectFrom") def redirectToTemplate(redirectFrom: String) = val fakeFile = new File(docsPath.toFile, redirectFrom) @@ -87,162 +54,59 @@ class StaticSiteContext( case redirects: List[?] => redirects.asInstanceOf[List[String]].map(redirectToTemplate) }.getOrElse(Nil) } - } - - val docsPath = root.toPath.resolve("docs") - - private def isValidTemplate(file: File): Boolean = - (file.isDirectory && !file.getName.startsWith("_")) || - file.getName.endsWith(".md") || - file.getName.endsWith(".html") - - - private def loadTemplate(from: File, isBlog: Boolean): Option[LoadedTemplate] = - if (!isValidTemplate(from)) None else - try - val topLevelFiles = if isBlog then Seq(from, new File(from, "_posts")) else Seq(from) - val allFiles = topLevelFiles.filter(_.isDirectory).flatMap(_.listFiles()) - val (indexes, children) = allFiles.flatMap(loadTemplate(_, isBlog)).partition(_.templateFile.isIndexPage()) - - def loadIndexPage(): TemplateFile = - indexes match - case Nil => - args.defaultTemplate.fold(emptyTemplate(from, from.getName))(layouts(_).copy(title = TemplateName.FilenameDefined(from.getName))).copy(file = File(from, "index.html")) - case Seq(loadedTemplate) => loadedTemplate.templateFile - case _ => - // TODO (https://github.com/lampepfl/scaladoc/issues/238): provide proper error handling - val msg = s"ERROR: Multiple index pages for $from found in ${indexes.map(_.file)}" - throw new java.lang.RuntimeException(msg) - - val templateFile = if (from.isDirectory) loadIndexPage() else loadTemplateFile(from)(using this) - - def dateFrom(p: LoadedTemplate, default: String = "1900-01-01"): String = - val pageSettings = p.templateFile.settings.get("page").collect{ case m: Map[String @unchecked, _] => m } - pageSettings.flatMap(_.get("date").collect{ case s: String => s}).getOrElse(default) // blogs without date are last - - val processedChildren: Seq[LoadedTemplate] = if !isBlog then children.sortBy(_.templateFile.title.name) else - children.sortBy(dateFrom(_)).reverse - - processedChildren.foreach { child => - val regex = raw"(\d*-\d*-\d*)-(.*)".r - val setDate = dateFrom(child, "") - child.templateFile.name match - case regex(date, name) if date != setDate => - val msg = s"Date $date in blog file: ${child.templateFile.name} doesn't match date from settings: $setDate." - report.warn(msg, from) - case name => - } - - val processedTemplate = // Set provided name as arg in page for `docs` - if templateFile.file.getParentFile.toPath == docsPath && templateFile.isIndexPage() then - if templateFile.title.name != "index" then - report.warn("Property `title` will be overridden by project name", from) - - templateFile.copy(title = TemplateName.FilenameDefined(args.name)) - else templateFile - - Some(LoadedTemplate(processedTemplate, processedChildren.toList, processedTemplate.file)) - catch - case e: RuntimeException => - // TODO (https://github.com/lampepfl/scaladoc/issues/238): provide proper error handling - e.printStackTrace() - None - - private def loadSidebarContent(entry: Sidebar): LoadedTemplate = entry match - case Sidebar.Page(optionTitle, pagePath) => - val isBlog = optionTitle == Some("Blog") - val path = if isBlog then "blog" else - if Files.exists(root.toPath.resolve(pagePath)) then pagePath - else pagePath.stripSuffix(".html") + ".md" - - // val file = root.toPath.resolve(path).toFile - val LoadedTemplate(template, children, file) = loadTemplate(root.toPath.resolve(path).toFile, isBlog).get // Add proper logging if file does not exisits - optionTitle match - case Some(title) => - val newTitle = template.title match - case t: TemplateName.YamlDefined => t - case _: TemplateName.FilenameDefined => TemplateName.SidebarDefined(title) - case t: TemplateName.SidebarDefined => t // should never reach this path - LoadedTemplate(template.copy(settings = template.settings + ("title" -> newTitle.name), title = newTitle), children, file) - case None => - LoadedTemplate(template.copy(settings = template.settings), children, file) - - case Sidebar.Category(optionTitle, optionIndexPath, nested) => - optionIndexPath match - case Some(indexPath) => // There is an index page for section, let's load it - loadSidebarContent(Sidebar.Page(optionTitle, indexPath)).copy(children = nested.map(loadSidebarContent)) - case None => // No index page, let's create default fake file. - val title = optionTitle match - case Some(t) => t - case None => "index" - val sidebarContent = nested.map(loadSidebarContent) - // Heuristic to add section index.html around its child pages. Otherwise we put it in directory named after title of section in top-level - def longestPrefix(s1: String, s2: String): String = s1.zip(s2).takeWhile(Function.tupled(_ == _)).map(_._1).mkString - val sortedNames = sidebarContent.collect { - case t if t.file.getName.reverse.dropWhile(_ != '.').reverse != "index" => - t.file.toPath.toString - }.sorted - def indexPathTemplate(s: String) = Paths.get(root.toString, s, "index.html").toFile - val fakeFile = Option.when(sortedNames.nonEmpty)(sortedNames).map { s => - indexPathTemplate(longestPrefix(s.head, s.last)) - }.filter(_.exists).getOrElse { - indexPathTemplate(s"docs/${title.toLowerCase}") - } - LoadedTemplate( - args.defaultTemplate.fold(emptyTemplate(fakeFile, title))(layouts(_).copy(title = TemplateName.FilenameDefined(title))), - sidebarContent, - fakeFile - ) - - private def loadAllFiles() = - def dir(name: String)= List(new File(root, name)).filter(_.isDirectory) - dir("docs").flatMap(_.listFiles()).flatMap(loadTemplate(_, isBlog = false)) - ++ dir("blog").flatMap(loadTemplate(_, isBlog = true)) def driForLink(loadedTemplateFile: File, link: String): Seq[DRI] = - val pathsDri: Option[Seq[DRI]] = Try { - val baseFile = - if - link.startsWith("/") then root.toPath.resolve(link.drop(1)) - else - val path = loadedTemplateFile.toPath - (if Files.isDirectory(path) then path else path.getParent).resolve(link).normalize - - val fileName = baseFile.getFileName.toString - val baseFileName = if fileName.endsWith(".md") - then fileName.stripSuffix(".md") - else fileName.stripSuffix(".html") - (Seq( - Some(baseFile.resolveSibling(baseFileName + ".html")), - Some(baseFile.resolveSibling(baseFileName + ".md")) - ).flatten.filter(Files.exists(_)) ++ Seq( - Option.when(baseFileName == "index")(baseFile.getParent) - ).flatten).map(driFor) - }.toOption.filter(_.nonEmpty) - pathsDri.getOrElse(memberLinkResolver(link).toList) + // If link doesn't exists in destination and source files and doesn't end with site extension, fallback to asset + def possibleAsset(p: Path): Option[Path] = Option(p) + .filterNot(p => siteExtensions.exists(ext => p.getFileName.toString.endsWith(ext))) + .filter(_.toFile.exists) + + def possibleLinks(link: String): Seq[Path] = + // Destination file of template + val templateDestLocation = loadedTemplateFile.toPath + // Source file of template (may not exist - e.g. redirect templates) + val templateSourceLocation = staticSiteRoot.reverseSiteMappings.get(templateDestLocation) + + // Check if link is relative or absolute + if link.startsWith("/") + then Seq(root.toPath.resolve(link.drop(1))) + else Seq(templateDestLocation.getParent.resolve(link).normalize) ++ + templateSourceLocation.map(_.getParent.resolve(link).normalize) + + // Try to strip site extension and create all possible file paths + val fileNames = if siteExtensions.exists(link.endsWith(_)) + then { + val withoutExt = siteExtensions.find(link.endsWith(_)).fold(link)(ext => link.stripSuffix(ext)) + siteExtensions.map(withoutExt + _).toSeq + } + else Seq(link) + + val baseFiles = fileNames.flatMap(possibleLinks) + + // If file exists in source files, map it to destination file. If file exists in destination file, just take it. + val links = baseFiles.flatMap(p => + Option.when(staticSiteRoot.sources.contains(p))(p).map(p => staticSiteRoot.siteMappings(p)) + .orElse(Option.when(staticSiteRoot.dests.contains(p))(p)) + // .orElse(possibleAsset(p)) + ) + + links match { + case link :: rest => Seq(driFor(link)) + case Nil => memberLinkResolver(link).toSeq + } def driFor(dest: Path): DRI = - val rawFilePath = root.toPath.relativize(dest) + val rawFilePath = relativizeFrom.relativize(dest) val pageName = dest.getFileName.toString val dotIndex = pageName.lastIndexOf('.') val relativePath = - if rawFilePath.startsWith(Paths.get("blog","_posts")) then - val regex = raw"(\d*)-(\d*)-(\d*)-(.*)\..*".r - pageName.toString match - case regex(year, month, day, name) => - rawFilePath.getParent.resolveSibling(Paths.get(year, month, day, name)) - case _ => - val msg = s"Relative path for blog: $rawFilePath doesn't match `yyy-mm-dd-name.md` format." - report.warn(msg, dest.toFile) - rawFilePath.resolveSibling(pageName.substring(0, dotIndex)) - else - if (dotIndex < 0) rawFilePath.resolve("index") - else rawFilePath.resolveSibling(pageName.substring(0, dotIndex)) + if (dotIndex < 0) rawFilePath.resolve("index") + else rawFilePath.resolveSibling(pageName.substring(0, dotIndex)) DRI.forPath(relativePath) - def relativePath(myTemplate: LoadedTemplate) = root.toPath.relativize(myTemplate.file.toPath) + def relativePath(myTemplate: LoadedTemplate) = relativizeFrom.relativize(myTemplate.file.toPath) val projectWideProperties = Seq("projectName" -> args.name) ++ diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala new file mode 100644 index 000000000000..bc2155a1428a --- /dev/null +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala @@ -0,0 +1,155 @@ +package dotty.tools.scaladoc +package site + +import java.io.File +import java.nio.file.Files +import java.nio.file.{ Paths, Path } +import scala.io._ + +class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSiteContext, CompilerContext): + val ctx: StaticSiteContext = summon[StaticSiteContext] + + val possibleYamlFiles: Seq[String] = Seq( + "sidebar.yml" + ) + + val docsDir = root.toPath.resolve("docs") + + def load(): StaticSiteRoot = { + // Check whether there's YAML file defining static site structure + possibleYamlFiles + .map(name => root.toPath.resolve(name)) + .find(path => Files.exists(path)) + .fold(loadBasedOnFileSystem()) { path => + val entries = Sidebar.load(path.toFile) + loadBasedOnYaml(entries) + } + } + + def loadBasedOnYaml(yamlRoot: Sidebar.Root): StaticSiteRoot = { + val rootDest = docsDir.resolve("index.html").toFile + val rootIndex = yamlRoot.index + .map(Paths.get(root.getPath, _).toFile) + .filter(_.exists) + .fold(emptyTemplate(rootDest, "index")) { f => + val loaded = loadTemplateFile(f) + if loaded.title.name != "index" + then report.warn("Property `title` will be overridden by project name", f) + loaded + }.copy(title = TemplateName.FilenameDefined(args.name)) + + def loadChild(pathFromRoot: Path): Sidebar => LoadedTemplate = { + case Sidebar.Category(optionTitle, optionIndexPath, nested, dir) => + val indexPageOpt = optionIndexPath + .map(relativizeIfNeeded) + .map(_.toFile) + .filter(_.exists) + .map(loadTemplateFile) + val title = ( + optionTitle.map(TemplateName.SidebarDefined(_)) ++ + indexPageOpt.map(_.title) + ).headOption.getOrElse { + report.error(s"Title for subsection needs to be set in YAML config or in index file") + TemplateName.FilenameDefined("unnamed_section") + } + val categoryPath = dir.fold(pathFromRoot.resolve(toKebabCase(title.name)))(pathFromRoot.resolve(_)) + val indexPage = indexPageOpt.getOrElse(emptyTemplate(categoryPath.resolve("index.html").toFile, title.name)) + + val children = optionIndexPath.filter(_ => nested.isEmpty).fold( + nested.map(child => loadChild(categoryPath)(child)) + ) { indexPath => + val indexPathDirectory = Paths.get(indexPath).getParent + val filesInDirectory = Option(root.toPath.resolve(indexPathDirectory).toFile.listFiles) + filesInDirectory.fold(List.empty) { files => + val mappingFunc: File => File = file => { + val relativeFile = root.toPath.resolve(indexPathDirectory).relativize(file.toPath) + categoryPath.resolve(relativeFile).toFile + } + files.toList + .filter(_.toPath != indexPage.file.toPath) + .flatMap(file => loadRecursively(file, mappingFunc)) + } + } + + LoadedTemplate(indexPage, children, categoryPath.resolve("index.html").toFile) + case Sidebar.Page(optionTitle, pagePath) => + val path = relativizeIfNeeded(pagePath) + val file = path.toFile + val templateFile = loadTemplateFile(file) + val withUpdatedTitle = optionTitle.fold(templateFile) { t => templateFile.title match + case _: TemplateName.FilenameDefined => templateFile.copy(title = TemplateName.SidebarDefined(t)) + case _ => templateFile + } + LoadedTemplate(withUpdatedTitle, List.empty, pathFromRoot.resolve(file.getName).toFile) + case Sidebar.Root(_, _) => + // Cannot happen + ??? + } + val rootTemplate = LoadedTemplate(rootIndex, yamlRoot.pages.map(c => loadChild(root.toPath.resolve("docs"))(c)), rootDest) + val mappings = createMapping(rootTemplate) + StaticSiteRoot(rootTemplate, mappings) + } + + def loadBasedOnFileSystem(): StaticSiteRoot = { + val rootTemplate = + loadRecursively(docsDir.toFile).getOrElse( + LoadedTemplate(emptyTemplate(docsDir.resolve("index.html").toFile, "index"), List.empty, docsDir.resolve("index.html").toFile) + ) + + if rootTemplate.templateFile.title.name != "index" then { + report.warn("Property `title` will be overridden by project name", rootTemplate.templateFile.file) + } + + val withChangedTitle = + rootTemplate.copy(templateFile = rootTemplate.templateFile.copy(title = TemplateName.FilenameDefined(args.name))) + + val mappings = createMapping(withChangedTitle) + StaticSiteRoot(withChangedTitle, mappings) + } + + def loadRecursively(currRoot: File, destMappingFunc: File => File = identity): Option[LoadedTemplate] = { + val rootPath = currRoot.toPath + if currRoot.isDirectory + then { + val indexPageOpt = Seq( + rootPath.resolve("index.md"), + rootPath.resolve("index.html"), + rootPath.resolve(s"${currRoot.getName}.md"), + rootPath.resolve(s"${currRoot.getName}.html") + ).filter(p => Files.exists(p)) match { + case Nil => None + case indexPath :: Nil => Some(indexPath) + case list => + report.warning(s"Multiple index pages for $currRoot found in ${list.map(_.toFile)}. Defaulting to first.") + list.headOption + } + val templateFileOpt = indexPageOpt.map(p => loadTemplateFile(p.toFile)) + + val indexPage = templateFileOpt.getOrElse(emptyTemplate(rootPath.resolve("index.html").toFile, "index")) + + val children = currRoot.listFiles.toList + .filter(_.toPath != indexPageOpt.getOrElse(null)) + Some(LoadedTemplate(indexPage, children.flatMap(loadRecursively(_, destMappingFunc)), destMappingFunc(indexPage.file))) + } + else if (currRoot.exists && ctx.siteExtensions.exists(ext => currRoot.getName.endsWith(ext))) { + val templateFile = loadTemplateFile(currRoot) + Some(LoadedTemplate(templateFile, List.empty, destMappingFunc(templateFile.file))) + } + else None + } + + def createMapping(root: LoadedTemplate): Map[Path, Path] = + Map((root.templateFile.file.toPath, root.file.toPath)) ++ root.children.map(createMapping).fold(Map.empty)(_ ++ _) + + private def toKebabCase(s: String) = s.toLowerCase.replace(' ', '-') + + private def relativizeIfNeeded(link: String): Path = + val path = Paths.get(link) + if !path.isAbsolute then root.toPath.resolve(link) + else path + + extension (p: Path) + private def toHtml: Path = p.getParent.resolve(p.getFileName.toString match + case f if f.endsWith(".md") => f.stripSuffix(".md") + ".html" + case f => f + ) \ No newline at end of file diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteRoot.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteRoot.scala new file mode 100644 index 000000000000..55c01030d722 --- /dev/null +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteRoot.scala @@ -0,0 +1,12 @@ +package dotty.tools.scaladoc +package site + +import java.nio.file.Path + +case class StaticSiteRoot( + rootTemplate: LoadedTemplate, + siteMappings: Map[Path, Path] +): + lazy val reverseSiteMappings = siteMappings.map(_.swap).toMap + lazy val sources = siteMappings.keys.toSet + lazy val dests = reverseSiteMappings.keys.toSet \ No newline at end of file diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala index 55eb30026fd4..ace8dd97a2e0 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala @@ -16,6 +16,8 @@ import com.vladsch.flexmark.util.options.{DataHolder, MutableDataSet} import com.vladsch.flexmark.html.HtmlRenderer import com.vladsch.flexmark.formatter.Formatter import liqp.Template +import liqp.ParseSettings +import liqp.parser.Flavor import liqp.TemplateContext import liqp.tags.Tag import liqp.nodes.LNode @@ -24,6 +26,13 @@ import scala.collection.JavaConverters._ import scala.io.Source import dotty.tools.scaladoc.snippets._ +/** RenderingContext stores information about defined properties, layouts and sites being resolved + * + * @param properties Map containing defined properties + * @param layouts Map containing defined site layouts + * @param resolving Set containing names of sites being resolved in this context. This information is useful for cycle detection + * @param resources List of resources that need to be appended to sites + */ case class RenderingContext( properties: Map[String, Object], layouts: Map[String, TemplateFile] = Map(), @@ -93,7 +102,8 @@ case class TemplateFile( throw new RuntimeException(s"Cycle in templates involving $file: ${ctx.resolving}") val layoutTemplate = layout.map(name => - ctx.layouts.getOrElse(name, throw new RuntimeException(s"No layouts named $name in ${ctx.layouts}"))) + ctx.layouts.getOrElse(name, throw new RuntimeException(s"No layouts named $name in ${ctx.layouts}")) + ) def asJavaElement(o: Object): Object = o match case m: Map[_, _] => m.transform { @@ -105,7 +115,25 @@ case class TemplateFile( // Library requires mutable maps.. val mutableProperties = new JHashMap(ctx.properties.transform((_, v) => asJavaElement(v)).asJava) - val rendered = Template.parse(this.rawCode).render(mutableProperties) + val tag = new Tag("highlight"): + override def render(context: TemplateContext, nodes: Array[? <: LNode]): Object = + super.asString(nodes(0).render(context), context) match + case "diff" => + s"
${super.asString(nodes(1).render(context), context)}
\n\n" + case _ => + report.warn("Unsupported highlight value. Currenlty supported values are: `diff`", file)(using ssctx.outerCtx) + s"```${super.asString(nodes(1).render(context), context)}```\n\n" + + val tag2 = new Tag("link"): + override def render(context: TemplateContext, nodes: Array[? <: LNode]): Object = + super.asString(nodes(0).render(context), context) match + case sth => + report.warn(s"Unsupported link tag. Link to $sth can't be resolved", file)(using ssctx.outerCtx) + "/" + + val parseSettings = ParseSettings.Builder().withFlavor(Flavor.JEKYLL).build() + + val rendered = Template.parse(this.rawCode, parseSettings).`with`(tag).`with`(tag2).render(mutableProperties) // We want to render markdown only if next template is html val code = if (isHtml || layoutTemplate.exists(!_.isHtml)) rendered else @@ -115,7 +143,8 @@ case class TemplateFile( val processed = FlexmarkSnippetProcessor.processSnippets(parsedMd, None, snippetCheckingFunc, withContext = false)(using ssctx.outerCtx) HtmlRenderer.builder(defaultMarkdownOptions).build().render(processed) - if layoutTemplate.isEmpty then - ResolvedPage(code, resources ++ ctx.resources) - else - layoutTemplate.get.resolveInner(ctx.nest(code, file, resources)) + // If we have a layout template, we need to embed rendered content in it. Otherwise, we just leave the content as is. + layoutTemplate match { + case Some(t) => t.resolveInner(ctx.nest(code, file, resources)) + case None => ResolvedPage(code, resources ++ ctx.resources) + } diff --git a/scaladoc/test-documentations/basic/index.md b/scaladoc/test-documentations/basic/index.md deleted file mode 100644 index 2205e0c12d3e..000000000000 --- a/scaladoc/test-documentations/basic/index.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: Basic test ---- -# Header - -[Link to docs](docs/index.html) - -And a text! \ No newline at end of file diff --git a/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala index c8172da4833f..0a2d1891a3cc 100644 --- a/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala @@ -28,7 +28,7 @@ class NavigationTest extends BaseHtmlTest: NavMenuTestEntry("Nested in a directory", "dir/nested.html", Nil) )), NavMenuTestEntry("Adoc", "Adoc.html", Seq()), - NavMenuTestEntry("API", "../api/index.html", Seq( + NavMenuTestEntry("API", "../index.html", Seq( NavMenuTestEntry("tests.site", "../tests/site.html", Seq( NavMenuTestEntry("BrokenLink", "../tests/site/BrokenLink.html", Nil), NavMenuTestEntry("BrokenLinkWiki", "../tests/site/BrokenLinkWiki.html", Nil), diff --git a/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala index 183bd792b262..b40a7c9c5e52 100644 --- a/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala @@ -7,7 +7,7 @@ import org.junit.Assert._ // TODO add negaitve and more details tests class SidebarParserTest: - private val sidebar = """sidebar: + private val sidebar = """pages: - title: Blog - title: My title page: my-page1.md @@ -34,16 +34,19 @@ class SidebarParserTest: @Test def loadSidebar(): Unit = assertEquals( - Seq( - Sidebar.Page(Some("Blog"), ""), - Sidebar.Page(Some("My title"), "my-page1.md"), - Sidebar.Page(None, "my-page2.md"), - Sidebar.Page(None, "my-page3/subsection"), - Sidebar.Category(Some("Reference"), None, List(Sidebar.Page(None, "my-page3.md"))), - Sidebar.Category(None, Some("my-page4/index.md"), List(Sidebar.Page(None, "my-page4/my-page4.md"))), - Sidebar.Category(Some("My subsection"), Some("my-page5/index.md"), List(Sidebar.Page(None, "my-page5/my-page5.md"))), - Sidebar.Category(None, None, List(Sidebar.Page(None, "my-page7/my-page7.md"))), - Sidebar.Category(None, Some("my-page6/index.md"), List(Sidebar.Category(None, Some("my-page6/my-page6/index.md"), List(Sidebar.Page(None, "my-page6/my-page6/my-page6.md"))))), + Sidebar.Root( + None, + List( + Sidebar.Page(Some("Blog"), ""), + Sidebar.Page(Some("My title"), "my-page1.md"), + Sidebar.Page(None, "my-page2.md"), + Sidebar.Page(None, "my-page3/subsection"), + Sidebar.Category(Some("Reference"), None, List(Sidebar.Page(None, "my-page3.md")), None), + Sidebar.Category(None, Some("my-page4/index.md"), List(Sidebar.Page(None, "my-page4/my-page4.md")), None), + Sidebar.Category(Some("My subsection"), Some("my-page5/index.md"), List(Sidebar.Page(None, "my-page5/my-page5.md")), None), + Sidebar.Category(None, None, List(Sidebar.Page(None, "my-page7/my-page7.md")), None), + Sidebar.Category(None, Some("my-page6/index.md"), List(Sidebar.Category(None, Some("my-page6/my-page6/index.md"), List(Sidebar.Page(None, "my-page6/my-page6/my-page6.md")), None)), None), + ) ), Sidebar.load(sidebar) ) diff --git a/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala index 7ed53bf2e132..352f963510ff 100644 --- a/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala @@ -40,13 +40,10 @@ class SiteGeneratationTest extends BaseHtmlTest: def testDocIndexPage()(using ProjectContext) = checkFile("docs/index.html")(title = projectName, header = s"$projectName in header") - def testMainIndexPage()(using ProjectContext) = - checkFile("index.html")(title = "Basic test", header = "Header", parents = Seq(), indexLinks) - def testApiPages( mainTitle: String = "API", parents: Seq[String] = Seq(projectName), - hasToplevelIndexIndex: Boolean = true)(using ProjectContext) = + hasToplevelIndexIndex: Boolean = false)(using ProjectContext) = checkFile((if hasToplevelIndexIndex then "api/" else "" )+ "index.html")( title = mainTitle, header = projectName, @@ -67,7 +64,6 @@ class SiteGeneratationTest extends BaseHtmlTest: def basicTest() = withGeneratedSite(testDocPath.resolve("basic")){ testDocPages() testDocIndexPage() - testMainIndexPage() testApiPages() withHtmlFile("docs/Adoc.html"){ content => @@ -76,7 +72,7 @@ class SiteGeneratationTest extends BaseHtmlTest: withHtmlFile("tests/site/SomeClass.html"){ content => content.assertAttr(".breadcrumbs a","href", - "../../docs/index.html", "../../api/index.html", "../site.html", "SomeClass.html" + "../../docs/index.html", "../../index.html", "../site.html", "SomeClass.html" ) } } From ae65e83663d2d7b9aee552753b3a6f0103b421d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Thu, 27 Jan 2022 17:28:29 +0100 Subject: [PATCH 1176/1244] Change static site directory structure. Adjust Dotty static site directory to the new implementation --- docs/{ => _assets}/css/bootstrap.min.css | 0 docs/{ => _assets}/css/color-brewer.css | 0 docs/{ => _assets}/css/dottydoc.css | 0 docs/{ => _assets}/css/frontpage.css | 0 docs/{ => _assets}/css/search.css | 0 docs/{ => _assets}/css/sidebar.css | 0 docs/{ => _assets}/css/toolbar.css | 0 .../scaladoc-assets.html | 0 docs/{ => _assets}/images/aggelos.jpg | Bin docs/{ => _assets}/images/allan.jpg | Bin docs/{ => _assets}/images/anatolii.png | Bin .../images/dotty-ide/decompiler.png | Bin .../images/dotty-ide/documentation-hover.png | Bin .../images/dotty-ide/signature-help.png | Bin .../{ => _assets}/images/dotty-logo-white.svg | 0 .../explicit-nulls-type-hierarchy.png | Bin docs/{ => _assets}/images/favicon.png | Bin docs/{ => _assets}/images/felix.jpg | Bin docs/{ => _assets}/images/fengyun.jpg | Bin docs/{ => _assets}/images/github-logo.svg | 0 docs/{ => _assets/images}/logo.svg | 0 docs/{ => _assets}/images/martin.jpg | Bin docs/{ => _assets}/images/nico.jpg | Bin docs/{ => _assets}/images/olivier.jpg | Bin .../images/others/scala-days-logo.png | Bin docs/{ => _assets}/images/petrashko.jpg | Bin docs/{ => _assets}/images/preview.png | Bin docs/{ => _assets}/images/scala-logo.svg | 0 docs/{ => _assets}/images/scaladoc-logo.png | Bin .../scaladoc/inkuire-1.0.0-M2_js_flatMap.gif | Bin .../{ => _assets}/images/scaladoc/nightly.gif | Bin docs/{ => _assets}/images/smarter.jpg | Bin .../images/worksheets/config-autorun.png | Bin .../images/worksheets/worksheet-demo.gif | Bin .../images/worksheets/worksheet-help.png | Bin .../images/worksheets/worksheet-run.png | Bin docs/{ => _assets}/js/api-search.js | 0 docs/{ => _assets}/js/bootstrap.min.js | 0 docs/{ => _assets}/js/highlight.pack.js | 0 docs/{ => _assets}/js/jquery.min.js | 0 docs/{ => _assets}/js/sidebar.js | 0 docs/{ => _assets}/js/toolbar.js | 0 .../resources/safer-exceptions.pdf | Bin .../2015-10-23-dotty-compiler-bootstraps.md | 0 .../_posts/2016-01-02-new-year-resolutions.md | 0 .../_posts/2016-02-03-essence-of-scala.md | 0 .../2016-02-17-scaling-dot-soundness.md | 0 .../_posts/2016-05-05-multiversal-equality.md | 0 .../2016-12-05-implicit-function-types.md | 0 ...017-05-31-first-dotty-milestone-release.md | 0 ...17-07-12-second-dotty-milestone-release.md | 0 ...017-09-07-third-dotty-milestone-release.md | 0 ...17-10-16-fourth-dotty-milestone-release.md | 0 ...017-12-01-fifth-dotty-milestone-release.md | 0 ...8-03-05-seventh-dotty-milestone-release.md | 0 ...18-04-27-eighth-dotty-milestone-release.md | 0 ...018-07-06-ninth-dotty-milestone-release.md | 0 ...2018-10-10-10th-dotty-milestone-release.md | 0 ...2018-11-30-11th-dotty-milestone-release.md | 0 ...2019-01-21-12th-dotty-milestone-release.md | 0 ...2019-03-05-13th-dotty-milestone-release.md | 0 ...2019-04-15-14th-dotty-milestone-release.md | 0 ...2019-05-23-15th-dotty-milestone-release.md | 0 ...2019-06-11-16th-dotty-milestone-release.md | 0 ...2019-07-25-17th-dotty-milestone-release.md | 0 ...2019-08-30-18th-dotty-milestone-release.md | 0 ...2019-09-23-19th-dotty-milestone-release.md | 0 ...2019-11-04-20th-dotty-milestone-release.md | 0 ...2019-12-20-21th-dotty-milestone-release.md | 0 ...2020-02-05-22nd-dotty-milestone-release.md | 0 ...2020-03-18-23rd-dotty-milestone-release.md | 0 ...2020-04-29-24th-dotty-milestone-release.md | 0 ...2020-06-22-25th-dotty-milestone-release.md | 0 ...2020-07-27-26th-dotty-milestone-release.md | 0 ...2020-08-31-27th-dotty-milestone-release.md | 0 .../_posts/2020-09-21-naming-schema-change.md | 0 .../blog/_posts/2020-11-09-scala3-m1.md | 0 .../blog/_posts/2020-12-18-scala3-m3.md | 0 .../blog/_posts/2021-02-17-scala3-rc1.md | 0 .../blog/_posts/2021-03-31-scala3-rc2.md | 0 .../blog/_posts/2021-04-21-scala3-rc3.md | 0 .../2021-06-07-scala3.0.1-rc1-release.md | 0 .../blog/_posts/2021-06-25-scala301-rc2.md | 0 docs/{ => _docs}/blog/index.html | 0 .../{docs => _docs}/contributing/checklist.sh | 0 .../contributing/contribute-knowledge.md | 0 .../contributing/debug-tests.md | 0 .../{docs => _docs}/contributing/debugging.md | 0 .../contributing/getting-started.md | 0 .../contributing/procedures/release.md | 0 .../contributing/procedures/vulpix.md | 0 .../contributing/scala2-vs-scala3.md | 0 docs/{docs => _docs}/contributing/testing.md | 0 .../{docs => _docs}/contributing/tools/ide.md | 0 .../contributing/tools/mill.md | 0 .../contributing/tools/scalafix.md | 0 docs/{docs => _docs}/contributing/workflow.md | 0 docs/{docs => _docs}/index.md | 0 docs/{docs => _docs}/internals/backend.md | 0 docs/{docs => _docs}/internals/classpaths.md | 0 docs/{docs => _docs}/internals/contexts.md | 0 .../internals/core-data-structures.md | 0 .../{docs => _docs}/internals/debug-macros.md | 0 docs/{docs => _docs}/internals/dotc-scalac.md | 0 .../internals/dotty-internals-1-notes.md | 0 .../internals/explicit-nulls.md | 0 .../internals/higher-kinded-v2.md | 0 .../internals/overall-structure.md | 0 docs/{docs => _docs}/internals/periods.md | 0 docs/{docs => _docs}/internals/syntax-3.1.md | 0 docs/{docs => _docs}/internals/syntax.md | 0 docs/{docs => _docs}/internals/type-system.md | 0 .../changed-features/changed-features.md | 0 .../changed-features/compiler-plugins.md | 0 .../changed-features/eta-expansion-spec.md | 0 .../changed-features/eta-expansion.md | 0 .../implicit-conversions-spec.md | 0 .../changed-features/implicit-conversions.md | 0 .../changed-features/implicit-resolution.md | 0 .../reference/changed-features/imports.md | 0 .../changed-features/interpolation-escapes.md | 0 .../changed-features/lazy-vals-init.md | 0 .../changed-features/main-functions.md | 0 .../changed-features/match-syntax.md | 0 .../changed-features/numeric-literals.md | 0 .../reference/changed-features/operators.md | 0 .../changed-features/overload-resolution.md | 0 .../changed-features/pattern-bindings.md | 0 .../changed-features/pattern-matching.md | 0 .../changed-features/structural-types-spec.md | 0 .../changed-features/structural-types.md | 0 .../changed-features/type-checking.md | 0 .../changed-features/type-inference.md | 0 .../changed-features/vararg-splices.md | 0 .../reference/changed-features/wildcards.md | 0 .../contextual/by-name-context-parameters.md | 0 .../reference/contextual/context-bounds.md | 0 .../contextual/context-functions-spec.md | 0 .../reference/contextual/context-functions.md | 0 .../reference/contextual/contextual.md | 0 .../reference/contextual/conversions.md | 0 .../reference/contextual/derivation-macro.md | 0 .../reference/contextual/derivation.md | 0 .../reference/contextual/extension-methods.md | 0 .../reference/contextual/given-imports.md | 0 .../reference/contextual/givens.md | 0 .../contextual/multiversal-equality.md | 0 .../contextual/relationship-implicits.md | 0 .../right-associative-extension-methods.md | 0 .../reference/contextual/type-classes.md | 0 .../reference/contextual/using-clauses.md | 0 .../reference/dropped-features/auto-apply.md | 0 .../dropped-features/class-shadowing-spec.md | 0 .../dropped-features/class-shadowing.md | 0 .../dropped-features/delayed-init.md | 0 .../reference/dropped-features/do-while.md | 0 .../dropped-features/dropped-features.md | 0 .../dropped-features/early-initializers.md | 0 .../dropped-features/existential-types.md | 0 .../reference/dropped-features/limit22.md | 0 .../reference/dropped-features/macros.md | 0 .../dropped-features/nonlocal-returns.md | 0 .../dropped-features/package-objects.md | 0 .../dropped-features/procedure-syntax.md | 0 .../reference/dropped-features/symlits.md | 0 .../dropped-features/this-qualifier.md | 0 .../dropped-features/type-projection.md | 0 .../dropped-features/weak-conformance-spec.md | 0 .../dropped-features/weak-conformance.md | 0 .../dropped-features/wildcard-init.md | 0 .../reference/dropped-features/xml.md | 0 docs/{docs => _docs}/reference/enums/adts.md | 0 .../reference/enums/desugarEnums.md | 0 .../reference/enums/enums-index.md | 0 docs/{docs => _docs}/reference/enums/enums.md | 0 .../reference/experimental/canthrow.md | 0 .../reference/experimental/cc.md | 0 .../experimental/erased-defs-spec.md | 0 .../reference/experimental/erased-defs.md | 0 .../reference/experimental/explicit-nulls.md | 0 .../experimental/named-typeargs-spec.md | 0 .../reference/experimental/named-typeargs.md | 0 .../experimental/numeric-literals.md | 0 .../reference/experimental/overview.md | 0 .../reference/features-classification.md | 0 .../language-versions/binary-compatibility.md | 0 .../language-versions/language-versions.md | 0 .../language-versions/source-compatibility.md | 0 .../metaprogramming/compiletime-ops.md | 0 .../reference/metaprogramming/inline.md | 0 .../reference/metaprogramming/macros-spec.md | 0 .../reference/metaprogramming/macros.md | 0 .../metaprogramming/metaprogramming.md | 0 .../reference/metaprogramming/reflection.md | 0 .../reference/metaprogramming/simple-smp.md | 0 .../reference/metaprogramming/staging.md | 0 .../metaprogramming/tasty-inspect.md | 0 .../dependent-function-types-spec.md | 0 .../new-types/dependent-function-types.md | 0 .../new-types/intersection-types-spec.md | 0 .../reference/new-types/intersection-types.md | 0 .../reference/new-types/match-types.md | 0 .../reference/new-types/new-types.md | 0 .../new-types/polymorphic-function-types.md | 0 .../reference/new-types/type-lambdas-spec.md | 0 .../reference/new-types/type-lambdas.md | 0 .../reference/new-types/union-types-spec.md | 0 .../reference/new-types/union-types.md | 0 .../other-new-features/control-syntax.md | 0 .../creator-applications.md | 0 .../other-new-features/experimental-defs.md | 0 .../reference/other-new-features/export.md | 0 .../indentation-experimental.md | 0 .../other-new-features/indentation.md | 0 .../other-new-features/kind-polymorphism.md | 0 .../reference/other-new-features/matchable.md | 0 .../other-new-features/opaques-details.md | 0 .../reference/other-new-features/opaques.md | 0 .../other-new-features/open-classes.md | 0 .../other-new-features/other-new-types.md | 0 .../parameter-untupling-spec.md | 0 .../other-new-features/parameter-untupling.md | 0 .../other-new-features/safe-initialization.md | 0 .../other-new-features/targetName.md | 0 .../threadUnsafe-annotation.md | 0 .../other-new-features/trait-parameters.md | 0 .../other-new-features/transparent-traits.md | 0 .../reference/other-new-features/type-test.md | 0 docs/{docs => _docs}/reference/overview.md | 0 .../reference/soft-modifier.md | 0 docs/{docs => _docs}/reference/syntax.md | 0 docs/{docs => _docs}/release-notes/0.1.2.md | 0 .../release-notes/syntax-changes-0.22.md | 0 docs/{docs => _docs}/usage/cbt-projects.md | 0 docs/{docs => _docs}/usage/dottydoc.md | 0 docs/{docs => _docs}/usage/ide-support.md | 0 docs/{docs => _docs}/usage/sbt-projects.md | 0 docs/{docs => _docs}/usage/scaladoc/blog.md | 0 .../usage/scaladoc/docstrings.md | 0 docs/{docs => _docs}/usage/scaladoc/index.md | 0 .../{docs => _docs}/usage/scaladoc/linking.md | 0 .../usage/scaladoc/search-engine.md | 0 .../usage/scaladoc/settings.md | 0 .../usage/scaladoc/site-versioning.md | 0 .../usage/scaladoc/static-site.md | 0 docs/{docs => _docs}/usage/version-numbers.md | 0 .../worksheet-mode-implementation-details.md | 0 docs/index.html | 109 ------- docs/sidebar.yml | 296 +++++++++--------- project/Build.scala | 2 +- project/scripts/cmdScaladocTests | 2 +- .../src/{docs => _docs}/tests/Adoc.scala | 2 +- .../scaladoc/renderers/HtmlRenderer.scala | 41 +-- .../tools/scaladoc/renderers/Renderer.scala | 2 +- .../scaladoc/renderers/SiteRenderer.scala | 34 +- .../scaladoc/site/StaticSiteContext.scala | 8 +- .../scaladoc/site/StaticSiteLoader.scala | 14 +- .../basic/{ => _assets}/images/basic.svg | 0 .../basic/{docs => _docs}/Adoc.md | 0 .../basic/{docs => _docs}/dir/index.md | 0 .../basic/{docs => _docs}/dir/nested.md | 0 .../basic/{docs => _docs}/index.md | 0 .../{docs => _docs}/tests/Adoc.md | 0 .../{ => _assets}/resources/tests/Adoc.html | 0 .../{ => _assets}/images/basic.svg | 0 .../noDocsIndex/{docs => _docs}/Adoc.md | 0 .../noDocsIndex/{docs => _docs}/dir/index.md | 0 .../noDocsIndex/{docs => _docs}/dir/nested.md | 0 .../noDocsIndex/{docs => _docs}/index.md | 0 .../test-documentations/noDocsIndex/index.md | 8 - .../{ => _assets}/images/basic.svg | 0 .../noGlobalIndex/{docs => _docs}/Adoc.md | 0 .../{docs => _docs}/dir/index.md | 0 .../{docs => _docs}/dir/nested.md | 0 .../noGlobalIndex/{docs => _docs}/index.md | 0 .../noIndexes/{ => _assets}/images/basic.svg | 0 .../noIndexes/{docs => _docs}/Adoc.md | 0 .../noIndexes/{docs => _docs}/dir/index.md | 0 .../noIndexes/{docs => _docs}/dir/nested.md | 0 .../{ => _assets}/images/basic.svg | 0 .../static-links/{docs => _docs}/Adoc.md | 0 .../static-links/{docs => _docs}/dir/html.md | 0 .../static-links/{docs => _docs}/dir/index.md | 0 .../{docs => _docs}/dir/name...with..dots..md | 0 .../dir/name.with.md.and.html.md | 0 .../{docs => _docs}/dir/nested.md | 0 .../{docs => _docs}/dir/nested.svg | 0 .../static-links/{docs => _docs}/index.md | 0 .../test-documentations/static-links/index.md | 8 - .../dotty/tools/scaladoc/ReportingTest.scala | 4 +- .../tools/scaladoc/site/NavigationTest.scala | 2 +- .../scaladoc/site/SiteGeneratationTest.scala | 16 +- 292 files changed, 210 insertions(+), 338 deletions(-) rename docs/{ => _assets}/css/bootstrap.min.css (100%) rename docs/{ => _assets}/css/color-brewer.css (100%) rename docs/{ => _assets}/css/dottydoc.css (100%) rename docs/{ => _assets}/css/frontpage.css (100%) rename docs/{ => _assets}/css/search.css (100%) rename docs/{ => _assets}/css/sidebar.css (100%) rename docs/{ => _assets}/css/toolbar.css (100%) rename docs/{ => _assets}/docsScalaLangResources/scaladoc-assets.html (100%) rename docs/{ => _assets}/images/aggelos.jpg (100%) rename docs/{ => _assets}/images/allan.jpg (100%) rename docs/{ => _assets}/images/anatolii.png (100%) rename docs/{ => _assets}/images/dotty-ide/decompiler.png (100%) rename docs/{ => _assets}/images/dotty-ide/documentation-hover.png (100%) rename docs/{ => _assets}/images/dotty-ide/signature-help.png (100%) rename docs/{ => _assets}/images/dotty-logo-white.svg (100%) rename docs/{ => _assets}/images/explicit-nulls/explicit-nulls-type-hierarchy.png (100%) rename docs/{ => _assets}/images/favicon.png (100%) rename docs/{ => _assets}/images/felix.jpg (100%) rename docs/{ => _assets}/images/fengyun.jpg (100%) rename docs/{ => _assets}/images/github-logo.svg (100%) rename docs/{ => _assets/images}/logo.svg (100%) rename docs/{ => _assets}/images/martin.jpg (100%) rename docs/{ => _assets}/images/nico.jpg (100%) rename docs/{ => _assets}/images/olivier.jpg (100%) rename docs/{ => _assets}/images/others/scala-days-logo.png (100%) rename docs/{ => _assets}/images/petrashko.jpg (100%) rename docs/{ => _assets}/images/preview.png (100%) rename docs/{ => _assets}/images/scala-logo.svg (100%) rename docs/{ => _assets}/images/scaladoc-logo.png (100%) rename docs/{ => _assets}/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif (100%) rename docs/{ => _assets}/images/scaladoc/nightly.gif (100%) rename docs/{ => _assets}/images/smarter.jpg (100%) rename docs/{ => _assets}/images/worksheets/config-autorun.png (100%) rename docs/{ => _assets}/images/worksheets/worksheet-demo.gif (100%) rename docs/{ => _assets}/images/worksheets/worksheet-help.png (100%) rename docs/{ => _assets}/images/worksheets/worksheet-run.png (100%) rename docs/{ => _assets}/js/api-search.js (100%) rename docs/{ => _assets}/js/bootstrap.min.js (100%) rename docs/{ => _assets}/js/highlight.pack.js (100%) rename docs/{ => _assets}/js/jquery.min.js (100%) rename docs/{ => _assets}/js/sidebar.js (100%) rename docs/{ => _assets}/js/toolbar.js (100%) rename docs/{ => _assets}/resources/safer-exceptions.pdf (100%) rename docs/{ => _docs}/blog/_posts/2015-10-23-dotty-compiler-bootstraps.md (100%) rename docs/{ => _docs}/blog/_posts/2016-01-02-new-year-resolutions.md (100%) rename docs/{ => _docs}/blog/_posts/2016-02-03-essence-of-scala.md (100%) rename docs/{ => _docs}/blog/_posts/2016-02-17-scaling-dot-soundness.md (100%) rename docs/{ => _docs}/blog/_posts/2016-05-05-multiversal-equality.md (100%) rename docs/{ => _docs}/blog/_posts/2016-12-05-implicit-function-types.md (100%) rename docs/{ => _docs}/blog/_posts/2017-05-31-first-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2017-07-12-second-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2017-09-07-third-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2018-03-05-seventh-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2018-04-27-eighth-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2018-07-06-ninth-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2018-10-10-10th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2018-11-30-11th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2019-01-21-12th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2019-03-05-13th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2019-04-15-14th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2019-05-23-15th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2019-06-11-16th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2019-07-25-17th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2019-08-30-18th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2019-09-23-19th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2019-11-04-20th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2019-12-20-21th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2020-02-05-22nd-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2020-03-18-23rd-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2020-04-29-24th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2020-06-22-25th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2020-07-27-26th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2020-08-31-27th-dotty-milestone-release.md (100%) rename docs/{ => _docs}/blog/_posts/2020-09-21-naming-schema-change.md (100%) rename docs/{ => _docs}/blog/_posts/2020-11-09-scala3-m1.md (100%) rename docs/{ => _docs}/blog/_posts/2020-12-18-scala3-m3.md (100%) rename docs/{ => _docs}/blog/_posts/2021-02-17-scala3-rc1.md (100%) rename docs/{ => _docs}/blog/_posts/2021-03-31-scala3-rc2.md (100%) rename docs/{ => _docs}/blog/_posts/2021-04-21-scala3-rc3.md (100%) rename docs/{ => _docs}/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md (100%) rename docs/{ => _docs}/blog/_posts/2021-06-25-scala301-rc2.md (100%) rename docs/{ => _docs}/blog/index.html (100%) rename docs/{docs => _docs}/contributing/checklist.sh (100%) rename docs/{docs => _docs}/contributing/contribute-knowledge.md (100%) rename docs/{docs => _docs}/contributing/debug-tests.md (100%) rename docs/{docs => _docs}/contributing/debugging.md (100%) rename docs/{docs => _docs}/contributing/getting-started.md (100%) rename docs/{docs => _docs}/contributing/procedures/release.md (100%) rename docs/{docs => _docs}/contributing/procedures/vulpix.md (100%) rename docs/{docs => _docs}/contributing/scala2-vs-scala3.md (100%) rename docs/{docs => _docs}/contributing/testing.md (100%) rename docs/{docs => _docs}/contributing/tools/ide.md (100%) rename docs/{docs => _docs}/contributing/tools/mill.md (100%) rename docs/{docs => _docs}/contributing/tools/scalafix.md (100%) rename docs/{docs => _docs}/contributing/workflow.md (100%) rename docs/{docs => _docs}/index.md (100%) rename docs/{docs => _docs}/internals/backend.md (100%) rename docs/{docs => _docs}/internals/classpaths.md (100%) rename docs/{docs => _docs}/internals/contexts.md (100%) rename docs/{docs => _docs}/internals/core-data-structures.md (100%) rename docs/{docs => _docs}/internals/debug-macros.md (100%) rename docs/{docs => _docs}/internals/dotc-scalac.md (100%) rename docs/{docs => _docs}/internals/dotty-internals-1-notes.md (100%) rename docs/{docs => _docs}/internals/explicit-nulls.md (100%) rename docs/{docs => _docs}/internals/higher-kinded-v2.md (100%) rename docs/{docs => _docs}/internals/overall-structure.md (100%) rename docs/{docs => _docs}/internals/periods.md (100%) rename docs/{docs => _docs}/internals/syntax-3.1.md (100%) rename docs/{docs => _docs}/internals/syntax.md (100%) rename docs/{docs => _docs}/internals/type-system.md (100%) rename docs/{docs => _docs}/reference/changed-features/changed-features.md (100%) rename docs/{docs => _docs}/reference/changed-features/compiler-plugins.md (100%) rename docs/{docs => _docs}/reference/changed-features/eta-expansion-spec.md (100%) rename docs/{docs => _docs}/reference/changed-features/eta-expansion.md (100%) rename docs/{docs => _docs}/reference/changed-features/implicit-conversions-spec.md (100%) rename docs/{docs => _docs}/reference/changed-features/implicit-conversions.md (100%) rename docs/{docs => _docs}/reference/changed-features/implicit-resolution.md (100%) rename docs/{docs => _docs}/reference/changed-features/imports.md (100%) rename docs/{docs => _docs}/reference/changed-features/interpolation-escapes.md (100%) rename docs/{docs => _docs}/reference/changed-features/lazy-vals-init.md (100%) rename docs/{docs => _docs}/reference/changed-features/main-functions.md (100%) rename docs/{docs => _docs}/reference/changed-features/match-syntax.md (100%) rename docs/{docs => _docs}/reference/changed-features/numeric-literals.md (100%) rename docs/{docs => _docs}/reference/changed-features/operators.md (100%) rename docs/{docs => _docs}/reference/changed-features/overload-resolution.md (100%) rename docs/{docs => _docs}/reference/changed-features/pattern-bindings.md (100%) rename docs/{docs => _docs}/reference/changed-features/pattern-matching.md (100%) rename docs/{docs => _docs}/reference/changed-features/structural-types-spec.md (100%) rename docs/{docs => _docs}/reference/changed-features/structural-types.md (100%) rename docs/{docs => _docs}/reference/changed-features/type-checking.md (100%) rename docs/{docs => _docs}/reference/changed-features/type-inference.md (100%) rename docs/{docs => _docs}/reference/changed-features/vararg-splices.md (100%) rename docs/{docs => _docs}/reference/changed-features/wildcards.md (100%) rename docs/{docs => _docs}/reference/contextual/by-name-context-parameters.md (100%) rename docs/{docs => _docs}/reference/contextual/context-bounds.md (100%) rename docs/{docs => _docs}/reference/contextual/context-functions-spec.md (100%) rename docs/{docs => _docs}/reference/contextual/context-functions.md (100%) rename docs/{docs => _docs}/reference/contextual/contextual.md (100%) rename docs/{docs => _docs}/reference/contextual/conversions.md (100%) rename docs/{docs => _docs}/reference/contextual/derivation-macro.md (100%) rename docs/{docs => _docs}/reference/contextual/derivation.md (100%) rename docs/{docs => _docs}/reference/contextual/extension-methods.md (100%) rename docs/{docs => _docs}/reference/contextual/given-imports.md (100%) rename docs/{docs => _docs}/reference/contextual/givens.md (100%) rename docs/{docs => _docs}/reference/contextual/multiversal-equality.md (100%) rename docs/{docs => _docs}/reference/contextual/relationship-implicits.md (100%) rename docs/{docs => _docs}/reference/contextual/right-associative-extension-methods.md (100%) rename docs/{docs => _docs}/reference/contextual/type-classes.md (100%) rename docs/{docs => _docs}/reference/contextual/using-clauses.md (100%) rename docs/{docs => _docs}/reference/dropped-features/auto-apply.md (100%) rename docs/{docs => _docs}/reference/dropped-features/class-shadowing-spec.md (100%) rename docs/{docs => _docs}/reference/dropped-features/class-shadowing.md (100%) rename docs/{docs => _docs}/reference/dropped-features/delayed-init.md (100%) rename docs/{docs => _docs}/reference/dropped-features/do-while.md (100%) rename docs/{docs => _docs}/reference/dropped-features/dropped-features.md (100%) rename docs/{docs => _docs}/reference/dropped-features/early-initializers.md (100%) rename docs/{docs => _docs}/reference/dropped-features/existential-types.md (100%) rename docs/{docs => _docs}/reference/dropped-features/limit22.md (100%) rename docs/{docs => _docs}/reference/dropped-features/macros.md (100%) rename docs/{docs => _docs}/reference/dropped-features/nonlocal-returns.md (100%) rename docs/{docs => _docs}/reference/dropped-features/package-objects.md (100%) rename docs/{docs => _docs}/reference/dropped-features/procedure-syntax.md (100%) rename docs/{docs => _docs}/reference/dropped-features/symlits.md (100%) rename docs/{docs => _docs}/reference/dropped-features/this-qualifier.md (100%) rename docs/{docs => _docs}/reference/dropped-features/type-projection.md (100%) rename docs/{docs => _docs}/reference/dropped-features/weak-conformance-spec.md (100%) rename docs/{docs => _docs}/reference/dropped-features/weak-conformance.md (100%) rename docs/{docs => _docs}/reference/dropped-features/wildcard-init.md (100%) rename docs/{docs => _docs}/reference/dropped-features/xml.md (100%) rename docs/{docs => _docs}/reference/enums/adts.md (100%) rename docs/{docs => _docs}/reference/enums/desugarEnums.md (100%) rename docs/{docs => _docs}/reference/enums/enums-index.md (100%) rename docs/{docs => _docs}/reference/enums/enums.md (100%) rename docs/{docs => _docs}/reference/experimental/canthrow.md (100%) rename docs/{docs => _docs}/reference/experimental/cc.md (100%) rename docs/{docs => _docs}/reference/experimental/erased-defs-spec.md (100%) rename docs/{docs => _docs}/reference/experimental/erased-defs.md (100%) rename docs/{docs => _docs}/reference/experimental/explicit-nulls.md (100%) rename docs/{docs => _docs}/reference/experimental/named-typeargs-spec.md (100%) rename docs/{docs => _docs}/reference/experimental/named-typeargs.md (100%) rename docs/{docs => _docs}/reference/experimental/numeric-literals.md (100%) rename docs/{docs => _docs}/reference/experimental/overview.md (100%) rename docs/{docs => _docs}/reference/features-classification.md (100%) rename docs/{docs => _docs}/reference/language-versions/binary-compatibility.md (100%) rename docs/{docs => _docs}/reference/language-versions/language-versions.md (100%) rename docs/{docs => _docs}/reference/language-versions/source-compatibility.md (100%) rename docs/{docs => _docs}/reference/metaprogramming/compiletime-ops.md (100%) rename docs/{docs => _docs}/reference/metaprogramming/inline.md (100%) rename docs/{docs => _docs}/reference/metaprogramming/macros-spec.md (100%) rename docs/{docs => _docs}/reference/metaprogramming/macros.md (100%) rename docs/{docs => _docs}/reference/metaprogramming/metaprogramming.md (100%) rename docs/{docs => _docs}/reference/metaprogramming/reflection.md (100%) rename docs/{docs => _docs}/reference/metaprogramming/simple-smp.md (100%) rename docs/{docs => _docs}/reference/metaprogramming/staging.md (100%) rename docs/{docs => _docs}/reference/metaprogramming/tasty-inspect.md (100%) rename docs/{docs => _docs}/reference/new-types/dependent-function-types-spec.md (100%) rename docs/{docs => _docs}/reference/new-types/dependent-function-types.md (100%) rename docs/{docs => _docs}/reference/new-types/intersection-types-spec.md (100%) rename docs/{docs => _docs}/reference/new-types/intersection-types.md (100%) rename docs/{docs => _docs}/reference/new-types/match-types.md (100%) rename docs/{docs => _docs}/reference/new-types/new-types.md (100%) rename docs/{docs => _docs}/reference/new-types/polymorphic-function-types.md (100%) rename docs/{docs => _docs}/reference/new-types/type-lambdas-spec.md (100%) rename docs/{docs => _docs}/reference/new-types/type-lambdas.md (100%) rename docs/{docs => _docs}/reference/new-types/union-types-spec.md (100%) rename docs/{docs => _docs}/reference/new-types/union-types.md (100%) rename docs/{docs => _docs}/reference/other-new-features/control-syntax.md (100%) rename docs/{docs => _docs}/reference/other-new-features/creator-applications.md (100%) rename docs/{docs => _docs}/reference/other-new-features/experimental-defs.md (100%) rename docs/{docs => _docs}/reference/other-new-features/export.md (100%) rename docs/{docs => _docs}/reference/other-new-features/indentation-experimental.md (100%) rename docs/{docs => _docs}/reference/other-new-features/indentation.md (100%) rename docs/{docs => _docs}/reference/other-new-features/kind-polymorphism.md (100%) rename docs/{docs => _docs}/reference/other-new-features/matchable.md (100%) rename docs/{docs => _docs}/reference/other-new-features/opaques-details.md (100%) rename docs/{docs => _docs}/reference/other-new-features/opaques.md (100%) rename docs/{docs => _docs}/reference/other-new-features/open-classes.md (100%) rename docs/{docs => _docs}/reference/other-new-features/other-new-types.md (100%) rename docs/{docs => _docs}/reference/other-new-features/parameter-untupling-spec.md (100%) rename docs/{docs => _docs}/reference/other-new-features/parameter-untupling.md (100%) rename docs/{docs => _docs}/reference/other-new-features/safe-initialization.md (100%) rename docs/{docs => _docs}/reference/other-new-features/targetName.md (100%) rename docs/{docs => _docs}/reference/other-new-features/threadUnsafe-annotation.md (100%) rename docs/{docs => _docs}/reference/other-new-features/trait-parameters.md (100%) rename docs/{docs => _docs}/reference/other-new-features/transparent-traits.md (100%) rename docs/{docs => _docs}/reference/other-new-features/type-test.md (100%) rename docs/{docs => _docs}/reference/overview.md (100%) rename docs/{docs => _docs}/reference/soft-modifier.md (100%) rename docs/{docs => _docs}/reference/syntax.md (100%) rename docs/{docs => _docs}/release-notes/0.1.2.md (100%) rename docs/{docs => _docs}/release-notes/syntax-changes-0.22.md (100%) rename docs/{docs => _docs}/usage/cbt-projects.md (100%) rename docs/{docs => _docs}/usage/dottydoc.md (100%) rename docs/{docs => _docs}/usage/ide-support.md (100%) rename docs/{docs => _docs}/usage/sbt-projects.md (100%) rename docs/{docs => _docs}/usage/scaladoc/blog.md (100%) rename docs/{docs => _docs}/usage/scaladoc/docstrings.md (100%) rename docs/{docs => _docs}/usage/scaladoc/index.md (100%) rename docs/{docs => _docs}/usage/scaladoc/linking.md (100%) rename docs/{docs => _docs}/usage/scaladoc/search-engine.md (100%) rename docs/{docs => _docs}/usage/scaladoc/settings.md (100%) rename docs/{docs => _docs}/usage/scaladoc/site-versioning.md (100%) rename docs/{docs => _docs}/usage/scaladoc/static-site.md (100%) rename docs/{docs => _docs}/usage/version-numbers.md (100%) rename docs/{docs => _docs}/usage/worksheet-mode-implementation-details.md (100%) delete mode 100644 docs/index.html rename scaladoc-testcases/src/{docs => _docs}/tests/Adoc.scala (59%) rename scaladoc/test-documentations/basic/{ => _assets}/images/basic.svg (100%) rename scaladoc/test-documentations/basic/{docs => _docs}/Adoc.md (100%) rename scaladoc/test-documentations/basic/{docs => _docs}/dir/index.md (100%) rename scaladoc/test-documentations/basic/{docs => _docs}/dir/nested.md (100%) rename scaladoc/test-documentations/basic/{docs => _docs}/index.md (100%) rename scaladoc/test-documentations/conflicts-pages/{docs => _docs}/tests/Adoc.md (100%) rename scaladoc/test-documentations/conflicts-resources/{ => _assets}/resources/tests/Adoc.html (100%) rename scaladoc/test-documentations/noDocsIndex/{ => _assets}/images/basic.svg (100%) rename scaladoc/test-documentations/noDocsIndex/{docs => _docs}/Adoc.md (100%) rename scaladoc/test-documentations/noDocsIndex/{docs => _docs}/dir/index.md (100%) rename scaladoc/test-documentations/noDocsIndex/{docs => _docs}/dir/nested.md (100%) rename scaladoc/test-documentations/noDocsIndex/{docs => _docs}/index.md (100%) delete mode 100644 scaladoc/test-documentations/noDocsIndex/index.md rename scaladoc/test-documentations/noGlobalIndex/{ => _assets}/images/basic.svg (100%) rename scaladoc/test-documentations/noGlobalIndex/{docs => _docs}/Adoc.md (100%) rename scaladoc/test-documentations/noGlobalIndex/{docs => _docs}/dir/index.md (100%) rename scaladoc/test-documentations/noGlobalIndex/{docs => _docs}/dir/nested.md (100%) rename scaladoc/test-documentations/noGlobalIndex/{docs => _docs}/index.md (100%) rename scaladoc/test-documentations/noIndexes/{ => _assets}/images/basic.svg (100%) rename scaladoc/test-documentations/noIndexes/{docs => _docs}/Adoc.md (100%) rename scaladoc/test-documentations/noIndexes/{docs => _docs}/dir/index.md (100%) rename scaladoc/test-documentations/noIndexes/{docs => _docs}/dir/nested.md (100%) rename scaladoc/test-documentations/static-links/{ => _assets}/images/basic.svg (100%) rename scaladoc/test-documentations/static-links/{docs => _docs}/Adoc.md (100%) rename scaladoc/test-documentations/static-links/{docs => _docs}/dir/html.md (100%) rename scaladoc/test-documentations/static-links/{docs => _docs}/dir/index.md (100%) rename scaladoc/test-documentations/static-links/{docs => _docs}/dir/name...with..dots..md (100%) rename scaladoc/test-documentations/static-links/{docs => _docs}/dir/name.with.md.and.html.md (100%) rename scaladoc/test-documentations/static-links/{docs => _docs}/dir/nested.md (100%) rename scaladoc/test-documentations/static-links/{docs => _docs}/dir/nested.svg (100%) rename scaladoc/test-documentations/static-links/{docs => _docs}/index.md (100%) delete mode 100644 scaladoc/test-documentations/static-links/index.md diff --git a/docs/css/bootstrap.min.css b/docs/_assets/css/bootstrap.min.css similarity index 100% rename from docs/css/bootstrap.min.css rename to docs/_assets/css/bootstrap.min.css diff --git a/docs/css/color-brewer.css b/docs/_assets/css/color-brewer.css similarity index 100% rename from docs/css/color-brewer.css rename to docs/_assets/css/color-brewer.css diff --git a/docs/css/dottydoc.css b/docs/_assets/css/dottydoc.css similarity index 100% rename from docs/css/dottydoc.css rename to docs/_assets/css/dottydoc.css diff --git a/docs/css/frontpage.css b/docs/_assets/css/frontpage.css similarity index 100% rename from docs/css/frontpage.css rename to docs/_assets/css/frontpage.css diff --git a/docs/css/search.css b/docs/_assets/css/search.css similarity index 100% rename from docs/css/search.css rename to docs/_assets/css/search.css diff --git a/docs/css/sidebar.css b/docs/_assets/css/sidebar.css similarity index 100% rename from docs/css/sidebar.css rename to docs/_assets/css/sidebar.css diff --git a/docs/css/toolbar.css b/docs/_assets/css/toolbar.css similarity index 100% rename from docs/css/toolbar.css rename to docs/_assets/css/toolbar.css diff --git a/docs/docsScalaLangResources/scaladoc-assets.html b/docs/_assets/docsScalaLangResources/scaladoc-assets.html similarity index 100% rename from docs/docsScalaLangResources/scaladoc-assets.html rename to docs/_assets/docsScalaLangResources/scaladoc-assets.html diff --git a/docs/images/aggelos.jpg b/docs/_assets/images/aggelos.jpg similarity index 100% rename from docs/images/aggelos.jpg rename to docs/_assets/images/aggelos.jpg diff --git a/docs/images/allan.jpg b/docs/_assets/images/allan.jpg similarity index 100% rename from docs/images/allan.jpg rename to docs/_assets/images/allan.jpg diff --git a/docs/images/anatolii.png b/docs/_assets/images/anatolii.png similarity index 100% rename from docs/images/anatolii.png rename to docs/_assets/images/anatolii.png diff --git a/docs/images/dotty-ide/decompiler.png b/docs/_assets/images/dotty-ide/decompiler.png similarity index 100% rename from docs/images/dotty-ide/decompiler.png rename to docs/_assets/images/dotty-ide/decompiler.png diff --git a/docs/images/dotty-ide/documentation-hover.png b/docs/_assets/images/dotty-ide/documentation-hover.png similarity index 100% rename from docs/images/dotty-ide/documentation-hover.png rename to docs/_assets/images/dotty-ide/documentation-hover.png diff --git a/docs/images/dotty-ide/signature-help.png b/docs/_assets/images/dotty-ide/signature-help.png similarity index 100% rename from docs/images/dotty-ide/signature-help.png rename to docs/_assets/images/dotty-ide/signature-help.png diff --git a/docs/images/dotty-logo-white.svg b/docs/_assets/images/dotty-logo-white.svg similarity index 100% rename from docs/images/dotty-logo-white.svg rename to docs/_assets/images/dotty-logo-white.svg diff --git a/docs/images/explicit-nulls/explicit-nulls-type-hierarchy.png b/docs/_assets/images/explicit-nulls/explicit-nulls-type-hierarchy.png similarity index 100% rename from docs/images/explicit-nulls/explicit-nulls-type-hierarchy.png rename to docs/_assets/images/explicit-nulls/explicit-nulls-type-hierarchy.png diff --git a/docs/images/favicon.png b/docs/_assets/images/favicon.png similarity index 100% rename from docs/images/favicon.png rename to docs/_assets/images/favicon.png diff --git a/docs/images/felix.jpg b/docs/_assets/images/felix.jpg similarity index 100% rename from docs/images/felix.jpg rename to docs/_assets/images/felix.jpg diff --git a/docs/images/fengyun.jpg b/docs/_assets/images/fengyun.jpg similarity index 100% rename from docs/images/fengyun.jpg rename to docs/_assets/images/fengyun.jpg diff --git a/docs/images/github-logo.svg b/docs/_assets/images/github-logo.svg similarity index 100% rename from docs/images/github-logo.svg rename to docs/_assets/images/github-logo.svg diff --git a/docs/logo.svg b/docs/_assets/images/logo.svg similarity index 100% rename from docs/logo.svg rename to docs/_assets/images/logo.svg diff --git a/docs/images/martin.jpg b/docs/_assets/images/martin.jpg similarity index 100% rename from docs/images/martin.jpg rename to docs/_assets/images/martin.jpg diff --git a/docs/images/nico.jpg b/docs/_assets/images/nico.jpg similarity index 100% rename from docs/images/nico.jpg rename to docs/_assets/images/nico.jpg diff --git a/docs/images/olivier.jpg b/docs/_assets/images/olivier.jpg similarity index 100% rename from docs/images/olivier.jpg rename to docs/_assets/images/olivier.jpg diff --git a/docs/images/others/scala-days-logo.png b/docs/_assets/images/others/scala-days-logo.png similarity index 100% rename from docs/images/others/scala-days-logo.png rename to docs/_assets/images/others/scala-days-logo.png diff --git a/docs/images/petrashko.jpg b/docs/_assets/images/petrashko.jpg similarity index 100% rename from docs/images/petrashko.jpg rename to docs/_assets/images/petrashko.jpg diff --git a/docs/images/preview.png b/docs/_assets/images/preview.png similarity index 100% rename from docs/images/preview.png rename to docs/_assets/images/preview.png diff --git a/docs/images/scala-logo.svg b/docs/_assets/images/scala-logo.svg similarity index 100% rename from docs/images/scala-logo.svg rename to docs/_assets/images/scala-logo.svg diff --git a/docs/images/scaladoc-logo.png b/docs/_assets/images/scaladoc-logo.png similarity index 100% rename from docs/images/scaladoc-logo.png rename to docs/_assets/images/scaladoc-logo.png diff --git a/docs/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif b/docs/_assets/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif similarity index 100% rename from docs/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif rename to docs/_assets/images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif diff --git a/docs/images/scaladoc/nightly.gif b/docs/_assets/images/scaladoc/nightly.gif similarity index 100% rename from docs/images/scaladoc/nightly.gif rename to docs/_assets/images/scaladoc/nightly.gif diff --git a/docs/images/smarter.jpg b/docs/_assets/images/smarter.jpg similarity index 100% rename from docs/images/smarter.jpg rename to docs/_assets/images/smarter.jpg diff --git a/docs/images/worksheets/config-autorun.png b/docs/_assets/images/worksheets/config-autorun.png similarity index 100% rename from docs/images/worksheets/config-autorun.png rename to docs/_assets/images/worksheets/config-autorun.png diff --git a/docs/images/worksheets/worksheet-demo.gif b/docs/_assets/images/worksheets/worksheet-demo.gif similarity index 100% rename from docs/images/worksheets/worksheet-demo.gif rename to docs/_assets/images/worksheets/worksheet-demo.gif diff --git a/docs/images/worksheets/worksheet-help.png b/docs/_assets/images/worksheets/worksheet-help.png similarity index 100% rename from docs/images/worksheets/worksheet-help.png rename to docs/_assets/images/worksheets/worksheet-help.png diff --git a/docs/images/worksheets/worksheet-run.png b/docs/_assets/images/worksheets/worksheet-run.png similarity index 100% rename from docs/images/worksheets/worksheet-run.png rename to docs/_assets/images/worksheets/worksheet-run.png diff --git a/docs/js/api-search.js b/docs/_assets/js/api-search.js similarity index 100% rename from docs/js/api-search.js rename to docs/_assets/js/api-search.js diff --git a/docs/js/bootstrap.min.js b/docs/_assets/js/bootstrap.min.js similarity index 100% rename from docs/js/bootstrap.min.js rename to docs/_assets/js/bootstrap.min.js diff --git a/docs/js/highlight.pack.js b/docs/_assets/js/highlight.pack.js similarity index 100% rename from docs/js/highlight.pack.js rename to docs/_assets/js/highlight.pack.js diff --git a/docs/js/jquery.min.js b/docs/_assets/js/jquery.min.js similarity index 100% rename from docs/js/jquery.min.js rename to docs/_assets/js/jquery.min.js diff --git a/docs/js/sidebar.js b/docs/_assets/js/sidebar.js similarity index 100% rename from docs/js/sidebar.js rename to docs/_assets/js/sidebar.js diff --git a/docs/js/toolbar.js b/docs/_assets/js/toolbar.js similarity index 100% rename from docs/js/toolbar.js rename to docs/_assets/js/toolbar.js diff --git a/docs/resources/safer-exceptions.pdf b/docs/_assets/resources/safer-exceptions.pdf similarity index 100% rename from docs/resources/safer-exceptions.pdf rename to docs/_assets/resources/safer-exceptions.pdf diff --git a/docs/blog/_posts/2015-10-23-dotty-compiler-bootstraps.md b/docs/_docs/blog/_posts/2015-10-23-dotty-compiler-bootstraps.md similarity index 100% rename from docs/blog/_posts/2015-10-23-dotty-compiler-bootstraps.md rename to docs/_docs/blog/_posts/2015-10-23-dotty-compiler-bootstraps.md diff --git a/docs/blog/_posts/2016-01-02-new-year-resolutions.md b/docs/_docs/blog/_posts/2016-01-02-new-year-resolutions.md similarity index 100% rename from docs/blog/_posts/2016-01-02-new-year-resolutions.md rename to docs/_docs/blog/_posts/2016-01-02-new-year-resolutions.md diff --git a/docs/blog/_posts/2016-02-03-essence-of-scala.md b/docs/_docs/blog/_posts/2016-02-03-essence-of-scala.md similarity index 100% rename from docs/blog/_posts/2016-02-03-essence-of-scala.md rename to docs/_docs/blog/_posts/2016-02-03-essence-of-scala.md diff --git a/docs/blog/_posts/2016-02-17-scaling-dot-soundness.md b/docs/_docs/blog/_posts/2016-02-17-scaling-dot-soundness.md similarity index 100% rename from docs/blog/_posts/2016-02-17-scaling-dot-soundness.md rename to docs/_docs/blog/_posts/2016-02-17-scaling-dot-soundness.md diff --git a/docs/blog/_posts/2016-05-05-multiversal-equality.md b/docs/_docs/blog/_posts/2016-05-05-multiversal-equality.md similarity index 100% rename from docs/blog/_posts/2016-05-05-multiversal-equality.md rename to docs/_docs/blog/_posts/2016-05-05-multiversal-equality.md diff --git a/docs/blog/_posts/2016-12-05-implicit-function-types.md b/docs/_docs/blog/_posts/2016-12-05-implicit-function-types.md similarity index 100% rename from docs/blog/_posts/2016-12-05-implicit-function-types.md rename to docs/_docs/blog/_posts/2016-12-05-implicit-function-types.md diff --git a/docs/blog/_posts/2017-05-31-first-dotty-milestone-release.md b/docs/_docs/blog/_posts/2017-05-31-first-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2017-05-31-first-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2017-05-31-first-dotty-milestone-release.md diff --git a/docs/blog/_posts/2017-07-12-second-dotty-milestone-release.md b/docs/_docs/blog/_posts/2017-07-12-second-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2017-07-12-second-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2017-07-12-second-dotty-milestone-release.md diff --git a/docs/blog/_posts/2017-09-07-third-dotty-milestone-release.md b/docs/_docs/blog/_posts/2017-09-07-third-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2017-09-07-third-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2017-09-07-third-dotty-milestone-release.md diff --git a/docs/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md b/docs/_docs/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md diff --git a/docs/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md b/docs/_docs/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md diff --git a/docs/blog/_posts/2018-03-05-seventh-dotty-milestone-release.md b/docs/_docs/blog/_posts/2018-03-05-seventh-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2018-03-05-seventh-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2018-03-05-seventh-dotty-milestone-release.md diff --git a/docs/blog/_posts/2018-04-27-eighth-dotty-milestone-release.md b/docs/_docs/blog/_posts/2018-04-27-eighth-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2018-04-27-eighth-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2018-04-27-eighth-dotty-milestone-release.md diff --git a/docs/blog/_posts/2018-07-06-ninth-dotty-milestone-release.md b/docs/_docs/blog/_posts/2018-07-06-ninth-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2018-07-06-ninth-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2018-07-06-ninth-dotty-milestone-release.md diff --git a/docs/blog/_posts/2018-10-10-10th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2018-10-10-10th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2018-10-10-10th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2018-10-10-10th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2018-11-30-11th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2018-11-30-11th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2018-11-30-11th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2018-11-30-11th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2019-01-21-12th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2019-01-21-12th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2019-01-21-12th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2019-01-21-12th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2019-03-05-13th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2019-03-05-13th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2019-03-05-13th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2019-03-05-13th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2019-04-15-14th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2019-04-15-14th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2019-04-15-14th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2019-04-15-14th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2019-05-23-15th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2019-05-23-15th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2019-05-23-15th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2019-05-23-15th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2019-07-25-17th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2019-07-25-17th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2019-07-25-17th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2019-07-25-17th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2019-08-30-18th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2019-08-30-18th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2019-08-30-18th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2019-08-30-18th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2019-09-23-19th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2019-09-23-19th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2019-09-23-19th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2019-09-23-19th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2019-11-04-20th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2019-11-04-20th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2019-11-04-20th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2019-11-04-20th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2020-02-05-22nd-dotty-milestone-release.md b/docs/_docs/blog/_posts/2020-02-05-22nd-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2020-02-05-22nd-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2020-02-05-22nd-dotty-milestone-release.md diff --git a/docs/blog/_posts/2020-03-18-23rd-dotty-milestone-release.md b/docs/_docs/blog/_posts/2020-03-18-23rd-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2020-03-18-23rd-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2020-03-18-23rd-dotty-milestone-release.md diff --git a/docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md b/docs/_docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md similarity index 100% rename from docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md rename to docs/_docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md diff --git a/docs/blog/_posts/2020-09-21-naming-schema-change.md b/docs/_docs/blog/_posts/2020-09-21-naming-schema-change.md similarity index 100% rename from docs/blog/_posts/2020-09-21-naming-schema-change.md rename to docs/_docs/blog/_posts/2020-09-21-naming-schema-change.md diff --git a/docs/blog/_posts/2020-11-09-scala3-m1.md b/docs/_docs/blog/_posts/2020-11-09-scala3-m1.md similarity index 100% rename from docs/blog/_posts/2020-11-09-scala3-m1.md rename to docs/_docs/blog/_posts/2020-11-09-scala3-m1.md diff --git a/docs/blog/_posts/2020-12-18-scala3-m3.md b/docs/_docs/blog/_posts/2020-12-18-scala3-m3.md similarity index 100% rename from docs/blog/_posts/2020-12-18-scala3-m3.md rename to docs/_docs/blog/_posts/2020-12-18-scala3-m3.md diff --git a/docs/blog/_posts/2021-02-17-scala3-rc1.md b/docs/_docs/blog/_posts/2021-02-17-scala3-rc1.md similarity index 100% rename from docs/blog/_posts/2021-02-17-scala3-rc1.md rename to docs/_docs/blog/_posts/2021-02-17-scala3-rc1.md diff --git a/docs/blog/_posts/2021-03-31-scala3-rc2.md b/docs/_docs/blog/_posts/2021-03-31-scala3-rc2.md similarity index 100% rename from docs/blog/_posts/2021-03-31-scala3-rc2.md rename to docs/_docs/blog/_posts/2021-03-31-scala3-rc2.md diff --git a/docs/blog/_posts/2021-04-21-scala3-rc3.md b/docs/_docs/blog/_posts/2021-04-21-scala3-rc3.md similarity index 100% rename from docs/blog/_posts/2021-04-21-scala3-rc3.md rename to docs/_docs/blog/_posts/2021-04-21-scala3-rc3.md diff --git a/docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md b/docs/_docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md similarity index 100% rename from docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md rename to docs/_docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md diff --git a/docs/blog/_posts/2021-06-25-scala301-rc2.md b/docs/_docs/blog/_posts/2021-06-25-scala301-rc2.md similarity index 100% rename from docs/blog/_posts/2021-06-25-scala301-rc2.md rename to docs/_docs/blog/_posts/2021-06-25-scala301-rc2.md diff --git a/docs/blog/index.html b/docs/_docs/blog/index.html similarity index 100% rename from docs/blog/index.html rename to docs/_docs/blog/index.html diff --git a/docs/docs/contributing/checklist.sh b/docs/_docs/contributing/checklist.sh similarity index 100% rename from docs/docs/contributing/checklist.sh rename to docs/_docs/contributing/checklist.sh diff --git a/docs/docs/contributing/contribute-knowledge.md b/docs/_docs/contributing/contribute-knowledge.md similarity index 100% rename from docs/docs/contributing/contribute-knowledge.md rename to docs/_docs/contributing/contribute-knowledge.md diff --git a/docs/docs/contributing/debug-tests.md b/docs/_docs/contributing/debug-tests.md similarity index 100% rename from docs/docs/contributing/debug-tests.md rename to docs/_docs/contributing/debug-tests.md diff --git a/docs/docs/contributing/debugging.md b/docs/_docs/contributing/debugging.md similarity index 100% rename from docs/docs/contributing/debugging.md rename to docs/_docs/contributing/debugging.md diff --git a/docs/docs/contributing/getting-started.md b/docs/_docs/contributing/getting-started.md similarity index 100% rename from docs/docs/contributing/getting-started.md rename to docs/_docs/contributing/getting-started.md diff --git a/docs/docs/contributing/procedures/release.md b/docs/_docs/contributing/procedures/release.md similarity index 100% rename from docs/docs/contributing/procedures/release.md rename to docs/_docs/contributing/procedures/release.md diff --git a/docs/docs/contributing/procedures/vulpix.md b/docs/_docs/contributing/procedures/vulpix.md similarity index 100% rename from docs/docs/contributing/procedures/vulpix.md rename to docs/_docs/contributing/procedures/vulpix.md diff --git a/docs/docs/contributing/scala2-vs-scala3.md b/docs/_docs/contributing/scala2-vs-scala3.md similarity index 100% rename from docs/docs/contributing/scala2-vs-scala3.md rename to docs/_docs/contributing/scala2-vs-scala3.md diff --git a/docs/docs/contributing/testing.md b/docs/_docs/contributing/testing.md similarity index 100% rename from docs/docs/contributing/testing.md rename to docs/_docs/contributing/testing.md diff --git a/docs/docs/contributing/tools/ide.md b/docs/_docs/contributing/tools/ide.md similarity index 100% rename from docs/docs/contributing/tools/ide.md rename to docs/_docs/contributing/tools/ide.md diff --git a/docs/docs/contributing/tools/mill.md b/docs/_docs/contributing/tools/mill.md similarity index 100% rename from docs/docs/contributing/tools/mill.md rename to docs/_docs/contributing/tools/mill.md diff --git a/docs/docs/contributing/tools/scalafix.md b/docs/_docs/contributing/tools/scalafix.md similarity index 100% rename from docs/docs/contributing/tools/scalafix.md rename to docs/_docs/contributing/tools/scalafix.md diff --git a/docs/docs/contributing/workflow.md b/docs/_docs/contributing/workflow.md similarity index 100% rename from docs/docs/contributing/workflow.md rename to docs/_docs/contributing/workflow.md diff --git a/docs/docs/index.md b/docs/_docs/index.md similarity index 100% rename from docs/docs/index.md rename to docs/_docs/index.md diff --git a/docs/docs/internals/backend.md b/docs/_docs/internals/backend.md similarity index 100% rename from docs/docs/internals/backend.md rename to docs/_docs/internals/backend.md diff --git a/docs/docs/internals/classpaths.md b/docs/_docs/internals/classpaths.md similarity index 100% rename from docs/docs/internals/classpaths.md rename to docs/_docs/internals/classpaths.md diff --git a/docs/docs/internals/contexts.md b/docs/_docs/internals/contexts.md similarity index 100% rename from docs/docs/internals/contexts.md rename to docs/_docs/internals/contexts.md diff --git a/docs/docs/internals/core-data-structures.md b/docs/_docs/internals/core-data-structures.md similarity index 100% rename from docs/docs/internals/core-data-structures.md rename to docs/_docs/internals/core-data-structures.md diff --git a/docs/docs/internals/debug-macros.md b/docs/_docs/internals/debug-macros.md similarity index 100% rename from docs/docs/internals/debug-macros.md rename to docs/_docs/internals/debug-macros.md diff --git a/docs/docs/internals/dotc-scalac.md b/docs/_docs/internals/dotc-scalac.md similarity index 100% rename from docs/docs/internals/dotc-scalac.md rename to docs/_docs/internals/dotc-scalac.md diff --git a/docs/docs/internals/dotty-internals-1-notes.md b/docs/_docs/internals/dotty-internals-1-notes.md similarity index 100% rename from docs/docs/internals/dotty-internals-1-notes.md rename to docs/_docs/internals/dotty-internals-1-notes.md diff --git a/docs/docs/internals/explicit-nulls.md b/docs/_docs/internals/explicit-nulls.md similarity index 100% rename from docs/docs/internals/explicit-nulls.md rename to docs/_docs/internals/explicit-nulls.md diff --git a/docs/docs/internals/higher-kinded-v2.md b/docs/_docs/internals/higher-kinded-v2.md similarity index 100% rename from docs/docs/internals/higher-kinded-v2.md rename to docs/_docs/internals/higher-kinded-v2.md diff --git a/docs/docs/internals/overall-structure.md b/docs/_docs/internals/overall-structure.md similarity index 100% rename from docs/docs/internals/overall-structure.md rename to docs/_docs/internals/overall-structure.md diff --git a/docs/docs/internals/periods.md b/docs/_docs/internals/periods.md similarity index 100% rename from docs/docs/internals/periods.md rename to docs/_docs/internals/periods.md diff --git a/docs/docs/internals/syntax-3.1.md b/docs/_docs/internals/syntax-3.1.md similarity index 100% rename from docs/docs/internals/syntax-3.1.md rename to docs/_docs/internals/syntax-3.1.md diff --git a/docs/docs/internals/syntax.md b/docs/_docs/internals/syntax.md similarity index 100% rename from docs/docs/internals/syntax.md rename to docs/_docs/internals/syntax.md diff --git a/docs/docs/internals/type-system.md b/docs/_docs/internals/type-system.md similarity index 100% rename from docs/docs/internals/type-system.md rename to docs/_docs/internals/type-system.md diff --git a/docs/docs/reference/changed-features/changed-features.md b/docs/_docs/reference/changed-features/changed-features.md similarity index 100% rename from docs/docs/reference/changed-features/changed-features.md rename to docs/_docs/reference/changed-features/changed-features.md diff --git a/docs/docs/reference/changed-features/compiler-plugins.md b/docs/_docs/reference/changed-features/compiler-plugins.md similarity index 100% rename from docs/docs/reference/changed-features/compiler-plugins.md rename to docs/_docs/reference/changed-features/compiler-plugins.md diff --git a/docs/docs/reference/changed-features/eta-expansion-spec.md b/docs/_docs/reference/changed-features/eta-expansion-spec.md similarity index 100% rename from docs/docs/reference/changed-features/eta-expansion-spec.md rename to docs/_docs/reference/changed-features/eta-expansion-spec.md diff --git a/docs/docs/reference/changed-features/eta-expansion.md b/docs/_docs/reference/changed-features/eta-expansion.md similarity index 100% rename from docs/docs/reference/changed-features/eta-expansion.md rename to docs/_docs/reference/changed-features/eta-expansion.md diff --git a/docs/docs/reference/changed-features/implicit-conversions-spec.md b/docs/_docs/reference/changed-features/implicit-conversions-spec.md similarity index 100% rename from docs/docs/reference/changed-features/implicit-conversions-spec.md rename to docs/_docs/reference/changed-features/implicit-conversions-spec.md diff --git a/docs/docs/reference/changed-features/implicit-conversions.md b/docs/_docs/reference/changed-features/implicit-conversions.md similarity index 100% rename from docs/docs/reference/changed-features/implicit-conversions.md rename to docs/_docs/reference/changed-features/implicit-conversions.md diff --git a/docs/docs/reference/changed-features/implicit-resolution.md b/docs/_docs/reference/changed-features/implicit-resolution.md similarity index 100% rename from docs/docs/reference/changed-features/implicit-resolution.md rename to docs/_docs/reference/changed-features/implicit-resolution.md diff --git a/docs/docs/reference/changed-features/imports.md b/docs/_docs/reference/changed-features/imports.md similarity index 100% rename from docs/docs/reference/changed-features/imports.md rename to docs/_docs/reference/changed-features/imports.md diff --git a/docs/docs/reference/changed-features/interpolation-escapes.md b/docs/_docs/reference/changed-features/interpolation-escapes.md similarity index 100% rename from docs/docs/reference/changed-features/interpolation-escapes.md rename to docs/_docs/reference/changed-features/interpolation-escapes.md diff --git a/docs/docs/reference/changed-features/lazy-vals-init.md b/docs/_docs/reference/changed-features/lazy-vals-init.md similarity index 100% rename from docs/docs/reference/changed-features/lazy-vals-init.md rename to docs/_docs/reference/changed-features/lazy-vals-init.md diff --git a/docs/docs/reference/changed-features/main-functions.md b/docs/_docs/reference/changed-features/main-functions.md similarity index 100% rename from docs/docs/reference/changed-features/main-functions.md rename to docs/_docs/reference/changed-features/main-functions.md diff --git a/docs/docs/reference/changed-features/match-syntax.md b/docs/_docs/reference/changed-features/match-syntax.md similarity index 100% rename from docs/docs/reference/changed-features/match-syntax.md rename to docs/_docs/reference/changed-features/match-syntax.md diff --git a/docs/docs/reference/changed-features/numeric-literals.md b/docs/_docs/reference/changed-features/numeric-literals.md similarity index 100% rename from docs/docs/reference/changed-features/numeric-literals.md rename to docs/_docs/reference/changed-features/numeric-literals.md diff --git a/docs/docs/reference/changed-features/operators.md b/docs/_docs/reference/changed-features/operators.md similarity index 100% rename from docs/docs/reference/changed-features/operators.md rename to docs/_docs/reference/changed-features/operators.md diff --git a/docs/docs/reference/changed-features/overload-resolution.md b/docs/_docs/reference/changed-features/overload-resolution.md similarity index 100% rename from docs/docs/reference/changed-features/overload-resolution.md rename to docs/_docs/reference/changed-features/overload-resolution.md diff --git a/docs/docs/reference/changed-features/pattern-bindings.md b/docs/_docs/reference/changed-features/pattern-bindings.md similarity index 100% rename from docs/docs/reference/changed-features/pattern-bindings.md rename to docs/_docs/reference/changed-features/pattern-bindings.md diff --git a/docs/docs/reference/changed-features/pattern-matching.md b/docs/_docs/reference/changed-features/pattern-matching.md similarity index 100% rename from docs/docs/reference/changed-features/pattern-matching.md rename to docs/_docs/reference/changed-features/pattern-matching.md diff --git a/docs/docs/reference/changed-features/structural-types-spec.md b/docs/_docs/reference/changed-features/structural-types-spec.md similarity index 100% rename from docs/docs/reference/changed-features/structural-types-spec.md rename to docs/_docs/reference/changed-features/structural-types-spec.md diff --git a/docs/docs/reference/changed-features/structural-types.md b/docs/_docs/reference/changed-features/structural-types.md similarity index 100% rename from docs/docs/reference/changed-features/structural-types.md rename to docs/_docs/reference/changed-features/structural-types.md diff --git a/docs/docs/reference/changed-features/type-checking.md b/docs/_docs/reference/changed-features/type-checking.md similarity index 100% rename from docs/docs/reference/changed-features/type-checking.md rename to docs/_docs/reference/changed-features/type-checking.md diff --git a/docs/docs/reference/changed-features/type-inference.md b/docs/_docs/reference/changed-features/type-inference.md similarity index 100% rename from docs/docs/reference/changed-features/type-inference.md rename to docs/_docs/reference/changed-features/type-inference.md diff --git a/docs/docs/reference/changed-features/vararg-splices.md b/docs/_docs/reference/changed-features/vararg-splices.md similarity index 100% rename from docs/docs/reference/changed-features/vararg-splices.md rename to docs/_docs/reference/changed-features/vararg-splices.md diff --git a/docs/docs/reference/changed-features/wildcards.md b/docs/_docs/reference/changed-features/wildcards.md similarity index 100% rename from docs/docs/reference/changed-features/wildcards.md rename to docs/_docs/reference/changed-features/wildcards.md diff --git a/docs/docs/reference/contextual/by-name-context-parameters.md b/docs/_docs/reference/contextual/by-name-context-parameters.md similarity index 100% rename from docs/docs/reference/contextual/by-name-context-parameters.md rename to docs/_docs/reference/contextual/by-name-context-parameters.md diff --git a/docs/docs/reference/contextual/context-bounds.md b/docs/_docs/reference/contextual/context-bounds.md similarity index 100% rename from docs/docs/reference/contextual/context-bounds.md rename to docs/_docs/reference/contextual/context-bounds.md diff --git a/docs/docs/reference/contextual/context-functions-spec.md b/docs/_docs/reference/contextual/context-functions-spec.md similarity index 100% rename from docs/docs/reference/contextual/context-functions-spec.md rename to docs/_docs/reference/contextual/context-functions-spec.md diff --git a/docs/docs/reference/contextual/context-functions.md b/docs/_docs/reference/contextual/context-functions.md similarity index 100% rename from docs/docs/reference/contextual/context-functions.md rename to docs/_docs/reference/contextual/context-functions.md diff --git a/docs/docs/reference/contextual/contextual.md b/docs/_docs/reference/contextual/contextual.md similarity index 100% rename from docs/docs/reference/contextual/contextual.md rename to docs/_docs/reference/contextual/contextual.md diff --git a/docs/docs/reference/contextual/conversions.md b/docs/_docs/reference/contextual/conversions.md similarity index 100% rename from docs/docs/reference/contextual/conversions.md rename to docs/_docs/reference/contextual/conversions.md diff --git a/docs/docs/reference/contextual/derivation-macro.md b/docs/_docs/reference/contextual/derivation-macro.md similarity index 100% rename from docs/docs/reference/contextual/derivation-macro.md rename to docs/_docs/reference/contextual/derivation-macro.md diff --git a/docs/docs/reference/contextual/derivation.md b/docs/_docs/reference/contextual/derivation.md similarity index 100% rename from docs/docs/reference/contextual/derivation.md rename to docs/_docs/reference/contextual/derivation.md diff --git a/docs/docs/reference/contextual/extension-methods.md b/docs/_docs/reference/contextual/extension-methods.md similarity index 100% rename from docs/docs/reference/contextual/extension-methods.md rename to docs/_docs/reference/contextual/extension-methods.md diff --git a/docs/docs/reference/contextual/given-imports.md b/docs/_docs/reference/contextual/given-imports.md similarity index 100% rename from docs/docs/reference/contextual/given-imports.md rename to docs/_docs/reference/contextual/given-imports.md diff --git a/docs/docs/reference/contextual/givens.md b/docs/_docs/reference/contextual/givens.md similarity index 100% rename from docs/docs/reference/contextual/givens.md rename to docs/_docs/reference/contextual/givens.md diff --git a/docs/docs/reference/contextual/multiversal-equality.md b/docs/_docs/reference/contextual/multiversal-equality.md similarity index 100% rename from docs/docs/reference/contextual/multiversal-equality.md rename to docs/_docs/reference/contextual/multiversal-equality.md diff --git a/docs/docs/reference/contextual/relationship-implicits.md b/docs/_docs/reference/contextual/relationship-implicits.md similarity index 100% rename from docs/docs/reference/contextual/relationship-implicits.md rename to docs/_docs/reference/contextual/relationship-implicits.md diff --git a/docs/docs/reference/contextual/right-associative-extension-methods.md b/docs/_docs/reference/contextual/right-associative-extension-methods.md similarity index 100% rename from docs/docs/reference/contextual/right-associative-extension-methods.md rename to docs/_docs/reference/contextual/right-associative-extension-methods.md diff --git a/docs/docs/reference/contextual/type-classes.md b/docs/_docs/reference/contextual/type-classes.md similarity index 100% rename from docs/docs/reference/contextual/type-classes.md rename to docs/_docs/reference/contextual/type-classes.md diff --git a/docs/docs/reference/contextual/using-clauses.md b/docs/_docs/reference/contextual/using-clauses.md similarity index 100% rename from docs/docs/reference/contextual/using-clauses.md rename to docs/_docs/reference/contextual/using-clauses.md diff --git a/docs/docs/reference/dropped-features/auto-apply.md b/docs/_docs/reference/dropped-features/auto-apply.md similarity index 100% rename from docs/docs/reference/dropped-features/auto-apply.md rename to docs/_docs/reference/dropped-features/auto-apply.md diff --git a/docs/docs/reference/dropped-features/class-shadowing-spec.md b/docs/_docs/reference/dropped-features/class-shadowing-spec.md similarity index 100% rename from docs/docs/reference/dropped-features/class-shadowing-spec.md rename to docs/_docs/reference/dropped-features/class-shadowing-spec.md diff --git a/docs/docs/reference/dropped-features/class-shadowing.md b/docs/_docs/reference/dropped-features/class-shadowing.md similarity index 100% rename from docs/docs/reference/dropped-features/class-shadowing.md rename to docs/_docs/reference/dropped-features/class-shadowing.md diff --git a/docs/docs/reference/dropped-features/delayed-init.md b/docs/_docs/reference/dropped-features/delayed-init.md similarity index 100% rename from docs/docs/reference/dropped-features/delayed-init.md rename to docs/_docs/reference/dropped-features/delayed-init.md diff --git a/docs/docs/reference/dropped-features/do-while.md b/docs/_docs/reference/dropped-features/do-while.md similarity index 100% rename from docs/docs/reference/dropped-features/do-while.md rename to docs/_docs/reference/dropped-features/do-while.md diff --git a/docs/docs/reference/dropped-features/dropped-features.md b/docs/_docs/reference/dropped-features/dropped-features.md similarity index 100% rename from docs/docs/reference/dropped-features/dropped-features.md rename to docs/_docs/reference/dropped-features/dropped-features.md diff --git a/docs/docs/reference/dropped-features/early-initializers.md b/docs/_docs/reference/dropped-features/early-initializers.md similarity index 100% rename from docs/docs/reference/dropped-features/early-initializers.md rename to docs/_docs/reference/dropped-features/early-initializers.md diff --git a/docs/docs/reference/dropped-features/existential-types.md b/docs/_docs/reference/dropped-features/existential-types.md similarity index 100% rename from docs/docs/reference/dropped-features/existential-types.md rename to docs/_docs/reference/dropped-features/existential-types.md diff --git a/docs/docs/reference/dropped-features/limit22.md b/docs/_docs/reference/dropped-features/limit22.md similarity index 100% rename from docs/docs/reference/dropped-features/limit22.md rename to docs/_docs/reference/dropped-features/limit22.md diff --git a/docs/docs/reference/dropped-features/macros.md b/docs/_docs/reference/dropped-features/macros.md similarity index 100% rename from docs/docs/reference/dropped-features/macros.md rename to docs/_docs/reference/dropped-features/macros.md diff --git a/docs/docs/reference/dropped-features/nonlocal-returns.md b/docs/_docs/reference/dropped-features/nonlocal-returns.md similarity index 100% rename from docs/docs/reference/dropped-features/nonlocal-returns.md rename to docs/_docs/reference/dropped-features/nonlocal-returns.md diff --git a/docs/docs/reference/dropped-features/package-objects.md b/docs/_docs/reference/dropped-features/package-objects.md similarity index 100% rename from docs/docs/reference/dropped-features/package-objects.md rename to docs/_docs/reference/dropped-features/package-objects.md diff --git a/docs/docs/reference/dropped-features/procedure-syntax.md b/docs/_docs/reference/dropped-features/procedure-syntax.md similarity index 100% rename from docs/docs/reference/dropped-features/procedure-syntax.md rename to docs/_docs/reference/dropped-features/procedure-syntax.md diff --git a/docs/docs/reference/dropped-features/symlits.md b/docs/_docs/reference/dropped-features/symlits.md similarity index 100% rename from docs/docs/reference/dropped-features/symlits.md rename to docs/_docs/reference/dropped-features/symlits.md diff --git a/docs/docs/reference/dropped-features/this-qualifier.md b/docs/_docs/reference/dropped-features/this-qualifier.md similarity index 100% rename from docs/docs/reference/dropped-features/this-qualifier.md rename to docs/_docs/reference/dropped-features/this-qualifier.md diff --git a/docs/docs/reference/dropped-features/type-projection.md b/docs/_docs/reference/dropped-features/type-projection.md similarity index 100% rename from docs/docs/reference/dropped-features/type-projection.md rename to docs/_docs/reference/dropped-features/type-projection.md diff --git a/docs/docs/reference/dropped-features/weak-conformance-spec.md b/docs/_docs/reference/dropped-features/weak-conformance-spec.md similarity index 100% rename from docs/docs/reference/dropped-features/weak-conformance-spec.md rename to docs/_docs/reference/dropped-features/weak-conformance-spec.md diff --git a/docs/docs/reference/dropped-features/weak-conformance.md b/docs/_docs/reference/dropped-features/weak-conformance.md similarity index 100% rename from docs/docs/reference/dropped-features/weak-conformance.md rename to docs/_docs/reference/dropped-features/weak-conformance.md diff --git a/docs/docs/reference/dropped-features/wildcard-init.md b/docs/_docs/reference/dropped-features/wildcard-init.md similarity index 100% rename from docs/docs/reference/dropped-features/wildcard-init.md rename to docs/_docs/reference/dropped-features/wildcard-init.md diff --git a/docs/docs/reference/dropped-features/xml.md b/docs/_docs/reference/dropped-features/xml.md similarity index 100% rename from docs/docs/reference/dropped-features/xml.md rename to docs/_docs/reference/dropped-features/xml.md diff --git a/docs/docs/reference/enums/adts.md b/docs/_docs/reference/enums/adts.md similarity index 100% rename from docs/docs/reference/enums/adts.md rename to docs/_docs/reference/enums/adts.md diff --git a/docs/docs/reference/enums/desugarEnums.md b/docs/_docs/reference/enums/desugarEnums.md similarity index 100% rename from docs/docs/reference/enums/desugarEnums.md rename to docs/_docs/reference/enums/desugarEnums.md diff --git a/docs/docs/reference/enums/enums-index.md b/docs/_docs/reference/enums/enums-index.md similarity index 100% rename from docs/docs/reference/enums/enums-index.md rename to docs/_docs/reference/enums/enums-index.md diff --git a/docs/docs/reference/enums/enums.md b/docs/_docs/reference/enums/enums.md similarity index 100% rename from docs/docs/reference/enums/enums.md rename to docs/_docs/reference/enums/enums.md diff --git a/docs/docs/reference/experimental/canthrow.md b/docs/_docs/reference/experimental/canthrow.md similarity index 100% rename from docs/docs/reference/experimental/canthrow.md rename to docs/_docs/reference/experimental/canthrow.md diff --git a/docs/docs/reference/experimental/cc.md b/docs/_docs/reference/experimental/cc.md similarity index 100% rename from docs/docs/reference/experimental/cc.md rename to docs/_docs/reference/experimental/cc.md diff --git a/docs/docs/reference/experimental/erased-defs-spec.md b/docs/_docs/reference/experimental/erased-defs-spec.md similarity index 100% rename from docs/docs/reference/experimental/erased-defs-spec.md rename to docs/_docs/reference/experimental/erased-defs-spec.md diff --git a/docs/docs/reference/experimental/erased-defs.md b/docs/_docs/reference/experimental/erased-defs.md similarity index 100% rename from docs/docs/reference/experimental/erased-defs.md rename to docs/_docs/reference/experimental/erased-defs.md diff --git a/docs/docs/reference/experimental/explicit-nulls.md b/docs/_docs/reference/experimental/explicit-nulls.md similarity index 100% rename from docs/docs/reference/experimental/explicit-nulls.md rename to docs/_docs/reference/experimental/explicit-nulls.md diff --git a/docs/docs/reference/experimental/named-typeargs-spec.md b/docs/_docs/reference/experimental/named-typeargs-spec.md similarity index 100% rename from docs/docs/reference/experimental/named-typeargs-spec.md rename to docs/_docs/reference/experimental/named-typeargs-spec.md diff --git a/docs/docs/reference/experimental/named-typeargs.md b/docs/_docs/reference/experimental/named-typeargs.md similarity index 100% rename from docs/docs/reference/experimental/named-typeargs.md rename to docs/_docs/reference/experimental/named-typeargs.md diff --git a/docs/docs/reference/experimental/numeric-literals.md b/docs/_docs/reference/experimental/numeric-literals.md similarity index 100% rename from docs/docs/reference/experimental/numeric-literals.md rename to docs/_docs/reference/experimental/numeric-literals.md diff --git a/docs/docs/reference/experimental/overview.md b/docs/_docs/reference/experimental/overview.md similarity index 100% rename from docs/docs/reference/experimental/overview.md rename to docs/_docs/reference/experimental/overview.md diff --git a/docs/docs/reference/features-classification.md b/docs/_docs/reference/features-classification.md similarity index 100% rename from docs/docs/reference/features-classification.md rename to docs/_docs/reference/features-classification.md diff --git a/docs/docs/reference/language-versions/binary-compatibility.md b/docs/_docs/reference/language-versions/binary-compatibility.md similarity index 100% rename from docs/docs/reference/language-versions/binary-compatibility.md rename to docs/_docs/reference/language-versions/binary-compatibility.md diff --git a/docs/docs/reference/language-versions/language-versions.md b/docs/_docs/reference/language-versions/language-versions.md similarity index 100% rename from docs/docs/reference/language-versions/language-versions.md rename to docs/_docs/reference/language-versions/language-versions.md diff --git a/docs/docs/reference/language-versions/source-compatibility.md b/docs/_docs/reference/language-versions/source-compatibility.md similarity index 100% rename from docs/docs/reference/language-versions/source-compatibility.md rename to docs/_docs/reference/language-versions/source-compatibility.md diff --git a/docs/docs/reference/metaprogramming/compiletime-ops.md b/docs/_docs/reference/metaprogramming/compiletime-ops.md similarity index 100% rename from docs/docs/reference/metaprogramming/compiletime-ops.md rename to docs/_docs/reference/metaprogramming/compiletime-ops.md diff --git a/docs/docs/reference/metaprogramming/inline.md b/docs/_docs/reference/metaprogramming/inline.md similarity index 100% rename from docs/docs/reference/metaprogramming/inline.md rename to docs/_docs/reference/metaprogramming/inline.md diff --git a/docs/docs/reference/metaprogramming/macros-spec.md b/docs/_docs/reference/metaprogramming/macros-spec.md similarity index 100% rename from docs/docs/reference/metaprogramming/macros-spec.md rename to docs/_docs/reference/metaprogramming/macros-spec.md diff --git a/docs/docs/reference/metaprogramming/macros.md b/docs/_docs/reference/metaprogramming/macros.md similarity index 100% rename from docs/docs/reference/metaprogramming/macros.md rename to docs/_docs/reference/metaprogramming/macros.md diff --git a/docs/docs/reference/metaprogramming/metaprogramming.md b/docs/_docs/reference/metaprogramming/metaprogramming.md similarity index 100% rename from docs/docs/reference/metaprogramming/metaprogramming.md rename to docs/_docs/reference/metaprogramming/metaprogramming.md diff --git a/docs/docs/reference/metaprogramming/reflection.md b/docs/_docs/reference/metaprogramming/reflection.md similarity index 100% rename from docs/docs/reference/metaprogramming/reflection.md rename to docs/_docs/reference/metaprogramming/reflection.md diff --git a/docs/docs/reference/metaprogramming/simple-smp.md b/docs/_docs/reference/metaprogramming/simple-smp.md similarity index 100% rename from docs/docs/reference/metaprogramming/simple-smp.md rename to docs/_docs/reference/metaprogramming/simple-smp.md diff --git a/docs/docs/reference/metaprogramming/staging.md b/docs/_docs/reference/metaprogramming/staging.md similarity index 100% rename from docs/docs/reference/metaprogramming/staging.md rename to docs/_docs/reference/metaprogramming/staging.md diff --git a/docs/docs/reference/metaprogramming/tasty-inspect.md b/docs/_docs/reference/metaprogramming/tasty-inspect.md similarity index 100% rename from docs/docs/reference/metaprogramming/tasty-inspect.md rename to docs/_docs/reference/metaprogramming/tasty-inspect.md diff --git a/docs/docs/reference/new-types/dependent-function-types-spec.md b/docs/_docs/reference/new-types/dependent-function-types-spec.md similarity index 100% rename from docs/docs/reference/new-types/dependent-function-types-spec.md rename to docs/_docs/reference/new-types/dependent-function-types-spec.md diff --git a/docs/docs/reference/new-types/dependent-function-types.md b/docs/_docs/reference/new-types/dependent-function-types.md similarity index 100% rename from docs/docs/reference/new-types/dependent-function-types.md rename to docs/_docs/reference/new-types/dependent-function-types.md diff --git a/docs/docs/reference/new-types/intersection-types-spec.md b/docs/_docs/reference/new-types/intersection-types-spec.md similarity index 100% rename from docs/docs/reference/new-types/intersection-types-spec.md rename to docs/_docs/reference/new-types/intersection-types-spec.md diff --git a/docs/docs/reference/new-types/intersection-types.md b/docs/_docs/reference/new-types/intersection-types.md similarity index 100% rename from docs/docs/reference/new-types/intersection-types.md rename to docs/_docs/reference/new-types/intersection-types.md diff --git a/docs/docs/reference/new-types/match-types.md b/docs/_docs/reference/new-types/match-types.md similarity index 100% rename from docs/docs/reference/new-types/match-types.md rename to docs/_docs/reference/new-types/match-types.md diff --git a/docs/docs/reference/new-types/new-types.md b/docs/_docs/reference/new-types/new-types.md similarity index 100% rename from docs/docs/reference/new-types/new-types.md rename to docs/_docs/reference/new-types/new-types.md diff --git a/docs/docs/reference/new-types/polymorphic-function-types.md b/docs/_docs/reference/new-types/polymorphic-function-types.md similarity index 100% rename from docs/docs/reference/new-types/polymorphic-function-types.md rename to docs/_docs/reference/new-types/polymorphic-function-types.md diff --git a/docs/docs/reference/new-types/type-lambdas-spec.md b/docs/_docs/reference/new-types/type-lambdas-spec.md similarity index 100% rename from docs/docs/reference/new-types/type-lambdas-spec.md rename to docs/_docs/reference/new-types/type-lambdas-spec.md diff --git a/docs/docs/reference/new-types/type-lambdas.md b/docs/_docs/reference/new-types/type-lambdas.md similarity index 100% rename from docs/docs/reference/new-types/type-lambdas.md rename to docs/_docs/reference/new-types/type-lambdas.md diff --git a/docs/docs/reference/new-types/union-types-spec.md b/docs/_docs/reference/new-types/union-types-spec.md similarity index 100% rename from docs/docs/reference/new-types/union-types-spec.md rename to docs/_docs/reference/new-types/union-types-spec.md diff --git a/docs/docs/reference/new-types/union-types.md b/docs/_docs/reference/new-types/union-types.md similarity index 100% rename from docs/docs/reference/new-types/union-types.md rename to docs/_docs/reference/new-types/union-types.md diff --git a/docs/docs/reference/other-new-features/control-syntax.md b/docs/_docs/reference/other-new-features/control-syntax.md similarity index 100% rename from docs/docs/reference/other-new-features/control-syntax.md rename to docs/_docs/reference/other-new-features/control-syntax.md diff --git a/docs/docs/reference/other-new-features/creator-applications.md b/docs/_docs/reference/other-new-features/creator-applications.md similarity index 100% rename from docs/docs/reference/other-new-features/creator-applications.md rename to docs/_docs/reference/other-new-features/creator-applications.md diff --git a/docs/docs/reference/other-new-features/experimental-defs.md b/docs/_docs/reference/other-new-features/experimental-defs.md similarity index 100% rename from docs/docs/reference/other-new-features/experimental-defs.md rename to docs/_docs/reference/other-new-features/experimental-defs.md diff --git a/docs/docs/reference/other-new-features/export.md b/docs/_docs/reference/other-new-features/export.md similarity index 100% rename from docs/docs/reference/other-new-features/export.md rename to docs/_docs/reference/other-new-features/export.md diff --git a/docs/docs/reference/other-new-features/indentation-experimental.md b/docs/_docs/reference/other-new-features/indentation-experimental.md similarity index 100% rename from docs/docs/reference/other-new-features/indentation-experimental.md rename to docs/_docs/reference/other-new-features/indentation-experimental.md diff --git a/docs/docs/reference/other-new-features/indentation.md b/docs/_docs/reference/other-new-features/indentation.md similarity index 100% rename from docs/docs/reference/other-new-features/indentation.md rename to docs/_docs/reference/other-new-features/indentation.md diff --git a/docs/docs/reference/other-new-features/kind-polymorphism.md b/docs/_docs/reference/other-new-features/kind-polymorphism.md similarity index 100% rename from docs/docs/reference/other-new-features/kind-polymorphism.md rename to docs/_docs/reference/other-new-features/kind-polymorphism.md diff --git a/docs/docs/reference/other-new-features/matchable.md b/docs/_docs/reference/other-new-features/matchable.md similarity index 100% rename from docs/docs/reference/other-new-features/matchable.md rename to docs/_docs/reference/other-new-features/matchable.md diff --git a/docs/docs/reference/other-new-features/opaques-details.md b/docs/_docs/reference/other-new-features/opaques-details.md similarity index 100% rename from docs/docs/reference/other-new-features/opaques-details.md rename to docs/_docs/reference/other-new-features/opaques-details.md diff --git a/docs/docs/reference/other-new-features/opaques.md b/docs/_docs/reference/other-new-features/opaques.md similarity index 100% rename from docs/docs/reference/other-new-features/opaques.md rename to docs/_docs/reference/other-new-features/opaques.md diff --git a/docs/docs/reference/other-new-features/open-classes.md b/docs/_docs/reference/other-new-features/open-classes.md similarity index 100% rename from docs/docs/reference/other-new-features/open-classes.md rename to docs/_docs/reference/other-new-features/open-classes.md diff --git a/docs/docs/reference/other-new-features/other-new-types.md b/docs/_docs/reference/other-new-features/other-new-types.md similarity index 100% rename from docs/docs/reference/other-new-features/other-new-types.md rename to docs/_docs/reference/other-new-features/other-new-types.md diff --git a/docs/docs/reference/other-new-features/parameter-untupling-spec.md b/docs/_docs/reference/other-new-features/parameter-untupling-spec.md similarity index 100% rename from docs/docs/reference/other-new-features/parameter-untupling-spec.md rename to docs/_docs/reference/other-new-features/parameter-untupling-spec.md diff --git a/docs/docs/reference/other-new-features/parameter-untupling.md b/docs/_docs/reference/other-new-features/parameter-untupling.md similarity index 100% rename from docs/docs/reference/other-new-features/parameter-untupling.md rename to docs/_docs/reference/other-new-features/parameter-untupling.md diff --git a/docs/docs/reference/other-new-features/safe-initialization.md b/docs/_docs/reference/other-new-features/safe-initialization.md similarity index 100% rename from docs/docs/reference/other-new-features/safe-initialization.md rename to docs/_docs/reference/other-new-features/safe-initialization.md diff --git a/docs/docs/reference/other-new-features/targetName.md b/docs/_docs/reference/other-new-features/targetName.md similarity index 100% rename from docs/docs/reference/other-new-features/targetName.md rename to docs/_docs/reference/other-new-features/targetName.md diff --git a/docs/docs/reference/other-new-features/threadUnsafe-annotation.md b/docs/_docs/reference/other-new-features/threadUnsafe-annotation.md similarity index 100% rename from docs/docs/reference/other-new-features/threadUnsafe-annotation.md rename to docs/_docs/reference/other-new-features/threadUnsafe-annotation.md diff --git a/docs/docs/reference/other-new-features/trait-parameters.md b/docs/_docs/reference/other-new-features/trait-parameters.md similarity index 100% rename from docs/docs/reference/other-new-features/trait-parameters.md rename to docs/_docs/reference/other-new-features/trait-parameters.md diff --git a/docs/docs/reference/other-new-features/transparent-traits.md b/docs/_docs/reference/other-new-features/transparent-traits.md similarity index 100% rename from docs/docs/reference/other-new-features/transparent-traits.md rename to docs/_docs/reference/other-new-features/transparent-traits.md diff --git a/docs/docs/reference/other-new-features/type-test.md b/docs/_docs/reference/other-new-features/type-test.md similarity index 100% rename from docs/docs/reference/other-new-features/type-test.md rename to docs/_docs/reference/other-new-features/type-test.md diff --git a/docs/docs/reference/overview.md b/docs/_docs/reference/overview.md similarity index 100% rename from docs/docs/reference/overview.md rename to docs/_docs/reference/overview.md diff --git a/docs/docs/reference/soft-modifier.md b/docs/_docs/reference/soft-modifier.md similarity index 100% rename from docs/docs/reference/soft-modifier.md rename to docs/_docs/reference/soft-modifier.md diff --git a/docs/docs/reference/syntax.md b/docs/_docs/reference/syntax.md similarity index 100% rename from docs/docs/reference/syntax.md rename to docs/_docs/reference/syntax.md diff --git a/docs/docs/release-notes/0.1.2.md b/docs/_docs/release-notes/0.1.2.md similarity index 100% rename from docs/docs/release-notes/0.1.2.md rename to docs/_docs/release-notes/0.1.2.md diff --git a/docs/docs/release-notes/syntax-changes-0.22.md b/docs/_docs/release-notes/syntax-changes-0.22.md similarity index 100% rename from docs/docs/release-notes/syntax-changes-0.22.md rename to docs/_docs/release-notes/syntax-changes-0.22.md diff --git a/docs/docs/usage/cbt-projects.md b/docs/_docs/usage/cbt-projects.md similarity index 100% rename from docs/docs/usage/cbt-projects.md rename to docs/_docs/usage/cbt-projects.md diff --git a/docs/docs/usage/dottydoc.md b/docs/_docs/usage/dottydoc.md similarity index 100% rename from docs/docs/usage/dottydoc.md rename to docs/_docs/usage/dottydoc.md diff --git a/docs/docs/usage/ide-support.md b/docs/_docs/usage/ide-support.md similarity index 100% rename from docs/docs/usage/ide-support.md rename to docs/_docs/usage/ide-support.md diff --git a/docs/docs/usage/sbt-projects.md b/docs/_docs/usage/sbt-projects.md similarity index 100% rename from docs/docs/usage/sbt-projects.md rename to docs/_docs/usage/sbt-projects.md diff --git a/docs/docs/usage/scaladoc/blog.md b/docs/_docs/usage/scaladoc/blog.md similarity index 100% rename from docs/docs/usage/scaladoc/blog.md rename to docs/_docs/usage/scaladoc/blog.md diff --git a/docs/docs/usage/scaladoc/docstrings.md b/docs/_docs/usage/scaladoc/docstrings.md similarity index 100% rename from docs/docs/usage/scaladoc/docstrings.md rename to docs/_docs/usage/scaladoc/docstrings.md diff --git a/docs/docs/usage/scaladoc/index.md b/docs/_docs/usage/scaladoc/index.md similarity index 100% rename from docs/docs/usage/scaladoc/index.md rename to docs/_docs/usage/scaladoc/index.md diff --git a/docs/docs/usage/scaladoc/linking.md b/docs/_docs/usage/scaladoc/linking.md similarity index 100% rename from docs/docs/usage/scaladoc/linking.md rename to docs/_docs/usage/scaladoc/linking.md diff --git a/docs/docs/usage/scaladoc/search-engine.md b/docs/_docs/usage/scaladoc/search-engine.md similarity index 100% rename from docs/docs/usage/scaladoc/search-engine.md rename to docs/_docs/usage/scaladoc/search-engine.md diff --git a/docs/docs/usage/scaladoc/settings.md b/docs/_docs/usage/scaladoc/settings.md similarity index 100% rename from docs/docs/usage/scaladoc/settings.md rename to docs/_docs/usage/scaladoc/settings.md diff --git a/docs/docs/usage/scaladoc/site-versioning.md b/docs/_docs/usage/scaladoc/site-versioning.md similarity index 100% rename from docs/docs/usage/scaladoc/site-versioning.md rename to docs/_docs/usage/scaladoc/site-versioning.md diff --git a/docs/docs/usage/scaladoc/static-site.md b/docs/_docs/usage/scaladoc/static-site.md similarity index 100% rename from docs/docs/usage/scaladoc/static-site.md rename to docs/_docs/usage/scaladoc/static-site.md diff --git a/docs/docs/usage/version-numbers.md b/docs/_docs/usage/version-numbers.md similarity index 100% rename from docs/docs/usage/version-numbers.md rename to docs/_docs/usage/version-numbers.md diff --git a/docs/docs/usage/worksheet-mode-implementation-details.md b/docs/_docs/usage/worksheet-mode-implementation-details.md similarity index 100% rename from docs/docs/usage/worksheet-mode-implementation-details.md rename to docs/_docs/usage/worksheet-mode-implementation-details.md diff --git a/docs/index.html b/docs/index.html deleted file mode 100644 index 3c60f2d3fc8b..000000000000 --- a/docs/index.html +++ /dev/null @@ -1,109 +0,0 @@ ---- -title: Scala 3 -layout: main -hasFrame: false -extraCSS: - - css/frontpage.css ---- - -
-
- -
-
-
- logo -
-

Scala 3

-

A next-generation compiler for Scala

-

(scroll down for more info)

-
-
-
-
-
-
- -

Try Scala 3

-

There are multiple ways of getting started with Scala 3.

-
    -
  1. You can try Scala 3 in your browser with Scastie.
    2. -
  2. If you already have sbt installed, you can create a Scala 3 project and sbt will take care of the rest.
    3. -
  3. You can install all necessary dependencies with coursier by running cs setup. You can also run cs install scala3-compiler or cs install scala3-repl to install command-line commands for the compiler and repl, correspondingly.
    4. -
  4. You can manually install Scala 3 on your computer.
    5. -
- -

Install Scala 3

-

If you are a Mac user, you can install Scala 3 with brew:

- 
brew install lampepfl/brew/dotty
- -

- If you are a Linux or Windows user, as a prerequisite you need a JDK 8 or later properly installed on your system. The environment variable JAVA_HOME should point to your Java installation.
- For Windows users, we recommend using the Windows subsystem for linux or some other bash shell like git bash.
- Then download the latest release. Optionally add the path of the folder bin/ to the system environment variable PATH. -

- -

Now you can compile Scala source code:

- 
scalac hello.scala
- -

To start the REPL, run: scala.

- -

Create a Scala 3 Project

-

The fastest way to create a new project in Scala 3 is using sbt (1.1.4+).

- -

Create a Scala 3 project:

- 
sbt new scala/scala3.g8
- -

Or a Scala 3 project that cross compiles with Scala 2:

- 
sbt new lampepfl/dotty-cross.g8
- -

For documentation see the Scala 3 Example Project.

- -

Learn more about Scala 3

-

You can find much more information about Scala 3 in ...

- -
-
diff --git a/docs/sidebar.yml b/docs/sidebar.yml index 10b4bd5c34e1..e4e7b814c3ab 100644 --- a/docs/sidebar.yml +++ b/docs/sidebar.yml @@ -1,185 +1,187 @@ -rootIndex: docs/index.md +rootIndex: index.md pages: # - title: Blog - title: Usage subsection: - - page: docs/usage/sbt-projects.md - - page: docs/usage/ide-support.md - - page: docs/usage/cbt-projects.md + - page: usage/sbt-projects.md + - page: usage/ide-support.md + - page: usage/cbt-projects.md - title: Scaladoc - index: docs/usage/scaladoc/index.md + index: usage/scaladoc/index.md subsection: - - page: docs/usage/scaladoc/docstrings.md - - page: docs/usage/scaladoc/linking.md - - page: docs/usage/scaladoc/search-engine.md - - page: docs/usage/scaladoc/settings.md - - page: docs/usage/scaladoc/site-versioning.md - - page: docs/usage/scaladoc/static-site.md + - page: usage/scaladoc/docstrings.md + - page: usage/scaladoc/linking.md + - page: usage/scaladoc/search-engine.md + - page: usage/scaladoc/settings.md + - page: usage/scaladoc/site-versioning.md + - page: usage/scaladoc/static-site.md - title: Reference subsection: - - page: docs/reference/overview.md + - page: reference/overview.md - title: New Types - index: docs/reference/new-types/new-types.md + index: reference/new-types/new-types.md subsection: - - page: docs/reference/new-types/intersection-types.md - - page: docs/reference/new-types/intersection-types-spec.md - - page: docs/reference/new-types/union-types.md - - page: docs/reference/new-types/union-types-spec.md - - page: docs/reference/new-types/type-lambdas.md - - page: docs/reference/new-types/type-lambdas-spec.md - - page: docs/reference/new-types/match-types.md - - page: docs/reference/new-types/dependent-function-types.md - - page: docs/reference/new-types/dependent-function-types-spec.md - - page: docs/reference/new-types/polymorphic-function-types.md + - page: reference/new-types/intersection-types.md + - page: reference/new-types/intersection-types-spec.md + - page: reference/new-types/union-types.md + - page: reference/new-types/union-types-spec.md + - page: reference/new-types/type-lambdas.md + - page: reference/new-types/type-lambdas-spec.md + - page: reference/new-types/match-types.md + - page: reference/new-types/dependent-function-types.md + - page: reference/new-types/dependent-function-types-spec.md + - page: reference/new-types/polymorphic-function-types.md - title: Enums - index: docs/reference/enums/enums-index.md + index: reference/enums/enums-index.md subsection: - - page: docs/reference/enums/enums.md - - page: docs/reference/enums/adts.md - - page: docs/reference/enums/desugarEnums.md + - page: reference/enums/enums.md + - page: reference/enums/adts.md + - page: reference/enums/desugarEnums.md - title: Contextual Abstractions - index: docs/reference/contextual/contextual.md + index: reference/contextual/contextual.md directory: contextual subsection: - - page: docs/reference/contextual/givens.md - - page: docs/reference/contextual/using-clauses.md - - page: docs/reference/contextual/context-bounds.md - - page: docs/reference/contextual/given-imports.md - - page: docs/reference/contextual/extension-methods.md - - page: docs/reference/contextual/right-associative-extension-methods.md - - page: docs/reference/contextual/type-classes.md - - page: docs/reference/contextual/derivation.md - - page: docs/reference/contextual/derivation-macro.md - - page: docs/reference/contextual/multiversal-equality.md - - page: docs/reference/contextual/context-functions.md - - page: docs/reference/contextual/context-functions-spec.md - - page: docs/reference/contextual/conversions.md - - page: docs/reference/contextual/by-name-context-parameters.md - - page: docs/reference/contextual/relationship-implicits.md + - page: reference/contextual/givens.md + - page: reference/contextual/using-clauses.md + - page: reference/contextual/context-bounds.md + - page: reference/contextual/given-imports.md + - page: reference/contextual/extension-methods.md + - page: reference/contextual/right-associative-extension-methods.md + - page: reference/contextual/type-classes.md + - page: reference/contextual/derivation.md + - page: reference/contextual/derivation-macro.md + - page: reference/contextual/multiversal-equality.md + - page: reference/contextual/context-functions.md + - page: reference/contextual/context-functions-spec.md + - page: reference/contextual/conversions.md + - page: reference/contextual/by-name-context-parameters.md + - page: reference/contextual/relationship-implicits.md - title: Metaprogramming - index: docs/reference/metaprogramming/metaprogramming.md + index: reference/metaprogramming/metaprogramming.md subsection: - - page: docs/reference/metaprogramming/inline.md - - page: docs/reference/metaprogramming/compiletime-ops.md - - page: docs/reference/metaprogramming/macros.md - - page: docs/reference/metaprogramming/macros-spec.md - - page: docs/reference/metaprogramming/staging.md - - page: docs/reference/metaprogramming/reflection.md - - page: docs/reference/metaprogramming/tasty-inspect.md + - page: reference/metaprogramming/inline.md + - page: reference/metaprogramming/compiletime-ops.md + - page: reference/metaprogramming/macros.md + - page: reference/metaprogramming/macros-spec.md + - page: reference/metaprogramming/staging.md + - page: reference/metaprogramming/reflection.md + - page: reference/metaprogramming/tasty-inspect.md - title: Other New Features - index: docs/reference/other-new-features/other-new-types.md + index: reference/other-new-features/other-new-types.md subsection: - - page: docs/reference/other-new-features/trait-parameters.md - - page: docs/reference/other-new-features/transparent-traits.md - - page: docs/reference/other-new-features/creator-applications.md - - page: docs/reference/other-new-features/export.md - - page: docs/reference/other-new-features/opaques.md - - page: docs/reference/other-new-features/opaques-details.md - - page: docs/reference/other-new-features/open-classes.md - - page: docs/reference/other-new-features/parameter-untupling.md - - page: docs/reference/other-new-features/parameter-untupling-spec.md - - page: docs/reference/other-new-features/kind-polymorphism.md - - page: docs/reference/other-new-features/matchable.md - - page: docs/reference/other-new-features/threadUnsafe-annotation.md - - page: docs/reference/other-new-features/targetName.md - - page: docs/reference/other-new-features/control-syntax.md - - page: docs/reference/other-new-features/indentation.md - - page: docs/reference/other-new-features/safe-initialization.md - - page: docs/reference/other-new-features/type-test.md - - page: docs/reference/other-new-features/experimental-defs.md + - page: reference/other-new-features/trait-parameters.md + - page: reference/other-new-features/transparent-traits.md + - page: reference/other-new-features/creator-applications.md + - page: reference/other-new-features/export.md + - page: reference/other-new-features/opaques.md + - page: reference/other-new-features/opaques-details.md + - page: reference/other-new-features/open-classes.md + - page: reference/other-new-features/parameter-untupling.md + - page: reference/other-new-features/parameter-untupling-spec.md + - page: reference/other-new-features/kind-polymorphism.md + - page: reference/other-new-features/matchable.md + - page: reference/other-new-features/threadUnsafe-annotation.md + - page: reference/other-new-features/targetName.md + - page: reference/other-new-features/control-syntax.md + - page: reference/other-new-features/indentation.md + - page: reference/other-new-features/safe-initialization.md + - page: reference/other-new-features/type-test.md + - page: reference/other-new-features/experimental-defs.md - title: Other Changed Features directory: changed-features - index: docs/reference/changed-features/changed-features.md + index: reference/changed-features/changed-features.md subsection: - - page: docs/reference/changed-features/numeric-literals.md - - page: docs/reference/changed-features/structural-types.md - - page: docs/reference/changed-features/structural-types-spec.md - - page: docs/reference/changed-features/operators.md - - page: docs/reference/changed-features/wildcards.md - - page: docs/reference/changed-features/imports.md - - page: docs/reference/changed-features/type-checking.md - - page: docs/reference/changed-features/type-inference.md - - page: docs/reference/changed-features/implicit-resolution.md - - page: docs/reference/changed-features/implicit-conversions.md - - page: docs/reference/changed-features/implicit-conversions-spec.md - - page: docs/reference/changed-features/overload-resolution.md - - page: docs/reference/changed-features/match-syntax.md - - page: docs/reference/changed-features/vararg-splices.md - - page: docs/reference/changed-features/pattern-bindings.md - - page: docs/reference/changed-features/pattern-matching.md - - page: docs/reference/changed-features/eta-expansion.md - - page: docs/reference/changed-features/eta-expansion-spec.md - - page: docs/reference/changed-features/compiler-plugins.md - - page: docs/reference/changed-features/lazy-vals-init.md - - page: docs/reference/changed-features/main-functions.md + - page: reference/changed-features/numeric-literals.md + - page: reference/changed-features/structural-types.md + - page: reference/changed-features/structural-types-spec.md + - page: reference/changed-features/operators.md + - page: reference/changed-features/wildcards.md + - page: reference/changed-features/imports.md + - page: reference/changed-features/type-checking.md + - page: reference/changed-features/type-inference.md + - page: reference/changed-features/implicit-resolution.md + - page: reference/changed-features/implicit-conversions.md + - page: reference/changed-features/implicit-conversions-spec.md + - page: reference/changed-features/overload-resolution.md + - page: reference/changed-features/match-syntax.md + - page: reference/changed-features/vararg-splices.md + - page: reference/changed-features/pattern-bindings.md + - page: reference/changed-features/pattern-matching.md + - page: reference/changed-features/eta-expansion.md + - page: reference/changed-features/eta-expansion-spec.md + - page: reference/changed-features/compiler-plugins.md + - page: reference/changed-features/lazy-vals-init.md + - page: reference/changed-features/main-functions.md - title: Dropped Features - index: docs/reference/dropped-features/dropped-features.md + index: reference/dropped-features/dropped-features.md subsection: - - page: docs/reference/dropped-features/delayed-init.md - - page: docs/reference/dropped-features/macros.md - - page: docs/reference/dropped-features/existential-types.md - - page: docs/reference/dropped-features/type-projection.md - - page: docs/reference/dropped-features/do-while.md - - page: docs/reference/dropped-features/procedure-syntax.md - - page: docs/reference/dropped-features/package-objects.md - - page: docs/reference/dropped-features/early-initializers.md - - page: docs/reference/dropped-features/class-shadowing.md - - page: docs/reference/dropped-features/class-shadowing-spec.md - - page: docs/reference/dropped-features/limit22.md - - page: docs/reference/dropped-features/xml.md - - page: docs/reference/dropped-features/symlits.md - - page: docs/reference/dropped-features/auto-apply.md - - page: docs/reference/dropped-features/weak-conformance.md - - page: docs/reference/dropped-features/weak-conformance-spec.md - - page: docs/reference/dropped-features/nonlocal-returns.md - - page: docs/reference/dropped-features/this-qualifier.md - - page: docs/reference/dropped-features/wildcard-init.md + - page: reference/dropped-features/delayed-init.md + - page: reference/dropped-features/macros.md + - page: reference/dropped-features/existential-types.md + - page: reference/dropped-features/type-projection.md + - page: reference/dropped-features/do-while.md + - page: reference/dropped-features/procedure-syntax.md + - page: reference/dropped-features/package-objects.md + - page: reference/dropped-features/early-initializers.md + - page: reference/dropped-features/class-shadowing.md + - page: reference/dropped-features/class-shadowing-spec.md + - page: reference/dropped-features/limit22.md + - page: reference/dropped-features/xml.md + - page: reference/dropped-features/symlits.md + - page: reference/dropped-features/auto-apply.md + - page: reference/dropped-features/weak-conformance.md + - page: reference/dropped-features/weak-conformance-spec.md + - page: reference/dropped-features/nonlocal-returns.md + - page: reference/dropped-features/this-qualifier.md + - page: reference/dropped-features/wildcard-init.md - title: Experimental Features directory: experimental subsection: - - page: docs/reference/experimental/overview.md - - page: docs/reference/experimental/canthrow.md - - page: docs/reference/experimental/erased-defs.md - - page: docs/reference/experimental/named-typeargs.md - - page: docs/reference/experimental/numeric-literals.md - - page: docs/reference/experimental/explicit-nulls.md - - page: docs/reference/experimental/cc.md - - page: docs/reference/syntax.md + - page: reference/experimental/overview.md + - page: reference/experimental/canthrow.md + - page: reference/experimental/erased-defs.md + - page: reference/experimental/erased-defs-spec.md + - page: reference/experimental/named-typeargs.md + - page: reference/experimental/named-typeargs-spec.md + - page: reference/experimental/numeric-literals.md + - page: reference/experimental/explicit-nulls.md + - page: reference/experimental/cc.md + - page: reference/syntax.md - title: Language Versions - index: docs/reference/language-versions/language-versions.md + index: reference/language-versions/language-versions.md subsection: - - page: docs/reference/language-versions/source-compatibility.md - - page: docs/reference/language-versions/binary-compatibility.md - - page: docs/reference/soft-modifier.md - - page: docs/reference/features-classification.md + - page: reference/language-versions/source-compatibility.md + - page: reference/language-versions/binary-compatibility.md + - page: reference/soft-modifier.md + - page: reference/features-classification.md - title: Contributing subsection: - - page: docs/contributing/contribute-knowledge.md - - page: docs/contributing/getting-started.md - - page: docs/contributing/workflow.md - - page: docs/contributing/testing.md - - page: docs/contributing/debugging.md + - page: contributing/contribute-knowledge.md + - page: contributing/getting-started.md + - page: contributing/workflow.md + - page: contributing/testing.md + - page: contributing/debugging.md - title: IDEs and Tools directory: tools subsection: - - page: docs/contributing/tools/ide.md - - page: docs/contributing/tools/mill.md - - page: docs/contributing/tools/scalafix.md + - page: contributing/tools/ide.md + - page: contributing/tools/mill.md + - page: contributing/tools/scalafix.md - title: Procedures subsection: - - page: docs/contributing/procedures/release.md - - page: docs/contributing/procedures/vulpix.md + - page: contributing/procedures/release.md + - page: contributing/procedures/vulpix.md - title: Internals subsection: - - page: docs/internals/backend.md - - page: docs/internals/classpaths.md - - page: docs/internals/core-data-structures.md - - page: docs/internals/contexts.md - - page: docs/internals/dotc-scalac.md - - page: docs/internals/higher-kinded-v2.md - - page: docs/internals/overall-structure.md - - page: docs/internals/periods.md - - page: docs/internals/syntax.md - - page: docs/internals/type-system.md - - page: docs/internals/dotty-internals-1-notes.md - - page: docs/internals/debug-macros.md + - page: internals/backend.md + - page: internals/classpaths.md + - page: internals/core-data-structures.md + - page: internals/contexts.md + - page: internals/dotc-scalac.md + - page: internals/higher-kinded-v2.md + - page: internals/overall-structure.md + - page: internals/periods.md + - page: internals/syntax.md + - page: internals/type-system.md + - page: internals/dotty-internals-1-notes.md + - page: internals/debug-macros.md diff --git a/project/Build.scala b/project/Build.scala index e91849fdd1d3..21321e60d6d7 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -326,7 +326,7 @@ object Build { Seq( "-skip-by-regex:.+\\.internal($|\\..+)", "-skip-by-regex:.+\\.impl($|\\..+)", - "-project-logo", "docs/logo.svg", + "-project-logo", "docs/_assets/images/logo.svg", "-social-links:" + "github::https://github.com/lampepfl/dotty," + "discord::https://discord.com/invite/scala," + diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index ce8d310fb248..ff25bc6a3940 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -29,7 +29,7 @@ dist/target/pack/bin/scaladoc \ "-external-mappings:.*scala/.*::scaladoc3::https://dotty.epfl.ch/api/,.*java/.*::javadoc::https://docs.oracle.com/javase/8/docs/api/" \ "-skip-by-regex:.+\.internal($|\..+)" \ "-skip-by-regex:.+\.impl($|\..+)" \ - -project-logo docs/logo.svg \ + -project-logo docs/_assets/images/logo.svg \ -social-links:github::https://github.com/lampepfl/dotty,discord::https://discord.com/invite/scala,twitter::https://twitter.com/scala_lang \ -Ygenerate-inkuire \ "-skip-by-id:scala.runtime.stdLibPatches" \ diff --git a/scaladoc-testcases/src/docs/tests/Adoc.scala b/scaladoc-testcases/src/_docs/tests/Adoc.scala similarity index 59% rename from scaladoc-testcases/src/docs/tests/Adoc.scala rename to scaladoc-testcases/src/_docs/tests/Adoc.scala index af93f9eddfa0..04b2c3918023 100644 --- a/scaladoc-testcases/src/docs/tests/Adoc.scala +++ b/scaladoc-testcases/src/_docs/tests/Adoc.scala @@ -1,4 +1,4 @@ -package docs.tests +package _docs.tests class Adoc: def foo = 123 diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala index b743163eaaf7..3c35c761caf2 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala @@ -31,32 +31,23 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do val renderedResources = renderResources() super.render() - private def specificResources(page: Page): Set[String] = - page.children.toSet.flatMap(specificResources) ++ (page.content match - case r: ResolvedTemplate => - r.resolved.resources.toSet - case _ => Set.empty - ) - private def renderResources(): Seq[String] = - def siteRoot = staticSite.get.root.toPath - def pathToResource(p: String) = Resource.File(p, siteRoot.resolve(p)) - - def harvestResources(path: String) = - val siteImgPath = siteRoot.resolve(path) - if !Files.exists(siteImgPath) then Nil - else - val allPaths = Files.walk(siteImgPath, FileVisitOption.FOLLOW_LINKS) - val files = allPaths.filter(Files.isRegularFile(_)).iterator().asScala - files.map(p => siteRoot.relativize(p).toString).toList - - val staticResources = staticSite.toSeq.flatMap { _ => - harvestResources("images") ++ harvestResources("resources") - } - - val siteResourcesPaths = allPages.toSet.flatMap(specificResources) ++ staticResources - - val resources = siteResourcesPaths.toSeq.map(pathToResource) ++ allResources(allPages) ++ onlyRenderedResources + import scala.util.Using + import scala.jdk.CollectionConverters._ + // All static site resources need to be in _assets folder + val staticSiteResources = staticSite + .map(_.root.toPath.resolve("_assets").toFile) + .filter(f => f.exists && f.isDirectory) + .toSeq + .flatMap { resourceFile => + resourceFile.listFiles.toSeq.map(_.toPath).flatMap { file => + Using(Files.walk(file)) { stream => + stream.iterator().asScala.toSeq + .map(from => Resource.File(resourceFile.toPath.relativize(from).toString, from)) + }.get + } + } + val resources = staticSiteResources ++ allResources(allPages) ++ onlyRenderedResources resources.flatMap(renderResource) def mkHead(page: Page): AppliedTag = diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala index ffdd864942e9..ef83b4f92196 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala @@ -99,7 +99,7 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot val all = navigablePage +: redirectPages // We need to check for conflicts only if we have top-level member called docs val hasPotentialConflict = - rootPackage.members.exists(m => m.name.startsWith("docs")) + rootPackage.members.exists(m => m.name.startsWith("_docs")) if hasPotentialConflict then def walk(page: Page): Unit = diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala index 566ccd81ab62..dbecef3ede21 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala @@ -37,18 +37,28 @@ trait SiteRenderer(using DocContext) extends Locations: res.headOption.map(pathToPage(pageDri, _) + prefix) def processLocalLink(str: String): String = - Try(URL(str)).map(_ => str).toOption.orElse { - tryAsDri(str) - }.orElse { - Option.when( - Files.exists(Paths.get(content.ctx.root.toPath.toAbsolutePath.toString, str)) - )( - resolveLink(pageDri, str.stripPrefix("/")) - ) - }.getOrElse { - report.warn(s"Unable to resolve link '$str'", content.template.file) - str - } + val staticSiteRootPath = content.ctx.root.toPath.toAbsolutePath + def asValidURL: Option[String] = Try(URL(str)).toOption.map(_ => str) + def asAsset: Option[String] = Option.when( + Files.exists(staticSiteRootPath.resolve("_assets").resolve(str.stripPrefix("/"))) + )( + resolveLink(pageDri, str.stripPrefix("/")) + ) + def asStaticSite: Option[String] = tryAsDri(str) + + /* Link resolving checks performs multiple strategies with following priority: + 1. We check if the link is a valid URL e.g. http://dotty.epfl.ch + 2. We check if the link leads to other static site + 3. We check if the link leads to existing asset e.g. images/logo.svg -> /_assets/images/logo.svg + */ + + asValidURL + .orElse(asStaticSite) + .orElse(asAsset) + .getOrElse { + report.warn(s"Unable to resolve link '$str'", content.template.file) + str + } def processLocalLinkWithGuard(str: String): String = if str.startsWith("#") || str.isEmpty then diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala index 21c600fe282b..344cf13429c9 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala @@ -20,7 +20,7 @@ class StaticSiteContext( var memberLinkResolver: String => Option[DRI] = _ => None - val docsPath = root.toPath.resolve("docs") + val docsPath = root.toPath.resolve("_docs") val relativizeFrom = if args.apiSubdirectory then docsPath else root.toPath @@ -56,11 +56,6 @@ class StaticSiteContext( } def driForLink(loadedTemplateFile: File, link: String): Seq[DRI] = - // If link doesn't exists in destination and source files and doesn't end with site extension, fallback to asset - def possibleAsset(p: Path): Option[Path] = Option(p) - .filterNot(p => siteExtensions.exists(ext => p.getFileName.toString.endsWith(ext))) - .filter(_.toFile.exists) - def possibleLinks(link: String): Seq[Path] = // Destination file of template val templateDestLocation = loadedTemplateFile.toPath @@ -87,7 +82,6 @@ class StaticSiteContext( val links = baseFiles.flatMap(p => Option.when(staticSiteRoot.sources.contains(p))(p).map(p => staticSiteRoot.siteMappings(p)) .orElse(Option.when(staticSiteRoot.dests.contains(p))(p)) - // .orElse(possibleAsset(p)) ) links match { diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala index bc2155a1428a..0b2e32198156 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala @@ -13,8 +13,6 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite "sidebar.yml" ) - val docsDir = root.toPath.resolve("docs") - def load(): StaticSiteRoot = { // Check whether there's YAML file defining static site structure possibleYamlFiles @@ -27,7 +25,7 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite } def loadBasedOnYaml(yamlRoot: Sidebar.Root): StaticSiteRoot = { - val rootDest = docsDir.resolve("index.html").toFile + val rootDest = ctx.docsPath.resolve("index.html").toFile val rootIndex = yamlRoot.index .map(Paths.get(root.getPath, _).toFile) .filter(_.exists) @@ -63,6 +61,8 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite filesInDirectory.fold(List.empty) { files => val mappingFunc: File => File = file => { val relativeFile = root.toPath.resolve(indexPathDirectory).relativize(file.toPath) + println(file.toPath) + println(categoryPath.resolve(relativeFile)) categoryPath.resolve(relativeFile).toFile } files.toList @@ -85,15 +85,15 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite // Cannot happen ??? } - val rootTemplate = LoadedTemplate(rootIndex, yamlRoot.pages.map(c => loadChild(root.toPath.resolve("docs"))(c)), rootDest) + val rootTemplate = LoadedTemplate(rootIndex, yamlRoot.pages.map(c => loadChild(ctx.docsPath)(c)), rootDest) val mappings = createMapping(rootTemplate) StaticSiteRoot(rootTemplate, mappings) } def loadBasedOnFileSystem(): StaticSiteRoot = { val rootTemplate = - loadRecursively(docsDir.toFile).getOrElse( - LoadedTemplate(emptyTemplate(docsDir.resolve("index.html").toFile, "index"), List.empty, docsDir.resolve("index.html").toFile) + loadRecursively(ctx.docsPath.toFile).getOrElse( + LoadedTemplate(emptyTemplate(ctx.docsPath.resolve("index.html").toFile, "index"), List.empty, ctx.docsPath.resolve("index.html").toFile) ) if rootTemplate.templateFile.title.name != "index" then { @@ -145,7 +145,7 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite private def relativizeIfNeeded(link: String): Path = val path = Paths.get(link) - if !path.isAbsolute then root.toPath.resolve(link) + if !path.isAbsolute then ctx.docsPath.resolve(link) else path extension (p: Path) diff --git a/scaladoc/test-documentations/basic/images/basic.svg b/scaladoc/test-documentations/basic/_assets/images/basic.svg similarity index 100% rename from scaladoc/test-documentations/basic/images/basic.svg rename to scaladoc/test-documentations/basic/_assets/images/basic.svg diff --git a/scaladoc/test-documentations/basic/docs/Adoc.md b/scaladoc/test-documentations/basic/_docs/Adoc.md similarity index 100% rename from scaladoc/test-documentations/basic/docs/Adoc.md rename to scaladoc/test-documentations/basic/_docs/Adoc.md diff --git a/scaladoc/test-documentations/basic/docs/dir/index.md b/scaladoc/test-documentations/basic/_docs/dir/index.md similarity index 100% rename from scaladoc/test-documentations/basic/docs/dir/index.md rename to scaladoc/test-documentations/basic/_docs/dir/index.md diff --git a/scaladoc/test-documentations/basic/docs/dir/nested.md b/scaladoc/test-documentations/basic/_docs/dir/nested.md similarity index 100% rename from scaladoc/test-documentations/basic/docs/dir/nested.md rename to scaladoc/test-documentations/basic/_docs/dir/nested.md diff --git a/scaladoc/test-documentations/basic/docs/index.md b/scaladoc/test-documentations/basic/_docs/index.md similarity index 100% rename from scaladoc/test-documentations/basic/docs/index.md rename to scaladoc/test-documentations/basic/_docs/index.md diff --git a/scaladoc/test-documentations/conflicts-pages/docs/tests/Adoc.md b/scaladoc/test-documentations/conflicts-pages/_docs/tests/Adoc.md similarity index 100% rename from scaladoc/test-documentations/conflicts-pages/docs/tests/Adoc.md rename to scaladoc/test-documentations/conflicts-pages/_docs/tests/Adoc.md diff --git a/scaladoc/test-documentations/conflicts-resources/resources/tests/Adoc.html b/scaladoc/test-documentations/conflicts-resources/_assets/resources/tests/Adoc.html similarity index 100% rename from scaladoc/test-documentations/conflicts-resources/resources/tests/Adoc.html rename to scaladoc/test-documentations/conflicts-resources/_assets/resources/tests/Adoc.html diff --git a/scaladoc/test-documentations/noDocsIndex/images/basic.svg b/scaladoc/test-documentations/noDocsIndex/_assets/images/basic.svg similarity index 100% rename from scaladoc/test-documentations/noDocsIndex/images/basic.svg rename to scaladoc/test-documentations/noDocsIndex/_assets/images/basic.svg diff --git a/scaladoc/test-documentations/noDocsIndex/docs/Adoc.md b/scaladoc/test-documentations/noDocsIndex/_docs/Adoc.md similarity index 100% rename from scaladoc/test-documentations/noDocsIndex/docs/Adoc.md rename to scaladoc/test-documentations/noDocsIndex/_docs/Adoc.md diff --git a/scaladoc/test-documentations/noDocsIndex/docs/dir/index.md b/scaladoc/test-documentations/noDocsIndex/_docs/dir/index.md similarity index 100% rename from scaladoc/test-documentations/noDocsIndex/docs/dir/index.md rename to scaladoc/test-documentations/noDocsIndex/_docs/dir/index.md diff --git a/scaladoc/test-documentations/noDocsIndex/docs/dir/nested.md b/scaladoc/test-documentations/noDocsIndex/_docs/dir/nested.md similarity index 100% rename from scaladoc/test-documentations/noDocsIndex/docs/dir/nested.md rename to scaladoc/test-documentations/noDocsIndex/_docs/dir/nested.md diff --git a/scaladoc/test-documentations/noDocsIndex/docs/index.md b/scaladoc/test-documentations/noDocsIndex/_docs/index.md similarity index 100% rename from scaladoc/test-documentations/noDocsIndex/docs/index.md rename to scaladoc/test-documentations/noDocsIndex/_docs/index.md diff --git a/scaladoc/test-documentations/noDocsIndex/index.md b/scaladoc/test-documentations/noDocsIndex/index.md deleted file mode 100644 index 2205e0c12d3e..000000000000 --- a/scaladoc/test-documentations/noDocsIndex/index.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: Basic test ---- -# Header - -[Link to docs](docs/index.html) - -And a text! \ No newline at end of file diff --git a/scaladoc/test-documentations/noGlobalIndex/images/basic.svg b/scaladoc/test-documentations/noGlobalIndex/_assets/images/basic.svg similarity index 100% rename from scaladoc/test-documentations/noGlobalIndex/images/basic.svg rename to scaladoc/test-documentations/noGlobalIndex/_assets/images/basic.svg diff --git a/scaladoc/test-documentations/noGlobalIndex/docs/Adoc.md b/scaladoc/test-documentations/noGlobalIndex/_docs/Adoc.md similarity index 100% rename from scaladoc/test-documentations/noGlobalIndex/docs/Adoc.md rename to scaladoc/test-documentations/noGlobalIndex/_docs/Adoc.md diff --git a/scaladoc/test-documentations/noGlobalIndex/docs/dir/index.md b/scaladoc/test-documentations/noGlobalIndex/_docs/dir/index.md similarity index 100% rename from scaladoc/test-documentations/noGlobalIndex/docs/dir/index.md rename to scaladoc/test-documentations/noGlobalIndex/_docs/dir/index.md diff --git a/scaladoc/test-documentations/noGlobalIndex/docs/dir/nested.md b/scaladoc/test-documentations/noGlobalIndex/_docs/dir/nested.md similarity index 100% rename from scaladoc/test-documentations/noGlobalIndex/docs/dir/nested.md rename to scaladoc/test-documentations/noGlobalIndex/_docs/dir/nested.md diff --git a/scaladoc/test-documentations/noGlobalIndex/docs/index.md b/scaladoc/test-documentations/noGlobalIndex/_docs/index.md similarity index 100% rename from scaladoc/test-documentations/noGlobalIndex/docs/index.md rename to scaladoc/test-documentations/noGlobalIndex/_docs/index.md diff --git a/scaladoc/test-documentations/noIndexes/images/basic.svg b/scaladoc/test-documentations/noIndexes/_assets/images/basic.svg similarity index 100% rename from scaladoc/test-documentations/noIndexes/images/basic.svg rename to scaladoc/test-documentations/noIndexes/_assets/images/basic.svg diff --git a/scaladoc/test-documentations/noIndexes/docs/Adoc.md b/scaladoc/test-documentations/noIndexes/_docs/Adoc.md similarity index 100% rename from scaladoc/test-documentations/noIndexes/docs/Adoc.md rename to scaladoc/test-documentations/noIndexes/_docs/Adoc.md diff --git a/scaladoc/test-documentations/noIndexes/docs/dir/index.md b/scaladoc/test-documentations/noIndexes/_docs/dir/index.md similarity index 100% rename from scaladoc/test-documentations/noIndexes/docs/dir/index.md rename to scaladoc/test-documentations/noIndexes/_docs/dir/index.md diff --git a/scaladoc/test-documentations/noIndexes/docs/dir/nested.md b/scaladoc/test-documentations/noIndexes/_docs/dir/nested.md similarity index 100% rename from scaladoc/test-documentations/noIndexes/docs/dir/nested.md rename to scaladoc/test-documentations/noIndexes/_docs/dir/nested.md diff --git a/scaladoc/test-documentations/static-links/images/basic.svg b/scaladoc/test-documentations/static-links/_assets/images/basic.svg similarity index 100% rename from scaladoc/test-documentations/static-links/images/basic.svg rename to scaladoc/test-documentations/static-links/_assets/images/basic.svg diff --git a/scaladoc/test-documentations/static-links/docs/Adoc.md b/scaladoc/test-documentations/static-links/_docs/Adoc.md similarity index 100% rename from scaladoc/test-documentations/static-links/docs/Adoc.md rename to scaladoc/test-documentations/static-links/_docs/Adoc.md diff --git a/scaladoc/test-documentations/static-links/docs/dir/html.md b/scaladoc/test-documentations/static-links/_docs/dir/html.md similarity index 100% rename from scaladoc/test-documentations/static-links/docs/dir/html.md rename to scaladoc/test-documentations/static-links/_docs/dir/html.md diff --git a/scaladoc/test-documentations/static-links/docs/dir/index.md b/scaladoc/test-documentations/static-links/_docs/dir/index.md similarity index 100% rename from scaladoc/test-documentations/static-links/docs/dir/index.md rename to scaladoc/test-documentations/static-links/_docs/dir/index.md diff --git a/scaladoc/test-documentations/static-links/docs/dir/name...with..dots..md b/scaladoc/test-documentations/static-links/_docs/dir/name...with..dots..md similarity index 100% rename from scaladoc/test-documentations/static-links/docs/dir/name...with..dots..md rename to scaladoc/test-documentations/static-links/_docs/dir/name...with..dots..md diff --git a/scaladoc/test-documentations/static-links/docs/dir/name.with.md.and.html.md b/scaladoc/test-documentations/static-links/_docs/dir/name.with.md.and.html.md similarity index 100% rename from scaladoc/test-documentations/static-links/docs/dir/name.with.md.and.html.md rename to scaladoc/test-documentations/static-links/_docs/dir/name.with.md.and.html.md diff --git a/scaladoc/test-documentations/static-links/docs/dir/nested.md b/scaladoc/test-documentations/static-links/_docs/dir/nested.md similarity index 100% rename from scaladoc/test-documentations/static-links/docs/dir/nested.md rename to scaladoc/test-documentations/static-links/_docs/dir/nested.md diff --git a/scaladoc/test-documentations/static-links/docs/dir/nested.svg b/scaladoc/test-documentations/static-links/_docs/dir/nested.svg similarity index 100% rename from scaladoc/test-documentations/static-links/docs/dir/nested.svg rename to scaladoc/test-documentations/static-links/_docs/dir/nested.svg diff --git a/scaladoc/test-documentations/static-links/docs/index.md b/scaladoc/test-documentations/static-links/_docs/index.md similarity index 100% rename from scaladoc/test-documentations/static-links/docs/index.md rename to scaladoc/test-documentations/static-links/_docs/index.md diff --git a/scaladoc/test-documentations/static-links/index.md b/scaladoc/test-documentations/static-links/index.md deleted file mode 100644 index 2205e0c12d3e..000000000000 --- a/scaladoc/test-documentations/static-links/index.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: Basic test ---- -# Header - -[Link to docs](docs/index.html) - -And a text! \ No newline at end of file diff --git a/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala b/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala index fc215b1de229..e64eac41ac66 100644 --- a/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/ReportingTest.scala @@ -76,11 +76,11 @@ class ReportingTest: val docsRoot = testDocPath.resolve("conflicts-pages").toString checkReportedDiagnostics(_.copy( docsRoot = Some(docsRoot), - tastyFiles = tastyFiles("tests", rootPck = "docs") + tastyFiles = tastyFiles("tests", rootPck = "_docs") )){ diag => assertNoWarning(diag) val Seq(msg) = diag.errorMsgs.map(_.toLowerCase) - Seq("conflict","api", "static", "page", "docs/tests/adoc.html") + Seq("conflict","api", "static", "page", "_docs/tests/adoc.html") .foreach( word => Assert.assertTrue(s"Error message: $msg should contains $word", msg.contains(word)) ) diff --git a/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala index 0a2d1891a3cc..39bd7acf84f6 100644 --- a/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala @@ -44,5 +44,5 @@ class NavigationTest extends BaseHtmlTest: )), )) - testNavMenu("docs/Adoc.html", topLevelNav) + testNavMenu("_docs/Adoc.html", topLevelNav) } diff --git a/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala index 352f963510ff..1b3c53aba3c0 100644 --- a/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/site/SiteGeneratationTest.scala @@ -14,7 +14,7 @@ import dotty.tools.scaladoc.test.BuildInfo class SiteGeneratationTest extends BaseHtmlTest: def indexLinks(content: DocumentContext) = - content.assertAttr("p a","href", "docs/index.html") + content.assertAttr("p a","href", "_docs/index.html") def checkFile( path: String)( @@ -32,13 +32,13 @@ class SiteGeneratationTest extends BaseHtmlTest: } def testDocPages()(using ProjectContext) = - checkFile("docs/Adoc.html")(title = "Adoc", header = "Header in Adoc", parents = Seq(projectName)) - checkFile("docs/dir/index.html")(title = "A directory", header = "A directory", parents = Seq(projectName)) - checkFile("docs/dir/nested.html")( + checkFile("_docs/Adoc.html")(title = "Adoc", header = "Header in Adoc", parents = Seq(projectName)) + checkFile("_docs/dir/index.html")(title = "A directory", header = "A directory", parents = Seq(projectName)) + checkFile("_docs/dir/nested.html")( title = "Nested in a directory", header = "Nested in a directory", parents = Seq(projectName, "A directory")) def testDocIndexPage()(using ProjectContext) = - checkFile("docs/index.html")(title = projectName, header = s"$projectName in header") + checkFile("_docs/index.html")(title = projectName, header = s"$projectName in header") def testApiPages( mainTitle: String = "API", @@ -66,13 +66,13 @@ class SiteGeneratationTest extends BaseHtmlTest: testDocIndexPage() testApiPages() - withHtmlFile("docs/Adoc.html"){ content => + withHtmlFile("_docs/Adoc.html"){ content => content.assertAttr("p a","href", "../tests/site/SomeClass.html") } withHtmlFile("tests/site/SomeClass.html"){ content => content.assertAttr(".breadcrumbs a","href", - "../../docs/index.html", "../../index.html", "../site.html", "SomeClass.html" + "../../_docs/index.html", "../../index.html", "../site.html", "SomeClass.html" ) } } @@ -98,7 +98,7 @@ class SiteGeneratationTest extends BaseHtmlTest: @Test def staticLinking() = withGeneratedSite(testDocPath.resolve("static-links")){ - withHtmlFile("docs/Adoc.html"){ content => + withHtmlFile("_docs/Adoc.html"){ content => content.assertAttr("p a","href", "dir/html.html", "dir/name...with..dots..html", From 9e7e8a420fbd0a1ccfff87a297ba6e19fe13fcb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Fri, 28 Jan 2022 14:41:22 +0100 Subject: [PATCH 1177/1244] Refactor blog handling --- .../2015-10-23-dotty-compiler-bootstraps.md | 0 .../_posts/2016-01-02-new-year-resolutions.md | 0 .../_posts/2016-02-03-essence-of-scala.md | 0 .../2016-02-17-scaling-dot-soundness.md | 0 .../_posts/2016-05-05-multiversal-equality.md | 0 .../2016-12-05-implicit-function-types.md | 0 ...017-05-31-first-dotty-milestone-release.md | 0 ...17-07-12-second-dotty-milestone-release.md | 4 +- ...017-09-07-third-dotty-milestone-release.md | 2 +- ...17-10-16-fourth-dotty-milestone-release.md | 2 +- ...017-12-01-fifth-dotty-milestone-release.md | 2 +- ...8-03-05-seventh-dotty-milestone-release.md | 0 ...18-04-27-eighth-dotty-milestone-release.md | 0 ...018-07-06-ninth-dotty-milestone-release.md | 0 ...2018-10-10-10th-dotty-milestone-release.md | 0 ...2018-11-30-11th-dotty-milestone-release.md | 0 ...2019-01-21-12th-dotty-milestone-release.md | 0 ...2019-03-05-13th-dotty-milestone-release.md | 0 ...2019-04-15-14th-dotty-milestone-release.md | 0 ...2019-05-23-15th-dotty-milestone-release.md | 0 ...2019-06-11-16th-dotty-milestone-release.md | 0 ...2019-07-25-17th-dotty-milestone-release.md | 0 ...2019-08-30-18th-dotty-milestone-release.md | 0 ...2019-09-23-19th-dotty-milestone-release.md | 0 ...2019-11-04-20th-dotty-milestone-release.md | 0 ...2019-12-20-21th-dotty-milestone-release.md | 0 ...2020-02-05-22nd-dotty-milestone-release.md | 0 ...2020-03-18-23rd-dotty-milestone-release.md | 0 ...2020-04-29-24th-dotty-milestone-release.md | 0 ...2020-06-22-25th-dotty-milestone-release.md | 0 ...2020-07-27-26th-dotty-milestone-release.md | 0 ...2020-08-31-27th-dotty-milestone-release.md | 0 .../_posts/2020-09-21-naming-schema-change.md | 0 .../_posts/2020-11-09-scala3-m1.md | 0 .../_posts/2020-12-18-scala3-m3.md | 0 .../_posts/2021-02-17-scala3-rc1.md | 0 .../_posts/2021-03-31-scala3-rc2.md | 0 .../_posts/2021-04-21-scala3-rc3.md | 0 .../2021-06-07-scala3.0.1-rc1-release.md | 0 .../_posts/2021-06-25-scala301-rc2.md | 0 docs/{_docs/blog => _blog}/index.html | 0 docs/_docs/usage/dottydoc.md | 4 +- .../scaladoc/renderers/SiteRenderer.scala | 2 +- .../tools/scaladoc/site/LoadedTemplate.scala | 2 +- .../scaladoc/site/StaticSiteContext.scala | 3 +- .../scaladoc/site/StaticSiteLoader.scala | 56 +++++++++++++++++-- 46 files changed, 62 insertions(+), 15 deletions(-) rename docs/{_docs/blog => _blog}/_posts/2015-10-23-dotty-compiler-bootstraps.md (100%) rename docs/{_docs/blog => _blog}/_posts/2016-01-02-new-year-resolutions.md (100%) rename docs/{_docs/blog => _blog}/_posts/2016-02-03-essence-of-scala.md (100%) rename docs/{_docs/blog => _blog}/_posts/2016-02-17-scaling-dot-soundness.md (100%) rename docs/{_docs/blog => _blog}/_posts/2016-05-05-multiversal-equality.md (100%) rename docs/{_docs/blog => _blog}/_posts/2016-12-05-implicit-function-types.md (100%) rename docs/{_docs/blog => _blog}/_posts/2017-05-31-first-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2017-07-12-second-dotty-milestone-release.md (98%) rename docs/{_docs/blog => _blog}/_posts/2017-09-07-third-dotty-milestone-release.md (98%) rename docs/{_docs/blog => _blog}/_posts/2017-10-16-fourth-dotty-milestone-release.md (98%) rename docs/{_docs/blog => _blog}/_posts/2017-12-01-fifth-dotty-milestone-release.md (98%) rename docs/{_docs/blog => _blog}/_posts/2018-03-05-seventh-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2018-04-27-eighth-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2018-07-06-ninth-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2018-10-10-10th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2018-11-30-11th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2019-01-21-12th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2019-03-05-13th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2019-04-15-14th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2019-05-23-15th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2019-06-11-16th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2019-07-25-17th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2019-08-30-18th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2019-09-23-19th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2019-11-04-20th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2019-12-20-21th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2020-02-05-22nd-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2020-03-18-23rd-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2020-04-29-24th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2020-06-22-25th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2020-07-27-26th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2020-08-31-27th-dotty-milestone-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2020-09-21-naming-schema-change.md (100%) rename docs/{_docs/blog => _blog}/_posts/2020-11-09-scala3-m1.md (100%) rename docs/{_docs/blog => _blog}/_posts/2020-12-18-scala3-m3.md (100%) rename docs/{_docs/blog => _blog}/_posts/2021-02-17-scala3-rc1.md (100%) rename docs/{_docs/blog => _blog}/_posts/2021-03-31-scala3-rc2.md (100%) rename docs/{_docs/blog => _blog}/_posts/2021-04-21-scala3-rc3.md (100%) rename docs/{_docs/blog => _blog}/_posts/2021-06-07-scala3.0.1-rc1-release.md (100%) rename docs/{_docs/blog => _blog}/_posts/2021-06-25-scala301-rc2.md (100%) rename docs/{_docs/blog => _blog}/index.html (100%) diff --git a/docs/_docs/blog/_posts/2015-10-23-dotty-compiler-bootstraps.md b/docs/_blog/_posts/2015-10-23-dotty-compiler-bootstraps.md similarity index 100% rename from docs/_docs/blog/_posts/2015-10-23-dotty-compiler-bootstraps.md rename to docs/_blog/_posts/2015-10-23-dotty-compiler-bootstraps.md diff --git a/docs/_docs/blog/_posts/2016-01-02-new-year-resolutions.md b/docs/_blog/_posts/2016-01-02-new-year-resolutions.md similarity index 100% rename from docs/_docs/blog/_posts/2016-01-02-new-year-resolutions.md rename to docs/_blog/_posts/2016-01-02-new-year-resolutions.md diff --git a/docs/_docs/blog/_posts/2016-02-03-essence-of-scala.md b/docs/_blog/_posts/2016-02-03-essence-of-scala.md similarity index 100% rename from docs/_docs/blog/_posts/2016-02-03-essence-of-scala.md rename to docs/_blog/_posts/2016-02-03-essence-of-scala.md diff --git a/docs/_docs/blog/_posts/2016-02-17-scaling-dot-soundness.md b/docs/_blog/_posts/2016-02-17-scaling-dot-soundness.md similarity index 100% rename from docs/_docs/blog/_posts/2016-02-17-scaling-dot-soundness.md rename to docs/_blog/_posts/2016-02-17-scaling-dot-soundness.md diff --git a/docs/_docs/blog/_posts/2016-05-05-multiversal-equality.md b/docs/_blog/_posts/2016-05-05-multiversal-equality.md similarity index 100% rename from docs/_docs/blog/_posts/2016-05-05-multiversal-equality.md rename to docs/_blog/_posts/2016-05-05-multiversal-equality.md diff --git a/docs/_docs/blog/_posts/2016-12-05-implicit-function-types.md b/docs/_blog/_posts/2016-12-05-implicit-function-types.md similarity index 100% rename from docs/_docs/blog/_posts/2016-12-05-implicit-function-types.md rename to docs/_blog/_posts/2016-12-05-implicit-function-types.md diff --git a/docs/_docs/blog/_posts/2017-05-31-first-dotty-milestone-release.md b/docs/_blog/_posts/2017-05-31-first-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2017-05-31-first-dotty-milestone-release.md rename to docs/_blog/_posts/2017-05-31-first-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2017-07-12-second-dotty-milestone-release.md b/docs/_blog/_posts/2017-07-12-second-dotty-milestone-release.md similarity index 98% rename from docs/_docs/blog/_posts/2017-07-12-second-dotty-milestone-release.md rename to docs/_blog/_posts/2017-07-12-second-dotty-milestone-release.md index 19de33740776..aa71d62ffc97 100644 --- a/docs/_docs/blog/_posts/2017-07-12-second-dotty-milestone-release.md +++ b/docs/_blog/_posts/2017-07-12-second-dotty-milestone-release.md @@ -10,7 +10,7 @@ Today, we are excited to release Dotty version 0.2.0-RC1. This release serves as a technology preview that demonstrates new language features and the compiler supporting them. -This release is based on the [previous milestone](/blog/_posts/2017-05-31-first-dotty-milestone-release.html). +This release is based on the [previous milestone](/_blog/_posts/2017-05-31-first-dotty-milestone-release.html). The highlights of this release are: - substantial improvement of quality of generated code for pattern matching - improvements in VS Code IDE stability @@ -24,7 +24,7 @@ The highlights of this release are: This is our second scheduled release according to our [6-week release schedule](https://dotty.epfl.ch/docs/usage/version-numbers.html). ## What’s in the 0.2.0-RC1 technology preview? -The [previous technology preview](/blog/_posts/2017-05-31-first-dotty-milestone-release.html) has shipped new language features planned for Scala 3: +The [previous technology preview](/_blog/_posts/2017-05-31-first-dotty-milestone-release.html) has shipped new language features planned for Scala 3: [Intersection Types](https://dotty.epfl.ch/docs/reference/new-types/intersection-types.html), [Union Types](https://dotty.epfl.ch/docs/reference/new-types/union-types.html), [Trait Parameters](https://dotty.epfl.ch/docs/reference/other-new-features/trait-parameters.html), diff --git a/docs/_docs/blog/_posts/2017-09-07-third-dotty-milestone-release.md b/docs/_blog/_posts/2017-09-07-third-dotty-milestone-release.md similarity index 98% rename from docs/_docs/blog/_posts/2017-09-07-third-dotty-milestone-release.md rename to docs/_blog/_posts/2017-09-07-third-dotty-milestone-release.md index d07c5d518f19..eb20292884f1 100644 --- a/docs/_docs/blog/_posts/2017-09-07-third-dotty-milestone-release.md +++ b/docs/_blog/_posts/2017-09-07-third-dotty-milestone-release.md @@ -20,7 +20,7 @@ You can learn more about Dotty on our [website](http://dotty.epfl.ch). This is our third scheduled release according to our [6-week release schedule](https://dotty.epfl.ch/docs/usage/version-numbers.html). -The [previous technology preview](/blog/_posts/2017-07-12-second-dotty-milestone-release.html) improved +The [previous technology preview](/_blog/_posts/2017-07-12-second-dotty-milestone-release.html) improved stability and reliability: - substantial improvement of quality of generated code for pattern matching diff --git a/docs/_docs/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md b/docs/_blog/_posts/2017-10-16-fourth-dotty-milestone-release.md similarity index 98% rename from docs/_docs/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md rename to docs/_blog/_posts/2017-10-16-fourth-dotty-milestone-release.md index 52a1f6914034..4990ec198aa0 100644 --- a/docs/_docs/blog/_posts/2017-10-16-fourth-dotty-milestone-release.md +++ b/docs/_blog/_posts/2017-10-16-fourth-dotty-milestone-release.md @@ -20,7 +20,7 @@ You can learn more about Dotty on our [website](http://dotty.epfl.ch). This is our fourth scheduled release according to our [6-week release schedule](https://dotty.epfl.ch/docs/usage/version-numbers.html). -The [previous technology preview](/blog/_posts/2017-09-07-third-dotty-milestone-release.html) improved +The [previous technology preview](/_blog/_posts/2017-09-07-third-dotty-milestone-release.html) improved stability and reliability. ## What’s new in the 0.4.0-RC1 technology preview? diff --git a/docs/_docs/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md b/docs/_blog/_posts/2017-12-01-fifth-dotty-milestone-release.md similarity index 98% rename from docs/_docs/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md rename to docs/_blog/_posts/2017-12-01-fifth-dotty-milestone-release.md index 8204771b3134..98fa6e127088 100644 --- a/docs/_docs/blog/_posts/2017-12-01-fifth-dotty-milestone-release.md +++ b/docs/_blog/_posts/2017-12-01-fifth-dotty-milestone-release.md @@ -20,7 +20,7 @@ You can learn more about Dotty on our [website](http://dotty.epfl.ch). This is our fifth scheduled release according to our [6-week release schedule](https://dotty.epfl.ch/docs/usage/version-numbers.html). -The [previous technology preview](/blog/_posts/2017-10-16-fourth-dotty-milestone-release.html) added +The [previous technology preview](/_blog/_posts/2017-10-16-fourth-dotty-milestone-release.html) added support for Scala 2.12 and came with a brand new REPL. ## What’s new in the 0.5.0-RC1 technology preview? diff --git a/docs/_docs/blog/_posts/2018-03-05-seventh-dotty-milestone-release.md b/docs/_blog/_posts/2018-03-05-seventh-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2018-03-05-seventh-dotty-milestone-release.md rename to docs/_blog/_posts/2018-03-05-seventh-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2018-04-27-eighth-dotty-milestone-release.md b/docs/_blog/_posts/2018-04-27-eighth-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2018-04-27-eighth-dotty-milestone-release.md rename to docs/_blog/_posts/2018-04-27-eighth-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2018-07-06-ninth-dotty-milestone-release.md b/docs/_blog/_posts/2018-07-06-ninth-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2018-07-06-ninth-dotty-milestone-release.md rename to docs/_blog/_posts/2018-07-06-ninth-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2018-10-10-10th-dotty-milestone-release.md b/docs/_blog/_posts/2018-10-10-10th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2018-10-10-10th-dotty-milestone-release.md rename to docs/_blog/_posts/2018-10-10-10th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2018-11-30-11th-dotty-milestone-release.md b/docs/_blog/_posts/2018-11-30-11th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2018-11-30-11th-dotty-milestone-release.md rename to docs/_blog/_posts/2018-11-30-11th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2019-01-21-12th-dotty-milestone-release.md b/docs/_blog/_posts/2019-01-21-12th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2019-01-21-12th-dotty-milestone-release.md rename to docs/_blog/_posts/2019-01-21-12th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2019-03-05-13th-dotty-milestone-release.md b/docs/_blog/_posts/2019-03-05-13th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2019-03-05-13th-dotty-milestone-release.md rename to docs/_blog/_posts/2019-03-05-13th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2019-04-15-14th-dotty-milestone-release.md b/docs/_blog/_posts/2019-04-15-14th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2019-04-15-14th-dotty-milestone-release.md rename to docs/_blog/_posts/2019-04-15-14th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2019-05-23-15th-dotty-milestone-release.md b/docs/_blog/_posts/2019-05-23-15th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2019-05-23-15th-dotty-milestone-release.md rename to docs/_blog/_posts/2019-05-23-15th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md b/docs/_blog/_posts/2019-06-11-16th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2019-06-11-16th-dotty-milestone-release.md rename to docs/_blog/_posts/2019-06-11-16th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2019-07-25-17th-dotty-milestone-release.md b/docs/_blog/_posts/2019-07-25-17th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2019-07-25-17th-dotty-milestone-release.md rename to docs/_blog/_posts/2019-07-25-17th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2019-08-30-18th-dotty-milestone-release.md b/docs/_blog/_posts/2019-08-30-18th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2019-08-30-18th-dotty-milestone-release.md rename to docs/_blog/_posts/2019-08-30-18th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2019-09-23-19th-dotty-milestone-release.md b/docs/_blog/_posts/2019-09-23-19th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2019-09-23-19th-dotty-milestone-release.md rename to docs/_blog/_posts/2019-09-23-19th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2019-11-04-20th-dotty-milestone-release.md b/docs/_blog/_posts/2019-11-04-20th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2019-11-04-20th-dotty-milestone-release.md rename to docs/_blog/_posts/2019-11-04-20th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md b/docs/_blog/_posts/2019-12-20-21th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2019-12-20-21th-dotty-milestone-release.md rename to docs/_blog/_posts/2019-12-20-21th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2020-02-05-22nd-dotty-milestone-release.md b/docs/_blog/_posts/2020-02-05-22nd-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2020-02-05-22nd-dotty-milestone-release.md rename to docs/_blog/_posts/2020-02-05-22nd-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2020-03-18-23rd-dotty-milestone-release.md b/docs/_blog/_posts/2020-03-18-23rd-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2020-03-18-23rd-dotty-milestone-release.md rename to docs/_blog/_posts/2020-03-18-23rd-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md b/docs/_blog/_posts/2020-04-29-24th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2020-04-29-24th-dotty-milestone-release.md rename to docs/_blog/_posts/2020-04-29-24th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md b/docs/_blog/_posts/2020-06-22-25th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2020-06-22-25th-dotty-milestone-release.md rename to docs/_blog/_posts/2020-06-22-25th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md b/docs/_blog/_posts/2020-07-27-26th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2020-07-27-26th-dotty-milestone-release.md rename to docs/_blog/_posts/2020-07-27-26th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md b/docs/_blog/_posts/2020-08-31-27th-dotty-milestone-release.md similarity index 100% rename from docs/_docs/blog/_posts/2020-08-31-27th-dotty-milestone-release.md rename to docs/_blog/_posts/2020-08-31-27th-dotty-milestone-release.md diff --git a/docs/_docs/blog/_posts/2020-09-21-naming-schema-change.md b/docs/_blog/_posts/2020-09-21-naming-schema-change.md similarity index 100% rename from docs/_docs/blog/_posts/2020-09-21-naming-schema-change.md rename to docs/_blog/_posts/2020-09-21-naming-schema-change.md diff --git a/docs/_docs/blog/_posts/2020-11-09-scala3-m1.md b/docs/_blog/_posts/2020-11-09-scala3-m1.md similarity index 100% rename from docs/_docs/blog/_posts/2020-11-09-scala3-m1.md rename to docs/_blog/_posts/2020-11-09-scala3-m1.md diff --git a/docs/_docs/blog/_posts/2020-12-18-scala3-m3.md b/docs/_blog/_posts/2020-12-18-scala3-m3.md similarity index 100% rename from docs/_docs/blog/_posts/2020-12-18-scala3-m3.md rename to docs/_blog/_posts/2020-12-18-scala3-m3.md diff --git a/docs/_docs/blog/_posts/2021-02-17-scala3-rc1.md b/docs/_blog/_posts/2021-02-17-scala3-rc1.md similarity index 100% rename from docs/_docs/blog/_posts/2021-02-17-scala3-rc1.md rename to docs/_blog/_posts/2021-02-17-scala3-rc1.md diff --git a/docs/_docs/blog/_posts/2021-03-31-scala3-rc2.md b/docs/_blog/_posts/2021-03-31-scala3-rc2.md similarity index 100% rename from docs/_docs/blog/_posts/2021-03-31-scala3-rc2.md rename to docs/_blog/_posts/2021-03-31-scala3-rc2.md diff --git a/docs/_docs/blog/_posts/2021-04-21-scala3-rc3.md b/docs/_blog/_posts/2021-04-21-scala3-rc3.md similarity index 100% rename from docs/_docs/blog/_posts/2021-04-21-scala3-rc3.md rename to docs/_blog/_posts/2021-04-21-scala3-rc3.md diff --git a/docs/_docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md b/docs/_blog/_posts/2021-06-07-scala3.0.1-rc1-release.md similarity index 100% rename from docs/_docs/blog/_posts/2021-06-07-scala3.0.1-rc1-release.md rename to docs/_blog/_posts/2021-06-07-scala3.0.1-rc1-release.md diff --git a/docs/_docs/blog/_posts/2021-06-25-scala301-rc2.md b/docs/_blog/_posts/2021-06-25-scala301-rc2.md similarity index 100% rename from docs/_docs/blog/_posts/2021-06-25-scala301-rc2.md rename to docs/_blog/_posts/2021-06-25-scala301-rc2.md diff --git a/docs/_docs/blog/index.html b/docs/_blog/index.html similarity index 100% rename from docs/_docs/blog/index.html rename to docs/_blog/index.html diff --git a/docs/_docs/usage/dottydoc.md b/docs/_docs/usage/dottydoc.md index f7e15b692d99..28c29606a301 100644 --- a/docs/_docs/usage/dottydoc.md +++ b/docs/_docs/usage/dottydoc.md @@ -92,7 +92,7 @@ It is also possible to use one of the [default layouts](#default-layouts) that s Blog ==== Dottydoc also allows for a simple blogging platform in the same vein as Jekyll. -Blog posts are placed within the `./blog/_posts` directory and have to be in +Blog posts are placed within the `./_blog/_posts` directory and have to be in the form `year-month-day-title.{md,html}`. An example of this would be: @@ -252,7 +252,7 @@ to alter the way Dottydoc renders API documentation. blog-page.html -------------- -A blog page uses files placed in `./blog/_posts/` as input to render a blog. +A blog page uses files placed in `./_blog/_posts/` as input to render a blog. Default Includes ================ diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala index dbecef3ede21..123cdb6316fd 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala @@ -56,7 +56,7 @@ trait SiteRenderer(using DocContext) extends Locations: .orElse(asStaticSite) .orElse(asAsset) .getOrElse { - report.warn(s"Unable to resolve link '$str'", content.template.file) + report.warn(s"Unable to resolve link '$str'", content.template.templateFile.file) str } diff --git a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala index ec9ac220b413..84b84b03850a 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala @@ -32,7 +32,7 @@ case class LoadedTemplate( lazy val entrySet: JSet[JMapEntry[String, Object]] = val site = templateFile.settings.getOrElse("page", Map.empty).asInstanceOf[Map[String, Object]] site.asJava.entrySet() ++ JSet( - LazyEntry("url", () => ctx.relativePath(LoadedTemplate.this).toString), + LazyEntry("url", () => "/" ++ ctx.pathFromRoot(LoadedTemplate.this).toString), LazyEntry("title", () => templateFile.title.name), LazyEntry("excerpt", () => brief(ctx)) ) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala index 344cf13429c9..9f14442a7dbe 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteContext.scala @@ -21,6 +21,7 @@ class StaticSiteContext( var memberLinkResolver: String => Option[DRI] = _ => None val docsPath = root.toPath.resolve("_docs") + val blogPath = root.toPath.resolve("_blog") val relativizeFrom = if args.apiSubdirectory then docsPath else root.toPath @@ -100,7 +101,7 @@ class StaticSiteContext( DRI.forPath(relativePath) - def relativePath(myTemplate: LoadedTemplate) = relativizeFrom.relativize(myTemplate.file.toPath) + def pathFromRoot(myTemplate: LoadedTemplate) = root.toPath.relativize(myTemplate.file.toPath) val projectWideProperties = Seq("projectName" -> args.name) ++ diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala index 0b2e32198156..7fd2410de140 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala @@ -61,8 +61,6 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite filesInDirectory.fold(List.empty) { files => val mappingFunc: File => File = file => { val relativeFile = root.toPath.resolve(indexPathDirectory).relativize(file.toPath) - println(file.toPath) - println(categoryPath.resolve(relativeFile)) categoryPath.resolve(relativeFile).toFile } files.toList @@ -85,7 +83,7 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite // Cannot happen ??? } - val rootTemplate = LoadedTemplate(rootIndex, yamlRoot.pages.map(c => loadChild(ctx.docsPath)(c)), rootDest) + val rootTemplate = LoadedTemplate(rootIndex, yamlRoot.pages.map(c => loadChild(ctx.docsPath)(c)) ++ loadBlog(), rootDest) val mappings = createMapping(rootTemplate) StaticSiteRoot(rootTemplate, mappings) } @@ -103,8 +101,56 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite val withChangedTitle = rootTemplate.copy(templateFile = rootTemplate.templateFile.copy(title = TemplateName.FilenameDefined(args.name))) - val mappings = createMapping(withChangedTitle) - StaticSiteRoot(withChangedTitle, mappings) + val withBlog = loadBlog().fold(withChangedTitle)(blog => withChangedTitle.copy(children = withChangedTitle.children :+ blog)) + + val mappings = createMapping(withBlog) + StaticSiteRoot(withBlog, mappings) + } + + def loadBlog(): Option[LoadedTemplate] = { + type Date = (String, String, String) + val rootPath = ctx.blogPath + if (!Files.exists(rootPath)) None + else { + val indexPageOpt = Seq( + rootPath.resolve("index.md"), + rootPath.resolve("index.html"), + ).filter(p => Files.exists(p)) match { + case Nil => None + case indexPath :: Nil => Some(indexPath) + case list => + report.warning(s"Multiple index pages for $rootPath found in ${list.map(_.toFile)}. Defaulting to first.") + list.headOption + } + val indexTemplateOpt = indexPageOpt.map(p => loadTemplateFile(p.toFile)) + + val indexPage = indexTemplateOpt.getOrElse(emptyTemplate(rootPath.resolve("index.html").toFile, "Blog")) + val indexDest = ctx.docsPath.resolve("_blog").resolve("index.html") + val regex = raw"(\d*)-(\d*)-(\d*)-(.*)".r + def splitDateName(tf: TemplateFile): (Date, String) = tf.file.getName match + case regex(year, month, day, name) => ((year, month, day), name) + case name => + report.warn("Incorrect file name for blog post. Post file name should be in format ---", tf.file) + (("1900","01","01"), name) + + def dateFrom(tf: TemplateFile, default: String = "1900-01-01"): String = + val pageSettings = tf.settings.get("page").collect{ case m: Map[String @unchecked, _] => m } + pageSettings.flatMap(_.get("date").collect{ case s: String => s}).getOrElse(default) // blogs without date are last + + val posts = List(rootPath.resolve("_posts")) + .filter(Files.exists(_)) + .flatMap(_.toFile.listFiles) + .filterNot(_.isDirectory) + .map { postFile => + val templateFile = loadTemplateFile(postFile) + val ((year, month, day), name) = splitDateName(templateFile) + val destPath = ctx.docsPath.resolve("_blog").resolve(year).resolve(month).resolve(day).resolve(name) + val date = dateFrom(templateFile, s"$year-$month-$day") + date -> LoadedTemplate(templateFile, List.empty, destPath.toFile) + }.sortBy(_._1).reverse.map(_._2) + + Some(LoadedTemplate(indexPage, posts, indexDest.toFile)) + } } def loadRecursively(currRoot: File, destMappingFunc: File => File = identity): Option[LoadedTemplate] = { From ba8c55eea7280a6dd00712503d359d4eb2318cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Fri, 28 Jan 2022 16:13:52 +0100 Subject: [PATCH 1178/1244] Adjust testcases static site to the new structure. Change assets copy destination in sbt project --- project/DocumentationWebsite.scala | 8 ++++---- .../docs/{ => _assets}/css/bootstrap.min.css | 0 scaladoc-testcases/docs/{docs => _docs}/docs/f1.md | 0 scaladoc-testcases/docs/{docs => _docs}/docs/f2.md | 0 scaladoc-testcases/docs/{docs => _docs}/docs/f3.md | 0 scaladoc-testcases/docs/{docs => _docs}/docs/f4.md | 0 scaladoc-testcases/docs/{docs => _docs}/index.md | 0 scaladoc-testcases/docs/sidebar.yml | 10 +++++----- 8 files changed, 9 insertions(+), 9 deletions(-) rename scaladoc-testcases/docs/{ => _assets}/css/bootstrap.min.css (100%) rename scaladoc-testcases/docs/{docs => _docs}/docs/f1.md (100%) rename scaladoc-testcases/docs/{docs => _docs}/docs/f2.md (100%) rename scaladoc-testcases/docs/{docs => _docs}/docs/f3.md (100%) rename scaladoc-testcases/docs/{docs => _docs}/docs/f4.md (100%) rename scaladoc-testcases/docs/{docs => _docs}/index.md (100%) diff --git a/project/DocumentationWebsite.scala b/project/DocumentationWebsite.scala index 60a11e919e62..778c70ad2f0d 100644 --- a/project/DocumentationWebsite.scala +++ b/project/DocumentationWebsite.scala @@ -13,8 +13,8 @@ object DocumentationWebsite { ): Seq[File] = { - val contributorsTestcasesDestinationFile = Paths.get("scaladoc-testcases", "docs", "js", "contributors.js").toFile - val contributorsDestinationFile = Paths.get("docs", "js", "contributors.js").toFile + val contributorsTestcasesDestinationFile = Paths.get("scaladoc-testcases", "docs", "_assets", "js", "contributors.js").toFile + val contributorsDestinationFile = Paths.get("docs", "_assets", "js", "contributors.js").toFile sbt.IO.copyFile(contributorsFile, contributorsTestcasesDestinationFile) sbt.IO.copyFile(contributorsFile, contributorsDestinationFile) @@ -25,8 +25,8 @@ object DocumentationWebsite { val cssCodeSnippetsSourceFile = cssSourceFileBase / "code-snippets.css" sbt.IO.copyFile(cssCodeSnippetsSourceFile, cssCodeSnippetsDesitnationFile) - val cssContentContributorsTestcasesDesitnationFile = Paths.get("docs", "css", "content-contributors.css").toFile - val cssContentContributorsDesitnationFile = Paths.get("scaladoc-testcases", "docs", "css", "content-contributors.css").toFile + val cssContentContributorsTestcasesDesitnationFile = Paths.get("docs", "_assets", "css", "content-contributors.css").toFile + val cssContentContributorsDesitnationFile = Paths.get("scaladoc-testcases", "docs", "_assets", "css", "content-contributors.css").toFile val cssContentContributorsSourceFile = cssContentContributorsSourceBaseFile / "content-contributors.css" sbt.IO.copyFile(cssContentContributorsSourceFile, cssContentContributorsTestcasesDesitnationFile) sbt.IO.copyFile(cssContentContributorsSourceFile, cssContentContributorsDesitnationFile) diff --git a/scaladoc-testcases/docs/css/bootstrap.min.css b/scaladoc-testcases/docs/_assets/css/bootstrap.min.css similarity index 100% rename from scaladoc-testcases/docs/css/bootstrap.min.css rename to scaladoc-testcases/docs/_assets/css/bootstrap.min.css diff --git a/scaladoc-testcases/docs/docs/docs/f1.md b/scaladoc-testcases/docs/_docs/docs/f1.md similarity index 100% rename from scaladoc-testcases/docs/docs/docs/f1.md rename to scaladoc-testcases/docs/_docs/docs/f1.md diff --git a/scaladoc-testcases/docs/docs/docs/f2.md b/scaladoc-testcases/docs/_docs/docs/f2.md similarity index 100% rename from scaladoc-testcases/docs/docs/docs/f2.md rename to scaladoc-testcases/docs/_docs/docs/f2.md diff --git a/scaladoc-testcases/docs/docs/docs/f3.md b/scaladoc-testcases/docs/_docs/docs/f3.md similarity index 100% rename from scaladoc-testcases/docs/docs/docs/f3.md rename to scaladoc-testcases/docs/_docs/docs/f3.md diff --git a/scaladoc-testcases/docs/docs/docs/f4.md b/scaladoc-testcases/docs/_docs/docs/f4.md similarity index 100% rename from scaladoc-testcases/docs/docs/docs/f4.md rename to scaladoc-testcases/docs/_docs/docs/f4.md diff --git a/scaladoc-testcases/docs/docs/index.md b/scaladoc-testcases/docs/_docs/index.md similarity index 100% rename from scaladoc-testcases/docs/docs/index.md rename to scaladoc-testcases/docs/_docs/index.md diff --git a/scaladoc-testcases/docs/sidebar.yml b/scaladoc-testcases/docs/sidebar.yml index f08a0b3e3ffe..85b48870c8d4 100644 --- a/scaladoc-testcases/docs/sidebar.yml +++ b/scaladoc-testcases/docs/sidebar.yml @@ -1,6 +1,6 @@ -rootIndex: docs/index.md +rootIndex: index.md pages: - - page: docs/docs/f1.md - - page: docs/docs/f2.md - - page: docs/docs/f3.md - - page: docs/docs/f4.md + - page: docs/f1.md + - page: docs/f2.md + - page: docs/f3.md + - page: docs/f4.md From 8dae6669d1f4cb8be6c0b58c2ebe7031f8cf4139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 8 Feb 2022 12:23:32 +0100 Subject: [PATCH 1179/1244] CRs from review. Add `hidden` property to hide page configured through sidebar.yaml --- .../scaladoc/renderers/HtmlRenderer.scala | 10 ++- .../tools/scaladoc/renderers/Locations.scala | 1 - .../tools/scaladoc/renderers/Renderer.scala | 6 +- .../scaladoc/renderers/SiteRenderer.scala | 2 +- .../tools/scaladoc/site/LoadedTemplate.scala | 3 +- .../tools/scaladoc/site/SidebarParser.scala | 88 +++++++++++++------ .../scaladoc/site/StaticSiteLoader.scala | 34 ++++--- .../dotty/tools/scaladoc/site/common.scala | 4 +- .../dotty/tools/scaladoc/site/templates.scala | 18 +--- .../scaladoc/site/SidebarParserTest.scala | 21 +++-- 10 files changed, 110 insertions(+), 77 deletions(-) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala index 3c35c761caf2..d71fe03a9c13 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala @@ -44,7 +44,13 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do Using(Files.walk(file)) { stream => stream.iterator().asScala.toSeq .map(from => Resource.File(resourceFile.toPath.relativize(from).toString, from)) - }.get + }.fold ( + { t => + report.warn(s"Error occured while processing _assets file.", t) + Seq.empty + }, + identity + ) } } val resources = staticSiteResources ++ allResources(allPages) ++ onlyRenderedResources @@ -115,7 +121,7 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do ) ) - nav.children match + nav.children.filterNot(_.hidden) match case Nil => isSelected -> div(cls := s"ni ${if isSelected then "expanded" else ""}")(linkHtml()) case children => val nested = children.map(renderNested(_)) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala index 58627ecc7964..1c55cb8124e1 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala @@ -34,7 +34,6 @@ trait Locations(using ctx: DocContext): cache.get(dri) match case null => val path = dri match - // case `docsRootDRI` => List("docs", "index") case `apiPageDRI` => if ctx.args.apiSubdirectory && ctx.staticSiteContext.nonEmpty then List("api", "index") diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala index ef83b4f92196..45a080d4828a 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala @@ -15,7 +15,7 @@ import java.nio.file.Files import java.nio.file.FileVisitOption import java.io.File -case class Page(link: Link, content: Member | ResolvedTemplate | String, children: Seq[Page]): +case class Page(link: Link, content: Member | ResolvedTemplate | String, children: Seq[Page], hidden: Boolean = false): def withNewChildren(newChildren: Seq[Page]) = copy(children = children ++ newChildren) def withTitle(newTitle: String) = copy(link = link.copy(name = newTitle)) @@ -74,12 +74,12 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot ) updatedTemplates.result() - val newTemplates = updateSettings(Seq(siteContext.staticSiteRoot.rootTemplate), newSettings.to(ListBuffer)) + val newTemplates = updateSettings(Seq(rootTemplate), newSettings.to(ListBuffer)) val templatePages = newTemplates.map(templateToPage(_, siteContext)) val newRoot = newTemplates.head - if newRoot.children.size == 0 && newRoot.templateFile.rawCode == "" + if newRoot.children.isEmpty && newRoot.templateFile.rawCode.isEmpty then rootPckPage.withTitle(args.name) else { val newRootPage = templateToPage(newRoot, siteContext) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala index 123cdb6316fd..ad97b19fbb24 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala @@ -22,7 +22,7 @@ trait SiteRenderer(using DocContext) extends Locations: def templateToPage(t: LoadedTemplate, staticSiteCtx: StaticSiteContext): Page = val dri = staticSiteCtx.driFor(t.file.toPath) val content = ResolvedTemplate(t, staticSiteCtx) - Page(Link(t.templateFile.title.name, dri), content, t.children.map(templateToPage(_, staticSiteCtx))) + Page(Link(t.templateFile.title.name, dri), content, t.children.map(templateToPage(_, staticSiteCtx)), t.hidden) private val HashRegex = "([^#]+)(#.+)".r diff --git a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala index 84b84b03850a..c8388a8112bd 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/LoadedTemplate.scala @@ -16,7 +16,8 @@ case class LazyEntry(getKey: String, value: () => String) extends JMapEntry[Stri case class LoadedTemplate( templateFile: TemplateFile, children: List[LoadedTemplate], - file: File): + file: File, + hidden: Boolean = false): private def brief(ctx: StaticSiteContext): String = try diff --git a/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala b/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala index 2b3ddd552207..f383156a2b3d 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala @@ -6,48 +6,86 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.`type`.TypeReference; import collection.JavaConverters._ import java.util.Optional +import scala.beans._ enum Sidebar: - case Root(index: Option[String], pages: List[Sidebar]) - case Category(title: Option[String], indexPath: Option[String], nested: List[Sidebar], directory: Option[String]) - case Page(title: Option[String], pagePath: String) + case Root(index: Option[String], pages: List[Sidebar.Child]) + case Category( + title: Option[String], + indexPath: Option[String], + nested: List[Sidebar.Child], + directory: Option[String] + ) + case Page(title: Option[String], pagePath: String, hidden: Boolean) object Sidebar: + + type Child = Category | Page case class RawRoot(var rootIndex: String, var pages: JList[RawInput]): def this() = this("", JList()) def setRootIndex(s: String) = rootIndex = s def setPages(l: JList[RawInput]) = pages = l - case class RawInput(var title: String, var page: String, var index: String, var subsection: JList[RawInput], var directory: String): - def this() = this("", "", "", JList(), "") - - def setTitle(t: String) = this.title = t - def setPage(p: String) = this.page = p - def setIndex(i: String) = this.index = i - def setSubsection(s: JList[RawInput]) = this.subsection = s - def setDirectory(d: String) = this.directory = d + case class RawInput( + @BeanProperty var title: String, + @BeanProperty var page: String, + @BeanProperty var index: String, + @BeanProperty var subsection: JList[RawInput], + @BeanProperty var directory: String, + @BooleanBeanProperty var hidden: Boolean + ): + def this() = this("", "", "", JList(), "", false) private object RootTypeRef extends TypeReference[RawRoot] - private def toSidebar(r: RawInput): Sidebar = r match - case RawInput(title, page, index, subsection, dir) if page.nonEmpty && index.isEmpty && subsection.isEmpty() || title == "Blog" => - Sidebar.Page(Option.when(title.nonEmpty)(title), page) - case RawInput(title, page, index, subsection, dir) if page.isEmpty && (!subsection.isEmpty() || !index.isEmpty()) => + private def toSidebar(r: RawInput)(using CompilerContext): Sidebar.Child = r match + case RawInput(title, page, index, subsection, dir, hidden) if page.nonEmpty && index.isEmpty && subsection.isEmpty() => + Sidebar.Page(Option.when(title.nonEmpty)(title), page, hidden) + case RawInput(title, page, index, subsection, dir, hidden) if page.isEmpty && (!subsection.isEmpty() || !index.isEmpty()) => Sidebar.Category(Option.when(title.nonEmpty)(title), Option.when(index.nonEmpty)(index), subsection.asScala.map(toSidebar).toList, Option.when(dir.nonEmpty)(dir)) + case RawInput(title, page, index, subsection, dir, hidden) => + report.error(s"Error parsing YAML configuration file.\n$schemaMessage") + Sidebar.Page(None, page, hidden) - def load(content: String): Sidebar.Root = - val mapper = ObjectMapper(YAMLFactory()) - val root: RawRoot = mapper.readValue(content, RootTypeRef) + private def schemaMessage: String = + s"""Static site YAML configuration file should comply to the following description: + |rootIndex: # optional + |pages: + | - | + | + |: + | title: # optional + | index: # optional + | directory: # optional + | subsection: # optional + | - | + | # either index or subsection needs to be present + |: + | title: # optional + | page: + | hidden: # optional + | + |For more information visit: + |https://docs.scala-lang.org/scala3/guides/scaladoc/static-site.html + |""".stripMargin - val rootIndex: String = root.rootIndex - val pages: List[Sidebar] = root.pages.asScala.toList.map(toSidebar) - Sidebar.Root(Option.when(rootIndex.nonEmpty)(rootIndex), pages) - - def load(file: java.io.File): Sidebar.Root = + def load(content: String | java.io.File)(using CompilerContext): Sidebar.Root = + import scala.util.Try val mapper = ObjectMapper(YAMLFactory()) - val root: RawRoot = mapper.readValue(file, RootTypeRef) + def readValue = content match + case s: String => mapper.readValue(s, RootTypeRef) + case f: java.io.File => mapper.readValue(f, RootTypeRef) + + val root: RawRoot = Try(readValue) + .fold( + { e => + report.warn(schemaMessage, e) + RawRoot("", java.util.Collections.emptyList()) + }, + identity + ) val rootIndex: String = root.rootIndex - val pages: List[Sidebar] = root.pages.asScala.toList.map(toSidebar) + val pages: List[Sidebar.Child] = root.pages.asScala.toList.map(toSidebar) Sidebar.Root(Option.when(rootIndex.nonEmpty)(rootIndex), pages) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala index 7fd2410de140..9ec6bf032ce4 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala @@ -24,10 +24,22 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite } } + /** Method loading static site structure based on YAML configuration file. + * + * The rendered static site will only contain pages that are present in YAML. + * The following rules are applied: + * - Each subsection will be a separate directory. + * - Nested subsections will result in nested directories. + * - If the subsection object contains location of index and doesn't contain any item, + * items are loaded using file system from the directory of the index file. + * - By default, directory name is a subsection title converted to kebab case. + * However, you can override default name by setting "directory" property of the subsection object. + * + */ def loadBasedOnYaml(yamlRoot: Sidebar.Root): StaticSiteRoot = { val rootDest = ctx.docsPath.resolve("index.html").toFile val rootIndex = yamlRoot.index - .map(Paths.get(root.getPath, _).toFile) + .map(ctx.docsPath.resolve(_).toFile) .filter(_.exists) .fold(emptyTemplate(rootDest, "index")) { f => val loaded = loadTemplateFile(f) @@ -36,13 +48,13 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite loaded }.copy(title = TemplateName.FilenameDefined(args.name)) - def loadChild(pathFromRoot: Path): Sidebar => LoadedTemplate = { + def loadChild(pathFromRoot: Path): Sidebar.Child => LoadedTemplate = { case Sidebar.Category(optionTitle, optionIndexPath, nested, dir) => val indexPageOpt = optionIndexPath .map(relativizeIfNeeded) .map(_.toFile) .filter(_.exists) - .map(loadTemplateFile) + .map(loadTemplateFile(_)) val title = ( optionTitle.map(TemplateName.SidebarDefined(_)) ++ indexPageOpt.map(_.title) @@ -70,18 +82,12 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite } LoadedTemplate(indexPage, children, categoryPath.resolve("index.html").toFile) - case Sidebar.Page(optionTitle, pagePath) => + case Sidebar.Page(optionTitle, pagePath, hidden) => val path = relativizeIfNeeded(pagePath) val file = path.toFile - val templateFile = loadTemplateFile(file) - val withUpdatedTitle = optionTitle.fold(templateFile) { t => templateFile.title match - case _: TemplateName.FilenameDefined => templateFile.copy(title = TemplateName.SidebarDefined(t)) - case _ => templateFile - } - LoadedTemplate(withUpdatedTitle, List.empty, pathFromRoot.resolve(file.getName).toFile) - case Sidebar.Root(_, _) => - // Cannot happen - ??? + val title = optionTitle.map(TemplateName.SidebarDefined(_)) + val templateFile = loadTemplateFile(file, title) + LoadedTemplate(templateFile, List.empty, pathFromRoot.resolve(file.getName).toFile, hidden) } val rootTemplate = LoadedTemplate(rootIndex, yamlRoot.pages.map(c => loadChild(ctx.docsPath)(c)) ++ loadBlog(), rootDest) val mappings = createMapping(rootTemplate) @@ -175,7 +181,7 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite val children = currRoot.listFiles.toList .filter(_.toPath != indexPageOpt.getOrElse(null)) - Some(LoadedTemplate(indexPage, children.flatMap(loadRecursively(_, destMappingFunc)), destMappingFunc(indexPage.file))) + Some(LoadedTemplate(indexPage, children.flatMap(loadRecursively(_, destMappingFunc)).sortBy(_.templateFile.title.name), destMappingFunc(indexPage.file))) } else if (currRoot.exists && ctx.siteExtensions.exists(ext => currRoot.getName.endsWith(ext))) { val templateFile = loadTemplateFile(currRoot) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/common.scala b/scaladoc/src/dotty/tools/scaladoc/site/common.scala index 6c7677729e89..e409fe4ae636 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/common.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/common.scala @@ -58,7 +58,7 @@ final val LineSeparator = "\n" def yamlParser(using ctx: StaticSiteContext): Parser = Parser.builder(defaultMarkdownOptions).build() -def loadTemplateFile(file: File)(using ctx: StaticSiteContext): TemplateFile = { +def loadTemplateFile(file: File, defaultTitle: Option[TemplateName] = None)(using ctx: StaticSiteContext): TemplateFile = { val lines = Files.readAllLines(file.toPath).asScala.toList val (config, content) = if (lines.head == ConfigSeparator) { @@ -105,7 +105,7 @@ def loadTemplateFile(file: File)(using ctx: StaticSiteContext): TemplateFile = { rawCode = content.mkString(LineSeparator), settings = settings, name = name, - title = stringSetting(allSettings, "title").map(TemplateName.YamlDefined(_)).getOrElse(TemplateName.FilenameDefined(name)), + title = stringSetting(allSettings, "title").map(TemplateName.YamlDefined(_)).orElse(defaultTitle).getOrElse(TemplateName.FilenameDefined(name)), hasFrame = !stringSetting(allSettings, "hasFrame").contains("false"), resources = (listSetting(allSettings, "extraCSS") ++ listSetting(allSettings, "extraJS")).flatten.toList, layout = stringSetting(allSettings, "layout"), diff --git a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala index ace8dd97a2e0..8d7cc04cfec6 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/templates.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/templates.scala @@ -115,25 +115,9 @@ case class TemplateFile( // Library requires mutable maps.. val mutableProperties = new JHashMap(ctx.properties.transform((_, v) => asJavaElement(v)).asJava) - val tag = new Tag("highlight"): - override def render(context: TemplateContext, nodes: Array[? <: LNode]): Object = - super.asString(nodes(0).render(context), context) match - case "diff" => - s"
${super.asString(nodes(1).render(context), context)}
\n\n" - case _ => - report.warn("Unsupported highlight value. Currenlty supported values are: `diff`", file)(using ssctx.outerCtx) - s"```${super.asString(nodes(1).render(context), context)}```\n\n" - - val tag2 = new Tag("link"): - override def render(context: TemplateContext, nodes: Array[? <: LNode]): Object = - super.asString(nodes(0).render(context), context) match - case sth => - report.warn(s"Unsupported link tag. Link to $sth can't be resolved", file)(using ssctx.outerCtx) - "/" - val parseSettings = ParseSettings.Builder().withFlavor(Flavor.JEKYLL).build() - val rendered = Template.parse(this.rawCode, parseSettings).`with`(tag).`with`(tag2).render(mutableProperties) + val rendered = Template.parse(this.rawCode, parseSettings).render(mutableProperties) // We want to render markdown only if next template is html val code = if (isHtml || layoutTemplate.exists(!_.isHtml)) rendered else diff --git a/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala index b40a7c9c5e52..2f9584c88b96 100644 --- a/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala @@ -8,7 +8,6 @@ import org.junit.Assert._ class SidebarParserTest: private val sidebar = """pages: - - title: Blog - title: My title page: my-page1.md - page: my-page2.md @@ -16,6 +15,7 @@ class SidebarParserTest: - title: Reference subsection: - page: my-page3.md + hidden: true - index: my-page4/index.md subsection: - page: my-page4/my-page4.md @@ -37,16 +37,15 @@ class SidebarParserTest: Sidebar.Root( None, List( - Sidebar.Page(Some("Blog"), ""), - Sidebar.Page(Some("My title"), "my-page1.md"), - Sidebar.Page(None, "my-page2.md"), - Sidebar.Page(None, "my-page3/subsection"), - Sidebar.Category(Some("Reference"), None, List(Sidebar.Page(None, "my-page3.md")), None), - Sidebar.Category(None, Some("my-page4/index.md"), List(Sidebar.Page(None, "my-page4/my-page4.md")), None), - Sidebar.Category(Some("My subsection"), Some("my-page5/index.md"), List(Sidebar.Page(None, "my-page5/my-page5.md")), None), - Sidebar.Category(None, None, List(Sidebar.Page(None, "my-page7/my-page7.md")), None), - Sidebar.Category(None, Some("my-page6/index.md"), List(Sidebar.Category(None, Some("my-page6/my-page6/index.md"), List(Sidebar.Page(None, "my-page6/my-page6/my-page6.md")), None)), None), + Sidebar.Page(Some("My title"), "my-page1.md", false), + Sidebar.Page(None, "my-page2.md", false), + Sidebar.Page(None, "my-page3/subsection", false), + Sidebar.Category(Some("Reference"), None, List(Sidebar.Page(None, "my-page3.md", true)), None), + Sidebar.Category(None, Some("my-page4/index.md"), List(Sidebar.Page(None, "my-page4/my-page4.md", false)), None), + Sidebar.Category(Some("My subsection"), Some("my-page5/index.md"), List(Sidebar.Page(None, "my-page5/my-page5.md", false)), None), + Sidebar.Category(None, None, List(Sidebar.Page(None, "my-page7/my-page7.md", false)), None), + Sidebar.Category(None, Some("my-page6/index.md"), List(Sidebar.Category(None, Some("my-page6/my-page6/index.md"), List(Sidebar.Page(None, "my-page6/my-page6/my-page6.md", false)), None)), None), ) ), - Sidebar.load(sidebar) + Sidebar.load(sidebar)(using testContext) ) From 338e73d17174713631f03b992b1997ba09eaea52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Thu, 10 Feb 2022 11:44:56 +0100 Subject: [PATCH 1180/1244] Change requests: Uniformize property names in YAML config --- docs/sidebar.yml | 5 +- scaladoc-testcases/docs/sidebar.yml | 4 +- .../tools/scaladoc/site/SidebarParser.scala | 53 +++++++---------- .../scaladoc/site/StaticSiteLoader.scala | 8 +-- .../scaladoc/site/SidebarParserTest.scala | 58 ++++++++++--------- 5 files changed, 61 insertions(+), 67 deletions(-) diff --git a/docs/sidebar.yml b/docs/sidebar.yml index e4e7b814c3ab..3322200acc32 100644 --- a/docs/sidebar.yml +++ b/docs/sidebar.yml @@ -1,6 +1,5 @@ -rootIndex: index.md -pages: - # - title: Blog +index: index.md +subsection: - title: Usage subsection: - page: usage/sbt-projects.md diff --git a/scaladoc-testcases/docs/sidebar.yml b/scaladoc-testcases/docs/sidebar.yml index 85b48870c8d4..51f8e87f2ad6 100644 --- a/scaladoc-testcases/docs/sidebar.yml +++ b/scaladoc-testcases/docs/sidebar.yml @@ -1,5 +1,5 @@ -rootIndex: index.md -pages: +index: index.md +subsection: - page: docs/f1.md - page: docs/f2.md - page: docs/f3.md diff --git a/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala b/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala index f383156a2b3d..9d793c403b2d 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/SidebarParser.scala @@ -9,24 +9,15 @@ import java.util.Optional import scala.beans._ enum Sidebar: - case Root(index: Option[String], pages: List[Sidebar.Child]) case Category( title: Option[String], indexPath: Option[String], - nested: List[Sidebar.Child], + nested: List[Sidebar], directory: Option[String] ) case Page(title: Option[String], pagePath: String, hidden: Boolean) object Sidebar: - - type Child = Category | Page - case class RawRoot(var rootIndex: String, var pages: JList[RawInput]): - def this() = this("", JList()) - - def setRootIndex(s: String) = rootIndex = s - def setPages(l: JList[RawInput]) = pages = l - case class RawInput( @BeanProperty var title: String, @BeanProperty var page: String, @@ -37,9 +28,9 @@ object Sidebar: ): def this() = this("", "", "", JList(), "", false) - private object RootTypeRef extends TypeReference[RawRoot] + private object RawInputTypeRef extends TypeReference[RawInput] - private def toSidebar(r: RawInput)(using CompilerContext): Sidebar.Child = r match + private def toSidebar(r: RawInput)(using CompilerContext): Sidebar = r match case RawInput(title, page, index, subsection, dir, hidden) if page.nonEmpty && index.isEmpty && subsection.isEmpty() => Sidebar.Page(Option.when(title.nonEmpty)(title), page, hidden) case RawInput(title, page, index, subsection, dir, hidden) if page.isEmpty && (!subsection.isEmpty() || !index.isEmpty()) => @@ -49,43 +40,43 @@ object Sidebar: Sidebar.Page(None, page, hidden) private def schemaMessage: String = - s"""Static site YAML configuration file should comply to the following description: - |rootIndex: # optional - |pages: - | - | + s"""Static site YAML configuration file should comply with the following description: + |The root element of static site needs to be + |`title` and `directory` properties are ignored in root subsection. | |: - | title: # optional - | index: # optional - | directory: # optional - | subsection: # optional + | title: # optional - Default value is file name. Title can be also set using front-matter. + | index: # optional - If not provided, default empty index template is generated. + | directory: # optional - By default, directory name is title name in kebab case. + | subsection: # optional - If not provided, pages are loaded from the index directory | - | | # either index or subsection needs to be present |: - | title: # optional + | title: # optional - Default value is file name. Title can be also set using front-matter. | page: - | hidden: # optional + | hidden: # optional - Default value is false. | |For more information visit: |https://docs.scala-lang.org/scala3/guides/scaladoc/static-site.html |""".stripMargin - def load(content: String | java.io.File)(using CompilerContext): Sidebar.Root = + def load(content: String | java.io.File)(using CompilerContext): Sidebar.Category = import scala.util.Try val mapper = ObjectMapper(YAMLFactory()) def readValue = content match - case s: String => mapper.readValue(s, RootTypeRef) - case f: java.io.File => mapper.readValue(f, RootTypeRef) + case s: String => mapper.readValue(s, RawInputTypeRef) + case f: java.io.File => mapper.readValue(f, RawInputTypeRef) - val root: RawRoot = Try(readValue) + val root: RawInput = Try(readValue) .fold( { e => report.warn(schemaMessage, e) - RawRoot("", java.util.Collections.emptyList()) + new RawInput() }, identity ) - - val rootIndex: String = root.rootIndex - val pages: List[Sidebar.Child] = root.pages.asScala.toList.map(toSidebar) - Sidebar.Root(Option.when(rootIndex.nonEmpty)(rootIndex), pages) + toSidebar(root) match + case c: Sidebar.Category => c + case _ => + report.error(s"Root element is not a subsection.\n$schemaMessage") + Sidebar.Category(None, None, List.empty, None) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala index 9ec6bf032ce4..0df7fa11c324 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala @@ -36,9 +36,9 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite * However, you can override default name by setting "directory" property of the subsection object. * */ - def loadBasedOnYaml(yamlRoot: Sidebar.Root): StaticSiteRoot = { + def loadBasedOnYaml(yamlRoot: Sidebar.Category): StaticSiteRoot = { val rootDest = ctx.docsPath.resolve("index.html").toFile - val rootIndex = yamlRoot.index + val rootIndex = yamlRoot.indexPath .map(ctx.docsPath.resolve(_).toFile) .filter(_.exists) .fold(emptyTemplate(rootDest, "index")) { f => @@ -48,7 +48,7 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite loaded }.copy(title = TemplateName.FilenameDefined(args.name)) - def loadChild(pathFromRoot: Path): Sidebar.Child => LoadedTemplate = { + def loadChild(pathFromRoot: Path): Sidebar => LoadedTemplate = { case Sidebar.Category(optionTitle, optionIndexPath, nested, dir) => val indexPageOpt = optionIndexPath .map(relativizeIfNeeded) @@ -89,7 +89,7 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite val templateFile = loadTemplateFile(file, title) LoadedTemplate(templateFile, List.empty, pathFromRoot.resolve(file.getName).toFile, hidden) } - val rootTemplate = LoadedTemplate(rootIndex, yamlRoot.pages.map(c => loadChild(ctx.docsPath)(c)) ++ loadBlog(), rootDest) + val rootTemplate = LoadedTemplate(rootIndex, yamlRoot.nested.map(c => loadChild(ctx.docsPath)(c)) ++ loadBlog(), rootDest) val mappings = createMapping(rootTemplate) StaticSiteRoot(rootTemplate, mappings) } diff --git a/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala b/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala index 2f9584c88b96..72fc6515fdee 100644 --- a/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/site/SidebarParserTest.scala @@ -7,36 +7,39 @@ import org.junit.Assert._ // TODO add negaitve and more details tests class SidebarParserTest: - private val sidebar = """pages: - - title: My title - page: my-page1.md - - page: my-page2.md - - page: my-page3/subsection - - title: Reference - subsection: - - page: my-page3.md - hidden: true - - index: my-page4/index.md - subsection: - - page: my-page4/my-page4.md - - title: My subsection - index: my-page5/index.md - subsection: - - page: my-page5/my-page5.md - - subsection: - - page: my-page7/my-page7.md - - index: my-page6/index.md - subsection: - - index: my-page6/my-page6/index.md - subsection: - - page: my-page6/my-page6/my-page6.md - """ + private val sidebar = + """index: index.md + |subsection: + | - title: My title + | page: my-page1.md + | - page: my-page2.md + | - page: my-page3/subsection + | - title: Reference + | subsection: + | - page: my-page3.md + | hidden: true + | - index: my-page4/index.md + | subsection: + | - page: my-page4/my-page4.md + | - title: My subsection + | index: my-page5/index.md + | subsection: + | - page: my-page5/my-page5.md + | - subsection: + | - page: my-page7/my-page7.md + | - index: my-page6/index.md + | subsection: + | - index: my-page6/my-page6/index.md + | subsection: + | - page: my-page6/my-page6/my-page6.md + """.stripMargin @Test def loadSidebar(): Unit = assertEquals( - Sidebar.Root( + Sidebar.Category( None, - List( + Some("index.md"), + List( Sidebar.Page(Some("My title"), "my-page1.md", false), Sidebar.Page(None, "my-page2.md", false), Sidebar.Page(None, "my-page3/subsection", false), @@ -45,7 +48,8 @@ class SidebarParserTest: Sidebar.Category(Some("My subsection"), Some("my-page5/index.md"), List(Sidebar.Page(None, "my-page5/my-page5.md", false)), None), Sidebar.Category(None, None, List(Sidebar.Page(None, "my-page7/my-page7.md", false)), None), Sidebar.Category(None, Some("my-page6/index.md"), List(Sidebar.Category(None, Some("my-page6/my-page6/index.md"), List(Sidebar.Page(None, "my-page6/my-page6/my-page6.md", false)), None)), None), - ) + ), + None ), Sidebar.load(sidebar)(using testContext) ) From 0da41f6b99e5459b71d9ebe852bd33912570488a Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Fri, 11 Feb 2022 17:35:34 +0100 Subject: [PATCH 1181/1244] Fix explain rendering with Windows EOL --- compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala index 813475799a2b..76e19e06463a 100644 --- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala +++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala @@ -254,7 +254,7 @@ trait MessageRendering { sb.append(EOL).append(newBox()) sb.append(EOL).append(offsetBox).append(" Explanation (enabled by `-explain`)") sb.append(EOL).append(newBox(soft = true)) - dia.msg.explanation.split(EOL).foreach { line => + dia.msg.explanation.split(raw"\R").foreach { line => sb.append(EOL).append(offsetBox).append(if line.isEmpty then "" else " ").append(line) } sb.append(EOL).append(endBox) From b24de890a37466149b9d2b8eff29c9453b1ba36f Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 11 Feb 2022 18:12:16 +0000 Subject: [PATCH 1182/1244] Fix backend assertion when using an exported enum An exported enum is a final method of the enum object. When selecting an inner enum case from it, that method will be the prefix. The method doesn't have a type symbol, we have to widen to method type and reach for its result type before we can get a handle on the type symbol to key off of. I wonder whether this widening and going to the result type is something that should happen during Erasure's denotation transformation though... Co-authored-by: Seth Tisue --- .../tools/backend/jvm/BCodeBodyBuilder.scala | 2 +- tests/pos/i13490.scala | 17 +++++++++++++++++ tests/run/i13490.min.scala | 13 +++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 tests/pos/i13490.scala create mode 100644 tests/run/i13490.min.scala diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala index 96ae4e8a00af..6516d32b6518 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala @@ -390,7 +390,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder { def genLoadQualUnlessElidable(): Unit = { if (!qualSafeToElide) { genLoadQualifier(tree) } } // receiverClass is used in the bytecode to access the field. using sym.owner may lead to IllegalAccessError - def receiverClass = qualifier.tpe.typeSymbol + def receiverClass = qualifier.tpe.widenTermRefExpr.finalResultType.typeSymbol if (sym.is(Module)) { genLoadQualUnlessElidable() genLoadModule(tree) diff --git a/tests/pos/i13490.scala b/tests/pos/i13490.scala new file mode 100644 index 000000000000..c8f3213e0649 --- /dev/null +++ b/tests/pos/i13490.scala @@ -0,0 +1,17 @@ +object MyApi { + enum MyEnum(a: Int) { + case A extends MyEnum(1) + } + case class Foo(a: MyEnum) +} + +object Test { + export MyApi.* + import MyEnum.* + Foo(MyEnum.A) match { + case Foo(a) => + a match { + case A => + } + } +} diff --git a/tests/run/i13490.min.scala b/tests/run/i13490.min.scala new file mode 100644 index 000000000000..4f9c19764a5d --- /dev/null +++ b/tests/run/i13490.min.scala @@ -0,0 +1,13 @@ +object MyTypes: + enum MyEnum: + case Foo + case Bar + +object MyApi: + export MyTypes.* + +object MyUse: + import MyApi.MyEnum.Foo + def foo = Foo + +@main def Test = assert(MyUse.foo.toString == "Foo") From 09f325d7dba2758f9e2c43c07ec79e7983e9b329 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sat, 12 Feb 2022 19:52:59 +0100 Subject: [PATCH 1183/1244] Alternative fix based on tpd.desugarIdent --- compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala | 2 +- compiler/src/dotty/tools/dotc/ast/tpd.scala | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala index 6516d32b6518..96ae4e8a00af 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala @@ -390,7 +390,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder { def genLoadQualUnlessElidable(): Unit = { if (!qualSafeToElide) { genLoadQualifier(tree) } } // receiverClass is used in the bytecode to access the field. using sym.owner may lead to IllegalAccessError - def receiverClass = qualifier.tpe.widenTermRefExpr.finalResultType.typeSymbol + def receiverClass = qualifier.tpe.typeSymbol if (sym.is(Module)) { genLoadQualUnlessElidable() genLoadModule(tree) diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index 98ea6e0c5c44..396d85a8c58a 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -1383,7 +1383,11 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { /** Recover identifier prefix (e.g. this) if it exists */ def desugarIdentPrefix(tree: Ident)(using Context): Tree = tree.tpe match { case TermRef(prefix: TermRef, _) => - ref(prefix) + prefix.info match + case mt: MethodType if mt.paramInfos.isEmpty && mt.resultType.typeSymbol.is(Module) => + ref(mt.resultType.typeSymbol.sourceModule) + case _ => + ref(prefix) case TermRef(prefix: ThisType, _) => This(prefix.cls) case _ => From bfb103b79feadea6c74ad612a52e62e8885ad5fd Mon Sep 17 00:00:00 2001 From: Xavientois Date: Sun, 13 Feb 2022 11:12:48 -0500 Subject: [PATCH 1184/1244] Reposition assertion to respect safe initialization Passing `this` to `assert` before object members are fully initialized does not pass safe init check: ``` [error] -- Error: library/src/scala/runtime/stdLibPatches/Predef.scala:7:64 ------------ [error] 7 | if !assertion then scala.runtime.Scala3RunTime.assertFailed(message) [error] | ^^^^^^^ [error] |Cannot prove that the value is fully initialized. Only initialized values may be used as arguments. ``` This change fixes the above error. Review by @liufengyun --- compiler/src/dotty/tools/dotc/core/Types.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 0f7e87213d08..b4a6172a6659 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -3877,9 +3877,6 @@ object Types { val paramInfos: List[TypeBounds] = paramInfosExp(this) val resType: Type = resultTypeExp(this) - assert(resType.isInstanceOf[TermType], this) - assert(paramNames.nonEmpty) - private def setVariances(tparams: List[LambdaParam], vs: List[Variance]): Unit = if tparams.nonEmpty then tparams.head.declaredVariance = vs.head @@ -3931,6 +3928,9 @@ object Types { if isDeclaredVarianceLambda then s"HKTypeLambda($paramNames, $paramInfos, $resType, ${declaredVariances.map(_.flagsString)})" else super.toString + + assert(resType.isInstanceOf[TermType], this) + assert(paramNames.nonEmpty) } /** The type of a polymorphic method. It has the same form as HKTypeLambda, From 4d411564d0efc608e54236dc1ff43d8e5ffa56a8 Mon Sep 17 00:00:00 2001 From: Xavientois Date: Sat, 12 Feb 2022 21:15:52 -0500 Subject: [PATCH 1185/1244] Fix safe-init error in MegaPhase When bootstrapping the compiler with the `-Ysafe-init` flag, we would get the following error: ``` [error] -- Error: /Users/rrampersad/Documents/school/URA/dotty/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala:458:7 [error] 458 | for ((phase, idx) <- miniPhases.zipWithIndex) { [error] | ^ [error] |Cannot prove that the value is fully initialized. Only initialized values may be used as arguments. [error] | [error] |The unsafe promotion may cause the following problem: [error] |Cannot prove that the value is fully initialized. May only assign fully initialized value. [error] 459 | phase.superPhase = this [error] 460 | phase.idxInGroup = idx [error] 461 | } ``` This fixes the initialization order to address this error. --- .../src/dotty/tools/dotc/transform/MegaPhase.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala index 1d8a2d6b9eee..56342322824c 100644 --- a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala +++ b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala @@ -455,11 +455,6 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase { // Initialization code - for ((phase, idx) <- miniPhases.zipWithIndex) { - phase.superPhase = this - phase.idxInGroup = idx - } - /** Class#getDeclaredMethods is slow, so we cache its output */ private val clsMethodsCache = new java.util.IdentityHashMap[Class[?], Array[java.lang.reflect.Method]] @@ -564,6 +559,11 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase { private val nxOtherPrepPhase = init("prepareForOther") private val nxOtherTransPhase = init("transformOther") + for ((phase, idx) <- miniPhases.zipWithIndex) { + phase.superPhase = this + phase.idxInGroup = idx + } + // Boilerplate snippets def prepIdent(tree: Ident, start: Int)(using Context): Context = { From 6d1a99042861ec0eddce33d50309f9c6df9fc0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Mon, 14 Feb 2022 09:15:23 +0100 Subject: [PATCH 1186/1244] Scaladoc: Repair links --- docs/_docs/index.md | 1 + docs/sidebar.yml | 4 ++++ scaladoc/src/dotty/tools/scaladoc/site/common.scala | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/_docs/index.md b/docs/_docs/index.md index 8fe7ce938186..839d14d16308 100644 --- a/docs/_docs/index.md +++ b/docs/_docs/index.md @@ -1,5 +1,6 @@ --- layout: doc-page +redirectFrom: docs/index.html --- Dotty is the project name for technologies that are considered for inclusion in Scala 3. Scala has diff --git a/docs/sidebar.yml b/docs/sidebar.yml index 3322200acc32..101de48b79bf 100644 --- a/docs/sidebar.yml +++ b/docs/sidebar.yml @@ -1,6 +1,7 @@ index: index.md subsection: - title: Usage + directory: docs/usage subsection: - page: usage/sbt-projects.md - page: usage/ide-support.md @@ -15,6 +16,7 @@ subsection: - page: usage/scaladoc/site-versioning.md - page: usage/scaladoc/static-site.md - title: Reference + directory: docs/reference subsection: - page: reference/overview.md - title: New Types @@ -154,6 +156,7 @@ subsection: - page: reference/soft-modifier.md - page: reference/features-classification.md - title: Contributing + directory: docs/contributing subsection: - page: contributing/contribute-knowledge.md - page: contributing/getting-started.md @@ -171,6 +174,7 @@ subsection: - page: contributing/procedures/release.md - page: contributing/procedures/vulpix.md - title: Internals + directory: docs/internals subsection: - page: internals/backend.md - page: internals/classpaths.md diff --git a/scaladoc/src/dotty/tools/scaladoc/site/common.scala b/scaladoc/src/dotty/tools/scaladoc/site/common.scala index e409fe4ae636..e93a5a62cb63 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/common.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/common.scala @@ -18,7 +18,7 @@ import com.vladsch.flexmark.formatter.Formatter import scala.collection.JavaConverters._ -val docsRootDRI: DRI = DRI(location = "docs/index", symbolUUID = staticFileSymbolUUID) +val docsRootDRI: DRI = DRI(location = "_docs/index", symbolUUID = staticFileSymbolUUID) val apiPageDRI: DRI = DRI(location = "api/index") def defaultMarkdownOptions(using ctx: StaticSiteContext): DataHolder = From 303d5198528f6cd07e71c9ddd2da68cc57418338 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 14 Feb 2022 09:14:31 +0100 Subject: [PATCH 1187/1244] Document that inline methods are not eta expanded Fixes #14449 --- docs/_docs/reference/metaprogramming/inline.md | 11 +++++++++++ tests/pos/reference/inlines.scala | 2 ++ 2 files changed, 13 insertions(+) diff --git a/docs/_docs/reference/metaprogramming/inline.md b/docs/_docs/reference/metaprogramming/inline.md index 8ccef49872b7..c625f4774a18 100644 --- a/docs/_docs/reference/metaprogramming/inline.md +++ b/docs/_docs/reference/metaprogramming/inline.md @@ -90,6 +90,17 @@ semantics, by binding the value and reusing the `msg` through the body of `factorial`. Also, note the special handling of the assignment to the private var `indent`. It is achieved by generating a setter method `def inline$indent_=` and calling it instead. +Inline methods always have to be fully applied. For instance, a call to +```scala +Logger.log[String]("some op", indentSetting) +``` +would be ill-formed and the compiler would complain that arguments are missing. +However, it is possible to pass wildcard arguments instead. For instance, +```scala +Logger.log[String]("some op", indentSetting)(_) +``` +would typecheck. + ### Recursive Inline Methods Inline methods can be recursive. For instance, when called with a constant diff --git a/tests/pos/reference/inlines.scala b/tests/pos/reference/inlines.scala index a1eb215b4d22..657961671efd 100644 --- a/tests/pos/reference/inlines.scala +++ b/tests/pos/reference/inlines.scala @@ -41,6 +41,8 @@ object Test{ } } + val x = log[String]("some op", indentSetting)(_) + def main(args: Array[String]): Unit = println(factorial(33)) } From 35e5df66a1f7e6879762da9a3bcd75fba4af12e0 Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Fri, 11 Feb 2022 16:21:30 +0100 Subject: [PATCH 1188/1244] =?UTF-8?q?Avoid=20using=20=C2=B7=20character?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dotc/reporting/MessageRendering.scala | 9 +-- tests/neg-custom-args/i11637.check | 8 +-- tests/neg-macros/i11386.check | 8 +-- tests/neg-macros/i13991.check | 6 +- tests/neg-macros/i6976.check | 4 +- tests/neg-macros/ill-abort.check | 4 +- .../neg-macros/macro-class-not-found-1.check | 4 +- .../neg-macros/macro-class-not-found-2.check | 4 +- tests/neg/cannot-reduce-inline-match.check | 4 +- tests/neg/i11225.check | 4 +- tests/neg/i13044.check | 68 +++++++++---------- tests/neg/i13570.check | 4 +- tests/neg/i13991.check | 6 +- tests/neg/inline-error-pos.check | 4 +- tests/neg/summonInline.check | 8 +-- 15 files changed, 73 insertions(+), 72 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala index 76e19e06463a..c2ddd535b728 100644 --- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala +++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala @@ -116,26 +116,27 @@ trait MessageRendering { * ``` * Or if there `soft` is true, * ``` - * |··············· + * |- - - - - - - - * ``` */ private def newBox(soft: Boolean = false)(using Context, Level, Offset): String = val pageWidth = ctx.settings.pageWidth.value val prefix = " " * (offset - 1) - val line = (if soft then "·" else "-") * (pageWidth - offset) + val lineWidth = (pageWidth - offset) + val line = if soft then ("- " * ((lineWidth + 1) / 2)).trim else "-" * lineWidth hl(s"$prefix|$line") /** The end of a box section * * ``` - * ·---------------- + * ---------------- * ``` */ private def endBox(using Context, Level, Offset): String = val pageWidth = ctx.settings.pageWidth.value val prefix = " " * (offset - 1) val line = "-" * (pageWidth - offset) - hl(s"${prefix}·$line") + hl(s"${prefix} $line") /** The error message (`msg`) aligned under `pos` * diff --git a/tests/neg-custom-args/i11637.check b/tests/neg-custom-args/i11637.check index 41c49d81e9d0..0664a05f4f86 100644 --- a/tests/neg-custom-args/i11637.check +++ b/tests/neg-custom-args/i11637.check @@ -4,7 +4,7 @@ | Type argument test2.FunctorImpl does not conform to upper bound [Generic2[T <: String] <: Set[T]] =>> Any |-------------------------------------------------------------------------------------------------------------------- | Explanation (enabled by `-explain`) - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | I tried to show that | test2.FunctorImpl | conforms to @@ -25,14 +25,14 @@ | <== test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any = false | | The tests were made under the empty constraint - ·-------------------------------------------------------------------------------------------------------------------- + -------------------------------------------------------------------------------------------------------------------- -- [E057] Type Mismatch Error: tests/neg-custom-args/i11637.scala:11:21 ------------------------------------------------ 11 | var h = new HKT3_1[FunctorImpl](); // error // error | ^ | Type argument test2.FunctorImpl does not conform to upper bound [Generic2[T <: String] <: Set[T]] =>> Any |-------------------------------------------------------------------------------------------------------------------- | Explanation (enabled by `-explain`) - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | I tried to show that | test2.FunctorImpl | conforms to @@ -53,4 +53,4 @@ | <== test2.FunctorImpl <: [Generic2[T <: String] <: Set[T]] =>> Any = false | | The tests were made under the empty constraint - ·-------------------------------------------------------------------------------------------------------------------- + -------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/i11386.check b/tests/neg-macros/i11386.check index 1cce199159a5..f74ea5b7ff20 100644 --- a/tests/neg-macros/i11386.check +++ b/tests/neg-macros/i11386.check @@ -5,19 +5,19 @@ | test |--------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from Test_2.scala:6 7 | notNull(i) | ^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + --------------------------------------------------------------------------------------------------------------------- -- Error: tests/neg-macros/i11386/Test_2.scala:8:20 -------------------------------------------------------------------- 8 | dummy(int2String(0)) // error | ^^^^^^^^^^^^^ | test |--------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from Test_2.scala:8 7 | notNull(i) | ^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + --------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/i13991.check b/tests/neg-macros/i13991.check index 15f45af227e5..ca9f924a6693 100644 --- a/tests/neg-macros/i13991.check +++ b/tests/neg-macros/i13991.check @@ -5,12 +5,12 @@ | Error |--------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from Test_2.scala:3 3 | inline def v2 = InlineMac.sample("foo") | ^^^^^ - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from Test_2.scala:3 3 | inline def v2 = InlineMac.sample("foo") | ^^^^^^^^^^^^^^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + --------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/i6976.check b/tests/neg-macros/i6976.check index b67f05960a79..0c30aa856ed1 100644 --- a/tests/neg-macros/i6976.check +++ b/tests/neg-macros/i6976.check @@ -8,8 +8,8 @@ | |--------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from Macro_1.scala:6 6 | inline def mcr(x: => Any) = ${mcrImpl('x)} | ^^^^^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + --------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/ill-abort.check b/tests/neg-macros/ill-abort.check index 2aa9d3396e53..2f76c89d88dd 100644 --- a/tests/neg-macros/ill-abort.check +++ b/tests/neg-macros/ill-abort.check @@ -5,8 +5,8 @@ |Macro expansion was aborted by the macro without any errors reported. Macros should issue errors to end-users to facilitate debugging when aborting a macro expansion. |--------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from quoted_1.scala:3 3 |inline def fail(): Unit = ${ impl } | ^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + --------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/macro-class-not-found-1.check b/tests/neg-macros/macro-class-not-found-1.check index 08ba5b99f0b8..f16aac4efe3e 100644 --- a/tests/neg-macros/macro-class-not-found-1.check +++ b/tests/neg-macros/macro-class-not-found-1.check @@ -7,8 +7,8 @@ | |--------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from Foo.scala:5 5 | inline def myMacro(): Unit = ${ aMacroImplementation } | ^^^^^^^^^^^^^^^^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + --------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg-macros/macro-class-not-found-2.check b/tests/neg-macros/macro-class-not-found-2.check index d4ed8f222ba0..3665ea1a9431 100644 --- a/tests/neg-macros/macro-class-not-found-2.check +++ b/tests/neg-macros/macro-class-not-found-2.check @@ -7,8 +7,8 @@ | |--------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from Foo.scala:5 5 | inline def myMacro(): Unit = ${ aMacroImplementation } | ^^^^^^^^^^^^^^^^^^^^^^^^^ - ·--------------------------------------------------------------------------------------------------------------------- + --------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/cannot-reduce-inline-match.check b/tests/neg/cannot-reduce-inline-match.check index e35066949333..10ffaecbd2e8 100644 --- a/tests/neg/cannot-reduce-inline-match.check +++ b/tests/neg/cannot-reduce-inline-match.check @@ -6,10 +6,10 @@ | patterns : case _:Int |--------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from cannot-reduce-inline-match.scala:3 3 | inline x match { | ^ 4 | case _: Int => 5 | } - ·--------------------------------------------------------------------------------------------------------------------- + --------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i11225.check b/tests/neg/i11225.check index 0aa5f720e24b..c0f74bc04a14 100644 --- a/tests/neg/i11225.check +++ b/tests/neg/i11225.check @@ -44,8 +44,8 @@ | `uninitialized` can only be used as the right hand side of a mutable field definition |-------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i11225.scala:25 25 | transparent inline def uni = uninitialized | ^^^^^^^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + -------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13044.check b/tests/neg/i13044.check index b3e278792148..c5584aadf767 100644 --- a/tests/neg/i13044.check +++ b/tests/neg/i13044.check @@ -6,71 +6,71 @@ | Try increasing `-Xmax-inlines` above 32 |-------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] | ^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 31 | lazy val fields = recurse[m.MirroredElemTypes] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 37 | inline given gen[A]: Schema[A] = derived | ^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] | ^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 31 | lazy val fields = recurse[m.MirroredElemTypes] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 37 | inline given gen[A]: Schema[A] = derived | ^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] | ^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 31 | lazy val fields = recurse[m.MirroredElemTypes] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 37 | inline given gen[A]: Schema[A] = derived | ^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] | ^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 31 | lazy val fields = recurse[m.MirroredElemTypes] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 37 | inline given gen[A]: Schema[A] = derived | ^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] | ^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 18 | builder :: recurse[ts] | ^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 31 | lazy val fields = recurse[m.MirroredElemTypes] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:17 37 | inline given gen[A]: Schema[A] = derived | ^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + -------------------------------------------------------------------------------------------------------------------- -- Error: tests/neg/i13044.scala:50:40 --------------------------------------------------------------------------------- 50 | implicit def typeSchema: Schema[A] = Schema.gen // error // error | ^^^^^^^^^^ @@ -79,68 +79,68 @@ | Try increasing `-Xmax-inlines` above 32 |-------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 18 | builder :: recurse[ts] | ^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 31 | lazy val fields = recurse[m.MirroredElemTypes] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 37 | inline given gen[A]: Schema[A] = derived | ^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] | ^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 31 | lazy val fields = recurse[m.MirroredElemTypes] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 37 | inline given gen[A]: Schema[A] = derived | ^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] | ^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 31 | lazy val fields = recurse[m.MirroredElemTypes] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 37 | inline given gen[A]: Schema[A] = derived | ^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] | ^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 31 | lazy val fields = recurse[m.MirroredElemTypes] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 37 | inline given gen[A]: Schema[A] = derived | ^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 17 | val builder = summonInline[Schema[t]].asInstanceOf[Schema[Any]] | ^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 18 | builder :: recurse[ts] | ^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 31 | lazy val fields = recurse[m.MirroredElemTypes] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13044.scala:18 37 | inline given gen[A]: Schema[A] = derived | ^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + -------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13570.check b/tests/neg/i13570.check index cf1649b5f4a6..9c7edc6fdfe0 100644 --- a/tests/neg/i13570.check +++ b/tests/neg/i13570.check @@ -8,11 +8,11 @@ | case _ |--------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13570.scala:3 3 | inline seq match | ^ 4 | case s: Seq[Int] if s.isEmpty => println("seq is empty") 5 | case s: Seq[Int] => println("seq is not empty") 6 | case _ => println("somthing hinky happened") - ·--------------------------------------------------------------------------------------------------------------------- + --------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/i13991.check b/tests/neg/i13991.check index fd092b759c2b..009e116f95b1 100644 --- a/tests/neg/i13991.check +++ b/tests/neg/i13991.check @@ -4,12 +4,12 @@ | no implicit argument of type Foo[String] was found |-------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13991.scala:8 8 | compiletime.summonInline[Foo[A]].foo | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from i13991.scala:8 11 | second[A] + 42 // after line 10 to test alignment of the error message `|` | ^^^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + -------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/inline-error-pos.check b/tests/neg/inline-error-pos.check index 1d65175c6c39..5d2225903a8d 100644 --- a/tests/neg/inline-error-pos.check +++ b/tests/neg/inline-error-pos.check @@ -6,9 +6,9 @@ | patterns : case 1 |--------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |····················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from inline-error-pos.scala:3 3 | inline x match | ^ 4 | case 1 => 9 - ·--------------------------------------------------------------------------------------------------------------------- + --------------------------------------------------------------------------------------------------------------------- diff --git a/tests/neg/summonInline.check b/tests/neg/summonInline.check index db9b6968ee43..6c3839266ce4 100644 --- a/tests/neg/summonInline.check +++ b/tests/neg/summonInline.check @@ -4,19 +4,19 @@ | Missing One |-------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from summonInline.scala:15 15 | case 1 => summonInline[Missing1] | ^^^^^^^^^^^^^^^^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + -------------------------------------------------------------------------------------------------------------------- -- Error: tests/neg/summonInline.scala:20:32 --------------------------------------------------------------------------- 20 |val missing2 = summonInlineCheck(2) // error | ^^^^^^^^^^^^^^^^^^^^ | Missing Two |-------------------------------------------------------------------------------------------------------------------- |Inline stack trace - |···················································································································· + |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |This location contains code that was inlined from summonInline.scala:16 16 | case 2 => summonInline[Missing2] | ^^^^^^^^^^^^^^^^^^^^^^ - ·-------------------------------------------------------------------------------------------------------------------- + -------------------------------------------------------------------------------------------------------------------- From 17653ecc1254c51d9ac029eee3fa30d2bd204df7 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Tue, 8 Feb 2022 19:01:27 +0100 Subject: [PATCH 1189/1244] Fix #11008: Support generic tuples as a valid unapply result --- .../tools/dotc/transform/PatternMatcher.scala | 18 +++++++++++------- .../dotty/tools/dotc/typer/Applications.scala | 12 ++++++++++++ tests/run/i11008.check | 2 ++ tests/run/i11008.scala | 13 +++++++++++++ 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 tests/run/i11008.check create mode 100644 tests/run/i11008.scala diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala index d740cb4053e2..0d29dbce6321 100644 --- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -8,7 +8,7 @@ import collection.mutable import Symbols._, Contexts._, Types._, StdNames._, NameOps._ import ast.Trees._ import util.Spans._ -import typer.Applications.{isProductMatch, isGetMatch, isProductSeqMatch, productSelectors, productArity, unapplySeqTypeElemTp} +import typer.Applications.* import SymUtils._ import Flags._, Constants._ import Decorators._ @@ -329,15 +329,16 @@ object PatternMatcher { def isSyntheticScala2Unapply(sym: Symbol) = sym.isAllOf(SyntheticCase) && sym.owner.is(Scala2x) + def tupleApp(i: Int, receiver: Tree) = // manually inlining the call to NonEmptyTuple#apply, because it's an inline method + ref(defn.RuntimeTuplesModule) + .select(defn.RuntimeTuples_apply) + .appliedTo(receiver, Literal(Constant(i))) + .cast(args(i).tpe.widen) + if (isSyntheticScala2Unapply(unapp.symbol) && caseAccessors.length == args.length) def tupleSel(sym: Symbol) = ref(scrutinee).select(sym) - def tupleApp(i: Int) = // manually inlining the call to NonEmptyTuple#apply, because it's an inline method - ref(defn.RuntimeTuplesModule) - .select(defn.RuntimeTuples_apply) - .appliedTo(ref(scrutinee), Literal(Constant(i))) - .cast(args(i).tpe.widen) val isGenericTuple = defn.isTupleClass(caseClass) && !defn.isTupleNType(tree.tpe) - val components = if isGenericTuple then caseAccessors.indices.toList.map(tupleApp) else caseAccessors.map(tupleSel) + val components = if isGenericTuple then caseAccessors.indices.toList.map(tupleApp(_, ref(scrutinee))) else caseAccessors.map(tupleSel) matchArgsPlan(components, args, onSuccess) else if (unapp.tpe <:< (defn.BooleanType)) TestPlan(GuardTest, unapp, unapp.span, onSuccess) @@ -349,6 +350,9 @@ object PatternMatcher { .map(ref(unappResult).select(_)) matchArgsPlan(selectors, args, onSuccess) } + else if unappResult.info <:< defn.NonEmptyTupleTypeRef then + val components = (0 until foldApplyTupleType(unappResult.denot.info).length).toList.map(tupleApp(_, ref(unappResult))) + matchArgsPlan(components, args, onSuccess) else if (isUnapplySeq && isProductSeqMatch(unapp.tpe.widen, args.length, unapp.srcPos)) { val arity = productArity(unapp.tpe.widen, unapp.srcPos) unapplyProductSeqPlan(unappResult, args, arity) diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala index 6592afe03da5..f854fd691201 100644 --- a/compiler/src/dotty/tools/dotc/typer/Applications.scala +++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala @@ -193,10 +193,22 @@ object Applications { productSelectorTypes(unapplyResult, pos) // this will cause a "wrong number of arguments in pattern" error later on, // which is better than the message in `fail`. + else if unapplyResult.derivesFrom(defn.NonEmptyTupleClass) then + foldApplyTupleType(unapplyResult) else fail } } + def foldApplyTupleType(tp: Type)(using Context): List[Type] = + object tupleFold extends TypeAccumulator[List[Type]]: + override def apply(accum: List[Type], t: Type): List[Type] = + t match + case AppliedType(tycon, x :: x2 :: Nil) if tycon.typeSymbol == defn.PairClass => + apply(x :: accum, x2) + case x => foldOver(accum, x) + end tupleFold + tupleFold(Nil, tp).reverse + def wrapDefs(defs: mutable.ListBuffer[Tree], tree: Tree)(using Context): Tree = if (defs != null && defs.nonEmpty) tpd.Block(defs.toList, tree) else tree diff --git a/tests/run/i11008.check b/tests/run/i11008.check new file mode 100644 index 000000000000..3be25c0dc8dd --- /dev/null +++ b/tests/run/i11008.check @@ -0,0 +1,2 @@ +hello +hello and 10 diff --git a/tests/run/i11008.scala b/tests/run/i11008.scala new file mode 100644 index 000000000000..dfe6be288d7a --- /dev/null +++ b/tests/run/i11008.scala @@ -0,0 +1,13 @@ +object A: + def unapply(s: String): String *: EmptyTuple = Tuple1(s) + +object B: + def unapply(s:String): String *: Int *: EmptyTuple = Tuple2(s, 10) + +@main def Test = + "hello" match + case A(x) => + println(x) + "hello" match + case B(x, y) => + println(s"$x and $y") From ab4c803b891f647a66484738eb1f590980a7589d Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Thu, 10 Feb 2022 12:26:02 +0100 Subject: [PATCH 1190/1244] Support generic tuples as a valid unapplySeq return type --- .../src/dotty/tools/dotc/transform/PatternMatcher.scala | 6 +++--- compiler/src/dotty/tools/dotc/typer/Applications.scala | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala index 0d29dbce6321..21aa331367ca 100644 --- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -350,9 +350,6 @@ object PatternMatcher { .map(ref(unappResult).select(_)) matchArgsPlan(selectors, args, onSuccess) } - else if unappResult.info <:< defn.NonEmptyTupleTypeRef then - val components = (0 until foldApplyTupleType(unappResult.denot.info).length).toList.map(tupleApp(_, ref(unappResult))) - matchArgsPlan(components, args, onSuccess) else if (isUnapplySeq && isProductSeqMatch(unapp.tpe.widen, args.length, unapp.srcPos)) { val arity = productArity(unapp.tpe.widen, unapp.srcPos) unapplyProductSeqPlan(unappResult, args, arity) @@ -360,6 +357,9 @@ object PatternMatcher { else if (isUnapplySeq && unapplySeqTypeElemTp(unapp.tpe.widen.finalResultType).exists) { unapplySeqPlan(unappResult, args) } + else if unappResult.info <:< defn.NonEmptyTupleTypeRef then + val components = (0 until foldApplyTupleType(unappResult.denot.info).length).toList.map(tupleApp(_, ref(unappResult))) + matchArgsPlan(components, args, onSuccess) else { assert(isGetMatch(unapp.tpe)) val argsPlan = { diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala index f854fd691201..1e324de33675 100644 --- a/compiler/src/dotty/tools/dotc/typer/Applications.scala +++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala @@ -173,6 +173,7 @@ object Applications { val elemTp = unapplySeqTypeElemTp(tp) if (elemTp.exists) args.map(Function.const(elemTp)) else if (isProductSeqMatch(tp, args.length, pos)) productSeqSelectors(tp, args.length, pos) + else if tp.derivesFrom(defn.NonEmptyTupleClass) then foldApplyTupleType(tp) else fallback } From 09c2a6f2e106aebce57515208954e3358b6ddc4c Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Mon, 14 Feb 2022 14:34:13 +0100 Subject: [PATCH 1191/1244] Add test for the generic tuples as result types of unapplySeq --- tests/run/i11008b.check | 1 + tests/run/i11008b.scala | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 tests/run/i11008b.check create mode 100644 tests/run/i11008b.scala diff --git a/tests/run/i11008b.check b/tests/run/i11008b.check new file mode 100644 index 000000000000..c0c7fc09b324 --- /dev/null +++ b/tests/run/i11008b.check @@ -0,0 +1 @@ +Many 3 characters List(f, o, o) \ No newline at end of file diff --git a/tests/run/i11008b.scala b/tests/run/i11008b.scala new file mode 100644 index 000000000000..f5c8a69c7b48 --- /dev/null +++ b/tests/run/i11008b.scala @@ -0,0 +1,7 @@ +object Foo: + def unapplySeq(x: String): Int *: Seq[String] *: EmptyTuple = (x.length, x.toList.map(_.toString)) + +@main def Test = + "foo" match + case Foo(1, c) => println("One character " + c) + case Foo(x, xs*) => println(s"Many $x characters $xs") From d66801398fca4d0ff2b97c3117421dfeded809be Mon Sep 17 00:00:00 2001 From: Xavientois Date: Sun, 13 Feb 2022 09:14:05 -0500 Subject: [PATCH 1192/1244] Supress safe initialization warning in Run class Due to the `this` pointer being passed to `start.setRun` in a function called during initialization, the initialization checker cannot prove that `this` is fully initialized. We would get the following error: ``` [error] -- Error: /*******/dotty/compiler/src/dotty/tools/dotc/Run.scala:84:17 [error] 84 | start.setRun(this) [error] | ^^^^ [error] |Cannot prove that the value is fully initialized. Only initialized values may be used as arguments. Calling trace: [error] | -> val run = new Run(this, initCtx) { [ ReplCompiler.scala:42 ] [error] | -> class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with ConstraintRunInfo {iler-b[ Run.scala:38 ] [error] | -> private var myCtx = rootContext(using ictx) [ Run.scala:89 ] [error] | -> val rootCtx = super.rootContext.fresh [ ReplCompiler.scala:62 ] ``` The call to `start.setRun` stores the reference to `this` in a store without accessing any of its fields. The instance of `Run` referrred to by `this` will be fully initialized immediately after that function call. Thus, we are able to safely mark `this` as `@unchecked` without worrying about uninitialized members of the `Run` instance being accessed. Review by @liufengyun --- compiler/src/dotty/tools/dotc/Run.scala | 69 +++++++++++++------------ 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala index 9f7036f64255..a258036466ff 100644 --- a/compiler/src/dotty/tools/dotc/Run.scala +++ b/compiler/src/dotty/tools/dotc/Run.scala @@ -57,41 +57,8 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint */ @volatile var isCancelled = false - /** Produces the following contexts, from outermost to innermost - * - * bootStrap: A context with next available runId and a scope consisting of - * the RootPackage _root_ - * start A context with RootClass as owner and the necessary initializations - * for type checking. - * imports For each element of RootImports, an import context - */ - protected def rootContext(using Context): Context = { - ctx.initialize() - ctx.base.setPhasePlan(comp.phases) - val rootScope = new MutableScope(0) - val bootstrap = ctx.fresh - .setPeriod(Period(comp.nextRunId, FirstPhaseId)) - .setScope(rootScope) - rootScope.enter(ctx.definitions.RootPackage)(using bootstrap) - var start = bootstrap.fresh - .setOwner(defn.RootClass) - .setTyper(new Typer) - .addMode(Mode.ImplicitsEnabled) - .setTyperState(ctx.typerState.fresh(ctx.reporter)) - if ctx.settings.YexplicitNulls.value && !Feature.enabledBySetting(nme.unsafeNulls) then - start = start.addMode(Mode.SafeNulls) - ctx.initialize()(using start) // re-initialize the base context with start - start.setRun(this) - } - private var compiling = false - private var myCtx = rootContext(using ictx) - - /** The context created for this run */ - given runContext[Dummy_so_its_a_def]: Context = myCtx - assert(runContext.runId <= Periods.MaxPossibleRunId) - private var myUnits: List[CompilationUnit] = _ private var myUnitsCached: List[CompilationUnit] = _ private var myFiles: Set[AbstractFile] = _ @@ -369,4 +336,40 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint myUnits = null myUnitsCached = null } + + /** Produces the following contexts, from outermost to innermost + * + * bootStrap: A context with next available runId and a scope consisting of + * the RootPackage _root_ + * start A context with RootClass as owner and the necessary initializations + * for type checking. + * imports For each element of RootImports, an import context + */ + protected def rootContext(using Context): Context = { + ctx.initialize() + ctx.base.setPhasePlan(comp.phases) + val rootScope = new MutableScope(0) + val bootstrap = ctx.fresh + .setPeriod(Period(comp.nextRunId, FirstPhaseId)) + .setScope(rootScope) + rootScope.enter(ctx.definitions.RootPackage)(using bootstrap) + var start = bootstrap.fresh + .setOwner(defn.RootClass) + .setTyper(new Typer) + .addMode(Mode.ImplicitsEnabled) + .setTyperState(ctx.typerState.fresh(ctx.reporter)) + if ctx.settings.YexplicitNulls.value && !Feature.enabledBySetting(nme.unsafeNulls) then + start = start.addMode(Mode.SafeNulls) + ctx.initialize()(using start) // re-initialize the base context with start + + // `this` must be unchecked for safe initialization because by being passed to setRun during + // initialization, it is not yet considered fully initialized by the initialization checker + start.setRun(this: @unchecked) + } + + private var myCtx = rootContext(using ictx) + + /** The context created for this run */ + given runContext[Dummy_so_its_a_def]: Context = myCtx + assert(runContext.runId <= Periods.MaxPossibleRunId) } From bddcabeed719399248240cbcb9c9278eb3e68757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 15 Feb 2022 11:36:39 +0100 Subject: [PATCH 1193/1244] Change default blog directory to 'blog' --- .../src/dotty/tools/scaladoc/site/StaticSiteLoader.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala index 0df7fa11c324..c9ace108c9b2 100644 --- a/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala +++ b/scaladoc/src/dotty/tools/scaladoc/site/StaticSiteLoader.scala @@ -116,6 +116,7 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite def loadBlog(): Option[LoadedTemplate] = { type Date = (String, String, String) val rootPath = ctx.blogPath + val defaultDirectory = "blog" if (!Files.exists(rootPath)) None else { val indexPageOpt = Seq( @@ -131,7 +132,7 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite val indexTemplateOpt = indexPageOpt.map(p => loadTemplateFile(p.toFile)) val indexPage = indexTemplateOpt.getOrElse(emptyTemplate(rootPath.resolve("index.html").toFile, "Blog")) - val indexDest = ctx.docsPath.resolve("_blog").resolve("index.html") + val indexDest = ctx.docsPath.resolve(defaultDirectory).resolve("index.html") val regex = raw"(\d*)-(\d*)-(\d*)-(.*)".r def splitDateName(tf: TemplateFile): (Date, String) = tf.file.getName match case regex(year, month, day, name) => ((year, month, day), name) @@ -150,7 +151,7 @@ class StaticSiteLoader(val root: File, val args: Scaladoc.Args)(using StaticSite .map { postFile => val templateFile = loadTemplateFile(postFile) val ((year, month, day), name) = splitDateName(templateFile) - val destPath = ctx.docsPath.resolve("_blog").resolve(year).resolve(month).resolve(day).resolve(name) + val destPath = ctx.docsPath.resolve(defaultDirectory).resolve(year).resolve(month).resolve(day).resolve(name) val date = dateFrom(templateFile, s"$year-$month-$day") date -> LoadedTemplate(templateFile, List.empty, destPath.toFile) }.sortBy(_._1).reverse.map(_._2) From 0ff3a33666fab77b373f9bcf4438e846e30f5c69 Mon Sep 17 00:00:00 2001 From: Jan Chyb Date: Tue, 8 Feb 2022 12:52:02 +0100 Subject: [PATCH 1194/1244] Make member filtering case-insensitive in scaladoc Closes #14421 --- .../dotty_res/scripts/components/DocumentableList.js | 4 +++- scaladoc/resources/dotty_res/scripts/components/Filter.js | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js b/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js index 3971598adc0a..8273d5e8d83a 100644 --- a/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js +++ b/scaladoc/resources/dotty_res/scripts/components/DocumentableList.js @@ -139,7 +139,9 @@ class List { : includesInputValue() function includesInputValue() { - return elementData.name.includes(filter.value) || elementData.description.includes(filter.value); + const lcValue = filter.value.toLowerCase() + return elementData.name.toLowerCase().includes(lcValue) + || elementData.description.toLowerCase().includes(lcValue); } function areFiltersFromElementSelected() { diff --git a/scaladoc/resources/dotty_res/scripts/components/Filter.js b/scaladoc/resources/dotty_res/scripts/components/Filter.js index fa30565210d2..b9f05defb478 100644 --- a/scaladoc/resources/dotty_res/scripts/components/Filter.js +++ b/scaladoc/resources/dotty_res/scripts/components/Filter.js @@ -75,12 +75,14 @@ class Filter { * @returns { Filters } */ _generateFiltersOnTyping(value) { + const lcValue = value.toLowerCase() + const elementsDatasets = this.elementsRefs .filter(element => { - const name = getElementTextContent(getElementNameRef(element)); - const description = getElementTextContent(getElementDescription(element)); + const lcName = getElementTextContent(getElementNameRef(element)).toLowerCase(); + const lcDescription = getElementTextContent(getElementDescription(element)).toLowerCase(); - return name.includes(value) || description.includes(value); + return lcName.includes(lcValue) || lcDescription.includes(lcValue); }) .map(element => this._getDatasetWithKeywordData(element.dataset)) From 42025d67f3a827e60432fc601d20fe9ecc0c09a2 Mon Sep 17 00:00:00 2001 From: Jan Chyb Date: Fri, 11 Feb 2022 15:29:03 +0100 Subject: [PATCH 1195/1244] Add id attributes to anchors of members in Scaladoc searchbar This allows to snap to a specific member after clicking, even if it is found under the same URL. --- scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala | 1 + scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala index 1c55cb8124e1..43602a23af59 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala @@ -81,6 +81,7 @@ trait Locations(using ctx: DocContext): def resolveRoot(dri: DRI, path: String): String = resolveRoot(rawLocation(dri), path) def absolutePath(dri: DRI, extension: String = "html"): String = rawLocation(dri).mkString("", "/", s".$extension") + def absolutePathWithAnchor(dri: DRI, extension: String = "html"): String = s"${absolutePath(dri, extension)}#${dri.anchor}" def resolveLink(dri: DRI, url: String): String = if URI(url).isAbsolute then url else resolveRoot(dri, url) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala index 7857c1bbd06a..5a5e60f08879 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala @@ -133,7 +133,7 @@ trait Resources(using ctx: DocContext) extends Locations, Writer: }.mkString def mkEntry(dri: DRI, name: String, text: String, descr: String, kind: String) = jsonObject( - "l" -> jsonString(absolutePath(dri)), + "l" -> jsonString(absolutePathWithAnchor(dri)), "n" -> jsonString(name), "t" -> jsonString(text), "d" -> jsonString(descr), From 233ffe95baf0235b83ab5cb5a9a32cf6ec08aa4d Mon Sep 17 00:00:00 2001 From: Jan Chyb Date: Fri, 11 Feb 2022 15:32:45 +0100 Subject: [PATCH 1196/1244] Close searchbar after clicking a result in Scaladoc Previously the searchbar would disappear automatically after going to another URL, but would not be closed if the member was found in the current address, even if snapped to another location. Now, both events should result in the same outcome of searchbar closing. --- scaladoc-js/main/src/searchbar/SearchbarComponent.scala | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scaladoc-js/main/src/searchbar/SearchbarComponent.scala b/scaladoc-js/main/src/searchbar/SearchbarComponent.scala index c77c8b6b9d83..4229f0c77220 100644 --- a/scaladoc-js/main/src/searchbar/SearchbarComponent.scala +++ b/scaladoc-js/main/src/searchbar/SearchbarComponent.scala @@ -22,6 +22,10 @@ class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearch val resultA = document.createElement("a").asInstanceOf[html.Anchor] resultA.href = Globals.pathToRoot + p.location resultA.text = s"${p.fullName}" + resultA.onclick = (event: Event) => + if (document.body.contains(rootDiv)) { + document.body.removeChild(rootDiv) + } val location = document.createElement("span") location.classList.add("pull-right") @@ -53,6 +57,10 @@ class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearch val resultA = document.createElement("a").asInstanceOf[html.Anchor] resultA.href = m.pageLocation resultA.text = m.functionName + resultA.onclick = (event: Event) => + if (document.body.contains(rootDiv)) { + document.body.removeChild(rootDiv) + } val packageDiv = document.createElement("div").asInstanceOf[html.Div] packageDiv.classList.add("scaladoc-searchbar-inkuire-package") From 3f7e68851332b60ff34c45fca8f1e6df2a904146 Mon Sep 17 00:00:00 2001 From: Jan Chyb Date: Fri, 11 Feb 2022 16:11:20 +0100 Subject: [PATCH 1197/1244] Fix anchors in Inkuire results in Scaladoc Previously, non-external pages would not be linked in Scaladoc if searched using Inkuire. Now it should behave similarly to standard searching by symbolic name, with results linking to specific member locations on pages. --- .../main/src/searchbar/SearchbarComponent.scala | 9 ++++++++- .../dotty/tools/scaladoc/tasty/InkuireSupport.scala | 10 +++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/scaladoc-js/main/src/searchbar/SearchbarComponent.scala b/scaladoc-js/main/src/searchbar/SearchbarComponent.scala index 4229f0c77220..33f38e690a1e 100644 --- a/scaladoc-js/main/src/searchbar/SearchbarComponent.scala +++ b/scaladoc-js/main/src/searchbar/SearchbarComponent.scala @@ -6,6 +6,8 @@ import org.scalajs.dom.html.Input import scala.scalajs.js.timers._ import scala.concurrent.duration._ +import java.net.URI + class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearchEngine, parser: QueryParser): val resultsChunkSize = 100 extension (p: PageEntry) @@ -55,7 +57,12 @@ class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearch icon.classList.add(m.entryType.take(2)) val resultA = document.createElement("a").asInstanceOf[html.Anchor] - resultA.href = m.pageLocation + resultA.href = + if(new URI(m.pageLocation).isAbsolute()) { + m.pageLocation + } else { + Globals.pathToRoot + m.pageLocation + } resultA.text = m.functionName resultA.onclick = (event: Event) => if (document.body.contains(rootDiv)) { diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala index 3e1a09574b16..36b29ff05eee 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala @@ -4,6 +4,7 @@ import collection.JavaConverters._ import dotty.tools.scaladoc._ import dotty.tools.scaladoc.{Signature => DSignature} import dotty.tools.scaladoc.Inkuire +import dotty.tools.scaladoc.renderers.Resources import scala.util.Random import scala.quoted._ @@ -13,10 +14,13 @@ import SymOps._ import NameNormalizer._ import SyntheticsSupport._ -trait InkuireSupport: +trait InkuireSupport(using DocContext) extends Resources: self: TastyParser => import qctx.reflect._ + // Unused in InkuireSupport, required for Resources + override def effectiveMembers: Map[DRI, Member] = Map.empty + private given qctx.type = qctx def doInkuireStuff(classDef: ClassDef): Unit = { @@ -110,7 +114,7 @@ trait InkuireSupport: ), name = name, packageName = ownerName, - uri = methodSymbol.dri.externalLink.getOrElse(""), + uri = methodSymbol.dri.externalLink.getOrElse(absolutePathWithAnchor(methodSymbol.dri)), entryType = "def" ) val curriedSgn = sgn.copy(signature = Inkuire.curry(sgn.signature)) @@ -138,7 +142,7 @@ trait InkuireSupport: ), name = name, packageName = ownerName, - uri = valSymbol.dri.externalLink.getOrElse(""), + uri = valSymbol.dri.externalLink.getOrElse(absolutePathWithAnchor(valSymbol.dri)), entryType = "val" ) val curriedSgn = sgn.copy(signature = Inkuire.curry(sgn.signature)) From f4eaa2e362bf05fb6eb589224a0e0d29ab89b724 Mon Sep 17 00:00:00 2001 From: Quentin Bernet Date: Sat, 22 Jan 2022 18:46:57 +0100 Subject: [PATCH 1198/1244] Add problematic test --- scaladoc-testcases/src/tests/typesSignatures.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scaladoc-testcases/src/tests/typesSignatures.scala b/scaladoc-testcases/src/tests/typesSignatures.scala index a66c2a521ce8..f0bcd6975277 100644 --- a/scaladoc-testcases/src/tests/typesSignatures.scala +++ b/scaladoc-testcases/src/tests/typesSignatures.scala @@ -35,6 +35,8 @@ class Base type H = () => String type I = (Int, String, Int) => (String, Int) + + type J = (a: A) => a.type } class Operators From 22d86a420f0b229d28f8c2dd1e163dbed448570f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Wed, 2 Feb 2022 11:55:41 +0100 Subject: [PATCH 1199/1244] Fix dependent function types rendering --- .../tools/scaladoc/tasty/TypesSupport.scala | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala index c0197b152a5f..772f3a9dd02d 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala @@ -92,7 +92,6 @@ trait TypesSupport: def noSupported(name: String): SSignature = println(s"WARN: Unsupported type: $name: ${tp.show}") plain(s"Unsupported[$name]").l - tp match case OrType(left, right) => inner(left) ++ keyword(" | ").l ++ inner(right) case AndType(left, right) => inner(left) ++ keyword(" & ").l ++ inner(right) @@ -117,7 +116,6 @@ trait TypesSupport: ++ keyword(" =>> ").l ++ inner(resType) - case r: Refinement => { //(parent, name, info) def getRefinementInformation(t: TypeRepr): List[TypeRepr] = t match { case r: Refinement => getRefinementInformation(r.parent) :+ r @@ -163,13 +161,25 @@ trait TypesSupport: plain("[").l ++ paramBounds ++ plain("]").l ++ keyword(" => ").l ++ paramList ++ keyword(" => ").l ++ resType case other => noSupported(s"Not supported type in refinement $info") } + + def parseDependentFunctionType(info: TypeRepr): SSignature = info match { + case m: MethodType => + val paramList = getParamList(m) + paramList ++ keyword(" => ").l ++ inner(m.resType) + case other => noSupported("Dependent function type without MethodType refinement") + } + val refinementInfo = getRefinementInformation(r) val refinedType = refinementInfo.head val refinedElems = refinementInfo.tail.collect{ case r: Refinement => r }.toList val prefix = if refinedType.typeSymbol != defn.ObjectClass then inner(refinedType) ++ plain(" ").l else Nil if (refinedType.typeSymbol.fullName == "scala.PolyFunction" && refinedElems.size == 1) { parsePolyFunction(refinedElems.head.info) - } else { + } + else if (r.isDependentFunctionType) { + parseDependentFunctionType(r.info) + } + else { prefix ++ plain("{ ").l ++ refinedElems.flatMap(e => parseRefinedElem(e.name, e.info)) ++ plain(" }").l } } @@ -274,7 +284,7 @@ trait TypesSupport: case ParamRef(TypeLambda(names, _, _), i) => tpe(names.apply(i)).l - case ParamRef(m: MethodType, i) => tpe(m.paramNames(i)).l + case ParamRef(m: MethodType, i) => tpe(m.paramNames(i)).l ++ plain(".type").l case RecursiveType(tp) => inner(tp) From 198f716c785332c17e92f8b889e81bfb14ed4644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 15 Feb 2022 13:04:42 +0100 Subject: [PATCH 1200/1244] Add dependent function type testcase --- scaladoc-testcases/src/tests/typesSignatures.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scaladoc-testcases/src/tests/typesSignatures.scala b/scaladoc-testcases/src/tests/typesSignatures.scala index f0bcd6975277..4d8d99f6ce73 100644 --- a/scaladoc-testcases/src/tests/typesSignatures.scala +++ b/scaladoc-testcases/src/tests/typesSignatures.scala @@ -37,6 +37,8 @@ class Base type I = (Int, String, Int) => (String, Int) type J = (a: A) => a.type + + type K = [A] => (a: A) => a.type } class Operators From fa565b9da5abfb919fecf439b67fd4255b6ceb9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Mon, 14 Feb 2022 13:45:49 +0100 Subject: [PATCH 1201/1244] Follow renames in content contributors script --- scaladoc-js/contributors/src/Globals.scala | 1 + .../ContentContributors.scala | 109 ++++++++++++------ .../scaladoc/renderers/HtmlRenderer.scala | 7 +- 3 files changed, 79 insertions(+), 38 deletions(-) diff --git a/scaladoc-js/contributors/src/Globals.scala b/scaladoc-js/contributors/src/Globals.scala index 68b37494fe7d..51bbf39ab3a3 100644 --- a/scaladoc-js/contributors/src/Globals.scala +++ b/scaladoc-js/contributors/src/Globals.scala @@ -7,5 +7,6 @@ import scala.scalajs.js.annotation.JSGlobalScope @JSGlobalScope object Globals extends js.Object { val githubContributorsUrl: String = js.native + val githubContributorsFilename: String = js.native } diff --git a/scaladoc-js/contributors/src/content-contributors/ContentContributors.scala b/scaladoc-js/contributors/src/content-contributors/ContentContributors.scala index 2ef1beb2185d..bbc9c4787dc6 100644 --- a/scaladoc-js/contributors/src/content-contributors/ContentContributors.scala +++ b/scaladoc-js/contributors/src/content-contributors/ContentContributors.scala @@ -33,46 +33,83 @@ trait Author extends js.Object: trait CommitTop extends js.Object: def commit: CommitBottom def author: Author + def url: String trait Commits extends js.Array[CommitTop] +trait CommitDescription extends js.Object: + def files: js.Array[FileChange] + +trait FileChange extends js.Object: + def filename: String + def status: String + def previous_filename: String + class ContentContributors: + val indenticonsUrl = "https://github.com/identicons" + def linkForFilename(filename: String) = Globals.githubContributorsUrl + s"/commits?path=$filename" + def getAuthorsForFilename(filename: String): Future[List[FullAuthor]] = { + val link = linkForFilename(filename) + Ajax.get(link).map(_.responseText).flatMap { json => + val res = JSON.parse(json).asInstanceOf[Commits] + val authors = res.map { commit => + commit.author match + case null => + FullAuthor(commit.commit.author.name, "", s"$indenticonsUrl/${commit.commit.author.name}.png") + case author => + FullAuthor(author.login, author.html_url, author.avatar_url) + } + val lastCommit = res.lastOption + val lastCommitDescriptionLink = lastCommit.map(_.url) + val previousFilename = lastCommitDescriptionLink + .fold(Future.successful(None)) { link => + findRename(link, filename) + } + val previousAuthors = previousFilename.flatMap { + case Some(filename) => getAuthorsForFilename(filename) + case None => Future.successful(List.empty) + }.fallbackTo(Future.successful(List.empty)) + + previousAuthors.map(_ ++ authors).map(_.distinct) + } + } + def findRename(link: String, filename: String): Future[Option[String]] = { + Ajax.get(link).map(_.responseText).map { json => + val res = JSON.parse(json).asInstanceOf[CommitDescription] + val files = res.files + files + .find(_.filename == filename) + .filter(_.status == "renamed") + .map(_.previous_filename) + } + } document.addEventListener("DOMContentLoaded", (e: Event) => { - val indenticonsUrl = "https://github.com/identicons" - js.typeOf(Globals.githubContributorsUrl) match - case "undefined" => - // don't do anything - case url => - val request: Future[String] = Ajax.get(Globals.githubContributorsUrl).map(_.responseText) - request.onComplete { - case Success(json: String) => - val res = JSON.parse(json).asInstanceOf[Commits] - val authors = res.map { commit => - commit.author match - case null => - FullAuthor(commit.commit.author.name, "", s"$indenticonsUrl/${commit.commit.author.name}.png") - case author => - FullAuthor(author.login, author.html_url, author.avatar_url) - }.distinct - val maybeDiv = Option(document.getElementById("documentation-contributors")) - maybeDiv.foreach { div => - authors.foreach { case FullAuthor(name, url, img) => - val divN = document.createElement("div") - val imgN = document.createElement("img").asInstanceOf[html.Image] - imgN.src = img - val autN = document.createElement("a").asInstanceOf[html.Anchor] - autN.href = url - autN.text = name - divN.appendChild(imgN) - divN.appendChild(autN) - div.appendChild(divN) - } - - if authors.nonEmpty then - div.asInstanceOf[html.Div].parentElement.classList.toggle("hidden") - } - case Failure(_) => - println(s"Couldn't fetch contributors for ${Globals.githubContributorsUrl}") - } + if js.typeOf(Globals.githubContributorsUrl) != "undefined" && + js.typeOf(Globals.githubContributorsFilename) != "undefined" + then { + getAuthorsForFilename(Globals.githubContributorsFilename.stripPrefix("/")).onComplete { + case Success(authors) => + val maybeDiv = Option(document.getElementById("documentation-contributors")) + maybeDiv.foreach { div => + authors.foreach { case FullAuthor(name, url, img) => + val divN = document.createElement("div") + val imgN = document.createElement("img").asInstanceOf[html.Image] + imgN.src = img + val autN = document.createElement("a").asInstanceOf[html.Anchor] + autN.href = url + autN.text = name + divN.appendChild(imgN) + divN.appendChild(autN) + div.appendChild(divN) + } + + if authors.nonEmpty then + div.asInstanceOf[html.Div].parentElement.classList.toggle("hidden") + } + case Failure(err) => + println(s"Couldn't fetch contributors. $err") + None + } + } }) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala index d71fe03a9c13..b61db9248a6d 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala @@ -82,11 +82,14 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do script(raw(s"""var pathToRoot = "${pathToRoot(page.link.dri)}";""")), (page.content match case ResolvedTemplate(loadedTemplate, _) => - val path = loadedTemplate.file.toPath + val path = loadedTemplate.templateFile.file.toPath ctx.sourceLinks.repoSummary(path) match case Some(DefinedRepoSummary("github", org, repo)) => val tag: TagArg = ctx.sourceLinks.fullPath(relativePath(path)).fold("") { githubContributors => - script(raw(s"""var githubContributorsUrl = "https://api.github.com/repos/$org/$repo/commits?path=$githubContributors";""")) + Seq( + script(raw(s"""var githubContributorsUrl = "https://api.github.com/repos/$org/$repo";""")), + script(raw(s"""var githubContributorsFilename = "$githubContributors";""")) + ) } tag // for some reason inference fails so had to state the type explicitly case _ => "" From 5a1e828aab210e9c24c4a55ce6823832efbcb239 Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Tue, 15 Feb 2022 14:49:23 -0800 Subject: [PATCH 1202/1244] Avoid stale import context during REPL parsing --- .../src/dotty/tools/repl/ReplDriver.scala | 11 +++++++++- .../dotty/tools/repl/ReplCompilerTests.scala | 21 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala index 5eef023c1fc2..f69a7ca142fb 100644 --- a/compiler/src/dotty/tools/repl/ReplDriver.scala +++ b/compiler/src/dotty/tools/repl/ReplDriver.scala @@ -254,6 +254,12 @@ class ReplDriver(settings: Array[String], def extractTopLevelImports(ctx: Context): List[tpd.Import] = unfusedPhases(using ctx).collectFirst { case phase: CollectTopLevelImports => phase.imports }.get + def contextWithNewImports(ctx: Context, imports: List[tpd.Import]): Context = + if imports.isEmpty then ctx + else + imports.foldLeft(ctx.fresh.setNewScope)((ctx, imp) => + ctx.importContext(imp, imp.symbol(using ctx))) + implicit val state = { val state0 = newRun(istate, parsed.reporter) state0.copy(context = state0.context.withSource(parsed.source)) @@ -269,7 +275,10 @@ class ReplDriver(settings: Array[String], var allImports = newState.imports if (newImports.nonEmpty) allImports += (newState.objectIndex -> newImports) - val newStateWithImports = newState.copy(imports = allImports) + val newStateWithImports = newState.copy( + imports = allImports, + context = contextWithNewImports(newState.context, newImports) + ) val warnings = newState.context.reporter .removeBufferedMessages(using newState.context) diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala index 3c70f838caa3..c02552aac83c 100644 --- a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala +++ b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala @@ -241,6 +241,27 @@ class ReplCompilerTests extends ReplTest: assertEquals(List("// defined class C"), lines()) } + @Test def i14491 = + initially { + run("import language.experimental.fewerBraces") + } andThen { + run("""|val x = Seq(7,8,9).apply: + | 1 + |""".stripMargin) + assertEquals("val x: Int = 8", storedOutput().trim) + } + initially { + run("""|import language.experimental.fewerBraces + |import language.experimental.fewerBraces as _ + |""".stripMargin) + } andThen { + run("""|val x = Seq(7,8,9).apply: + | 1 + |""".stripMargin) + assert("expected error if fewerBraces is unimported", + lines().exists(_.contains("missing arguments for method apply"))) + } + object ReplCompilerTests: private val pattern = Pattern.compile("\\r[\\n]?|\\n"); From e1b2bdd948a904a045066b2abb0354e690c5c98c Mon Sep 17 00:00:00 2001 From: bjornregnell Date: Tue, 15 Feb 2022 16:56:49 +0100 Subject: [PATCH 1203/1244] fix typo in docs example capability checking --- docs/_docs/reference/experimental/cc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_docs/reference/experimental/cc.md b/docs/_docs/reference/experimental/cc.md index 40434c518587..592d410a4502 100644 --- a/docs/_docs/reference/experimental/cc.md +++ b/docs/_docs/reference/experimental/cc.md @@ -500,7 +500,7 @@ def escaped(xs: Double*): (() => Double) throws LimitExceeded = val crasher = escaped(1, 2, 10e+11) crasher() ``` -This code needs to be rejected since otherwise the call to `later()` would cause +This code needs to be rejected since otherwise the call to `crasher()` would cause an unhandled `LimitExceeded` exception to be thrown. Under `-Ycc`, the code is indeed rejected From c73ed36c5f046420c3dbaa101a0c5f2b5bc0a046 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Wed, 16 Feb 2022 16:55:19 +0100 Subject: [PATCH 1204/1244] Set zero span for synthetic enum import selector Fixes https://github.com/lampepfl/dotty/issues/11683 --- compiler/src/dotty/tools/dotc/ast/Desugar.scala | 6 +++++- .../test/dotty/tools/languageserver/HoverTest.scala | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index 920871210eee..c6995cbac6b7 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -520,7 +520,11 @@ object desugar { enumCases.last.pushAttachment(DesugarEnums.DefinesEnumLookupMethods, ()) val enumCompanionRef = TermRefTree() val enumImport = - Import(enumCompanionRef, enumCases.flatMap(caseIds).map(ImportSelector(_))) + Import(enumCompanionRef, enumCases.flatMap(caseIds).map( + enumCase => + ImportSelector(enumCase.withSpan(enumCase.span.startPos)) + ) + ) (enumImport :: enumStats, enumCases, enumCompanionRef) } else (stats, Nil, EmptyTree) diff --git a/language-server/test/dotty/tools/languageserver/HoverTest.scala b/language-server/test/dotty/tools/languageserver/HoverTest.scala index 4309b0aeeea0..868134d6ea21 100644 --- a/language-server/test/dotty/tools/languageserver/HoverTest.scala +++ b/language-server/test/dotty/tools/languageserver/HoverTest.scala @@ -213,4 +213,13 @@ class HoverTest { // sp the top-level definitions should be enclosed in an object called `Source0$package`. .hover(m1 to m2, hoverContent("(hello.Source0$package : hello.Source0$package.type)")) } + + @Test def enumsRepeated: Unit = { + code"""|package example + |object SimpleEnum: + | enum Color: + | case ${m1}Red${m2}, Green, Blue + |""".withSource + .hover(m1 to m2, hoverContent("example.SimpleEnum.Color")) + } } From 4a9f22697132a843eee17456e33b059778129b33 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 16 Feb 2022 19:26:39 +0100 Subject: [PATCH 1205/1244] Propagate unreported features when flushing a reporter Fixes #14500 --- compiler/src/dotty/tools/dotc/reporting/Reporter.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala index e159b5f83863..06df8da181dc 100644 --- a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala +++ b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala @@ -137,14 +137,17 @@ abstract class Reporter extends interfaces.ReporterResult { var unreportedWarnings: Map[String, Int] = Map.empty + def addUnreported(key: String, n: Int): Unit = + val count = unreportedWarnings.getOrElse(key, 0) + unreportedWarnings = unreportedWarnings.updated(key, count + 1) + /** Issue the diagnostic, ignoring `-Wconf` and `@nowarn` configurations, * but still honouring `-nowarn`, `-Werror`, and conditional warnings. */ def issueUnconfigured(dia: Diagnostic)(using Context): Unit = dia match case w: Warning if ctx.settings.silentWarnings.value => case w: ConditionalWarning if w.isSummarizedConditional => val key = w.enablingOption.name - val count = unreportedWarnings.getOrElse(key, 0) - unreportedWarnings = unreportedWarnings.updated(key, count + 1) + addUnreported(key, 1) case _ => // conditional warnings that are not enabled are not fatal val d = dia match @@ -241,6 +244,8 @@ abstract class Reporter extends interfaces.ReporterResult { def flush()(using Context): Unit = val msgs = removeBufferedMessages if msgs.nonEmpty then msgs.foreach(ctx.reporter.report) + for (key, count) <- unreportedWarnings do + ctx.reporter.addUnreported(key, count) /** If this reporter buffers messages, all buffered messages, otherwise Nil */ def pendingMessages(using Context): List[Diagnostic] = Nil From ba33e98ed644b2b83670d9039b62d4b61bd779db Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 16 Feb 2022 21:06:33 +0100 Subject: [PATCH 1206/1244] Fix what -Xlint should have reported if it existed --- compiler/src/dotty/tools/dotc/reporting/Reporter.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala index 06df8da181dc..421d8f52b43a 100644 --- a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala +++ b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala @@ -139,7 +139,7 @@ abstract class Reporter extends interfaces.ReporterResult { def addUnreported(key: String, n: Int): Unit = val count = unreportedWarnings.getOrElse(key, 0) - unreportedWarnings = unreportedWarnings.updated(key, count + 1) + unreportedWarnings = unreportedWarnings.updated(key, count + n) /** Issue the diagnostic, ignoring `-Wconf` and `@nowarn` configurations, * but still honouring `-nowarn`, `-Werror`, and conditional warnings. */ From 704014529e81356a8e65a8ba8bcf4f4c6cfd5559 Mon Sep 17 00:00:00 2001 From: adampauls Date: Sat, 12 Feb 2022 16:18:09 -0800 Subject: [PATCH 1207/1244] Create errorTermTrees for more missing arguments to Apply nodes. --- .../dotty/tools/dotc/parsing/Parsers.scala | 13 +++--- .../dotty/tools/dotc/parsing/Scanners.scala | 2 - compiler/src/dotty/tools/repl/Main.scala | 1 + tests/neg/arg-eof.scala | 3 ++ tests/neg/i1679.scala | 2 +- tests/neg/t1625.check | 8 ++++ tests/neg/t1625.scala | 4 +- tests/neg/t5702-neg-bad-and-wild.check | 44 +++++++++++++++++++ tests/neg/t5702-neg-bad-brace.check | 10 +++++ tests/neg/t5702-neg-bad-brace.scala | 11 +++++ tests/neg/trailing-comma-pattern.check | 6 +++ tests/neg/trailing-comma-pattern.scala | 3 ++ tests/neg/trailing-comma-pattern2.check | 10 +++++ tests/neg/trailing-comma-pattern2.scala | 3 ++ tests/pos/trailing-comma-pattern.scala | 3 ++ .../untried/neg/t5702-neg-bad-and-wild.check | 28 ------------ tests/untried/neg/t5702-neg-bad-brace.check | 10 ----- tests/untried/neg/t5702-neg-bad-brace.scala | 17 ------- 18 files changed, 112 insertions(+), 66 deletions(-) create mode 100644 tests/neg/arg-eof.scala create mode 100644 tests/neg/t1625.check create mode 100644 tests/neg/t5702-neg-bad-and-wild.check create mode 100644 tests/neg/t5702-neg-bad-brace.check create mode 100644 tests/neg/t5702-neg-bad-brace.scala create mode 100644 tests/neg/trailing-comma-pattern.check create mode 100644 tests/neg/trailing-comma-pattern.scala create mode 100644 tests/neg/trailing-comma-pattern2.check create mode 100644 tests/neg/trailing-comma-pattern2.scala create mode 100644 tests/pos/trailing-comma-pattern.scala delete mode 100644 tests/untried/neg/t5702-neg-bad-and-wild.check delete mode 100644 tests/untried/neg/t5702-neg-bad-brace.check delete mode 100644 tests/untried/neg/t5702-neg-bad-brace.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 3ffef90057ef..366ed459a6a0 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -249,11 +249,11 @@ object Parsers { /** Skip on error to next safe point. */ - protected def skip(): Unit = + protected def skip(stopAtComma: Boolean): Unit = val lastRegion = in.currentRegion def atStop = in.token == EOF - || skipStopTokens.contains(in.token) && (in.currentRegion eq lastRegion) + || ((stopAtComma && in.token == COMMA) || skipStopTokens.contains(in.token)) && (in.currentRegion eq lastRegion) while !atStop do in.nextToken() lastErrorOffset = in.offset @@ -278,7 +278,7 @@ object Parsers { if (in.token == EOF) incompleteInputError(msg) else syntaxError(msg, offset) - skip() + skip(stopAtComma = true) /** Consume one token of the specified type, or * signal an error if it is not there. @@ -346,7 +346,7 @@ object Parsers { false // it's a statement that might be legal in an outer context else in.nextToken() // needed to ensure progress; otherwise we might cycle forever - skip() + skip(stopAtComma=false) true in.observeOutdented() @@ -881,7 +881,8 @@ object Parsers { val next = in.lookahead.token next == LBRACKET || next == LPAREN - /** Is current ident a `*`, and is it followed by a `)` or `, )`? */ + /** Is current ident a `*`, and is it followed by a `)`, `, )`, `,EOF`? The latter two are not + syntactically valid, but we need to include them here for error recovery. */ def followingIsVararg(): Boolean = in.isIdent(nme.raw.STAR) && { val lookahead = in.LookaheadScanner() @@ -890,7 +891,7 @@ object Parsers { || lookahead.token == COMMA && { lookahead.nextToken() - lookahead.token == RPAREN + lookahead.token == RPAREN || lookahead.token == EOF } } diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index 1fee0f52f770..d6ef2646eacf 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -659,8 +659,6 @@ object Scanners { && (token == RPAREN || token == RBRACKET || token == RBRACE || token == OUTDENT) then () /* skip the trailing comma */ - else if token == EOF then // e.g. when the REPL is parsing "val List(x, y, _*," - () /* skip the trailing comma */ else reset() case END => diff --git a/compiler/src/dotty/tools/repl/Main.scala b/compiler/src/dotty/tools/repl/Main.scala index 127ccd10b467..7eb906edc586 100644 --- a/compiler/src/dotty/tools/repl/Main.scala +++ b/compiler/src/dotty/tools/repl/Main.scala @@ -1,6 +1,7 @@ package dotty.tools.repl /** Main entry point to the REPL */ +// To test, run bin/scala object Main { def main(args: Array[String]): Unit = new ReplDriver(args).tryRunning diff --git a/tests/neg/arg-eof.scala b/tests/neg/arg-eof.scala new file mode 100644 index 000000000000..ba860b5dfae0 --- /dev/null +++ b/tests/neg/arg-eof.scala @@ -0,0 +1,3 @@ +object Test: + case class Widget(name: String, other: Int = 5) + Widget(name = "foo", // error // error \ No newline at end of file diff --git a/tests/neg/i1679.scala b/tests/neg/i1679.scala index 08a33bb15596..cadeb85dc8db 100644 --- a/tests/neg/i1679.scala +++ b/tests/neg/i1679.scala @@ -1,5 +1,5 @@ class A[T] object o { // Testing compiler crash, this test should be modified when named type argument are completely implemented - val x: A[T=Int, T=Int] = ??? // error: ']' expected, but '=' found + val x: A[T=Int, T=Int] = ??? // error: ']' expected, but '=' found // error } diff --git a/tests/neg/t1625.check b/tests/neg/t1625.check new file mode 100644 index 000000000000..7e31f49f3729 --- /dev/null +++ b/tests/neg/t1625.check @@ -0,0 +1,8 @@ +-- [E040] Syntax Error: tests/neg/t1625.scala:2:20 --------------------------------------------------------------------- +2 | def foo(x: String*, y: String*, c: String*): Int // error: an identifier expected, but ',' found // error: an identifier expected, but ',' found + | ^ + | an identifier expected, but ',' found +-- [E040] Syntax Error: tests/neg/t1625.scala:2:32 --------------------------------------------------------------------- +2 | def foo(x: String*, y: String*, c: String*): Int // error: an identifier expected, but ',' found // error: an identifier expected, but ',' found + | ^ + | an identifier expected, but ',' found diff --git a/tests/neg/t1625.scala b/tests/neg/t1625.scala index e98ce985238e..41929f0ab476 100644 --- a/tests/neg/t1625.scala +++ b/tests/neg/t1625.scala @@ -1,3 +1,3 @@ trait T3 { - def foo(x: String*, y: String*, c: String*): Int // error: an identifier expected, but ',' found -} \ No newline at end of file + def foo(x: String*, y: String*, c: String*): Int // error: an identifier expected, but ',' found // error: an identifier expected, but ',' found +} diff --git a/tests/neg/t5702-neg-bad-and-wild.check b/tests/neg/t5702-neg-bad-and-wild.check new file mode 100644 index 000000000000..cecfb1dfa996 --- /dev/null +++ b/tests/neg/t5702-neg-bad-and-wild.check @@ -0,0 +1,44 @@ +-- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:10:22 --------------------------------------------------- +10 | case List(1, _*,) => // error: pattern expected // error + | ^ + | pattern expected + | + | longer explanation available when compiling with `-explain` +-- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:12:23 --------------------------------------------------- +12 | case List(1, _*3,) => // error: pattern expected // error // error + | ^ + | pattern expected + | + | longer explanation available when compiling with `-explain` +-- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:15:18 --------------------------------------------------- +15 | case List(x*, 1) => // error: pattern expected + | ^ + | pattern expected + | + | longer explanation available when compiling with `-explain` +-- [E031] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:17:18 --------------------------------------------------- +17 | case (1, x: _*) => // error: bad use of _* (sequence pattern not allowed) + | ^ + | * can be used only for last argument + | + | longer explanation available when compiling with `-explain` +-- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:23:17 --------------------------------------------------- +23 | val K(ns @ _*, x) = k // error: pattern expected + | ^ + | pattern expected + | + | longer explanation available when compiling with `-explain` +-- Error: tests/neg/t5702-neg-bad-and-wild.scala:10:21 ----------------------------------------------------------------- +10 | case List(1, _*,) => // error: pattern expected // error + | ^ + | Values of types Null and Int cannot be compared with == or != +-- [E006] Not Found Error: tests/neg/t5702-neg-bad-and-wild.scala:12:20 ------------------------------------------------ +12 | case List(1, _*3,) => // error: pattern expected // error // error + | ^ + | Not found: * + | + | longer explanation available when compiling with `-explain` +-- Error: tests/neg/t5702-neg-bad-and-wild.scala:12:22 ----------------------------------------------------------------- +12 | case List(1, _*3,) => // error: pattern expected // error // error + | ^ + | Values of types Null and Int cannot be compared with == or != diff --git a/tests/neg/t5702-neg-bad-brace.check b/tests/neg/t5702-neg-bad-brace.check new file mode 100644 index 000000000000..92e9fe912a92 --- /dev/null +++ b/tests/neg/t5702-neg-bad-brace.check @@ -0,0 +1,10 @@ +-- [E032] Syntax Error: tests/neg/t5702-neg-bad-brace.scala:8:21 ------------------------------------------------------- +8 | case List(1, _*} => // error: pattern expected + | ^ + | pattern expected + | + | longer explanation available when compiling with `-explain` +-- [E040] Syntax Error: tests/neg/t5702-neg-bad-brace.scala:11:0 ------------------------------------------------------- +11 |} // error: eof expected, but '}' found + |^ + |eof expected, but '}' found diff --git a/tests/neg/t5702-neg-bad-brace.scala b/tests/neg/t5702-neg-bad-brace.scala new file mode 100644 index 000000000000..8a8e10f462aa --- /dev/null +++ b/tests/neg/t5702-neg-bad-brace.scala @@ -0,0 +1,11 @@ + +object Test { + + def main(args: Array[String]) = { + val is = List(1,2,3) + + is match { + case List(1, _*} => // error: pattern expected + } + } +} // error: eof expected, but '}' found diff --git a/tests/neg/trailing-comma-pattern.check b/tests/neg/trailing-comma-pattern.check new file mode 100644 index 000000000000..d0ce15081263 --- /dev/null +++ b/tests/neg/trailing-comma-pattern.check @@ -0,0 +1,6 @@ +-- [E032] Syntax Error: tests/neg/trailing-comma-pattern.scala:3:8 ----------------------------------------------------- +3 |// error + | ^ + | pattern expected + | + | longer explanation available when compiling with `-explain` diff --git a/tests/neg/trailing-comma-pattern.scala b/tests/neg/trailing-comma-pattern.scala new file mode 100644 index 000000000000..02ee158b7ae5 --- /dev/null +++ b/tests/neg/trailing-comma-pattern.scala @@ -0,0 +1,3 @@ +object Test: + val List(x, y, _*, +// error \ No newline at end of file diff --git a/tests/neg/trailing-comma-pattern2.check b/tests/neg/trailing-comma-pattern2.check new file mode 100644 index 000000000000..2759c648ff95 --- /dev/null +++ b/tests/neg/trailing-comma-pattern2.check @@ -0,0 +1,10 @@ +-- [E032] Syntax Error: tests/neg/trailing-comma-pattern2.scala:2:21 --------------------------------------------------- +2 | val List(x, y, _*, ) // error + | ^ + | pattern expected + | + | longer explanation available when compiling with `-explain` +-- [E040] Syntax Error: tests/neg/trailing-comma-pattern2.scala:3:8 ---------------------------------------------------- +3 |// error + | ^ + | '=' expected, but unindent found diff --git a/tests/neg/trailing-comma-pattern2.scala b/tests/neg/trailing-comma-pattern2.scala new file mode 100644 index 000000000000..2ada489ed234 --- /dev/null +++ b/tests/neg/trailing-comma-pattern2.scala @@ -0,0 +1,3 @@ +object Test: + val List(x, y, _*, ) // error +// error \ No newline at end of file diff --git a/tests/pos/trailing-comma-pattern.scala b/tests/pos/trailing-comma-pattern.scala new file mode 100644 index 000000000000..878b3af7748a --- /dev/null +++ b/tests/pos/trailing-comma-pattern.scala @@ -0,0 +1,3 @@ +object Test: + val List(x, y, _*, + ) = List(1, 2, 3) diff --git a/tests/untried/neg/t5702-neg-bad-and-wild.check b/tests/untried/neg/t5702-neg-bad-and-wild.check deleted file mode 100644 index a52136dbf889..000000000000 --- a/tests/untried/neg/t5702-neg-bad-and-wild.check +++ /dev/null @@ -1,28 +0,0 @@ -t5702-neg-bad-and-wild.scala:10: error: bad simple pattern: bad use of _* (a sequence pattern must be the last pattern) - case List(1, _*,) => // bad use of _* (a sequence pattern must be the last pattern) - ^ -t5702-neg-bad-and-wild.scala:10: error: illegal start of simple pattern - case List(1, _*,) => // bad use of _* (a sequence pattern must be the last pattern) - ^ -t5702-neg-bad-and-wild.scala:12: error: illegal start of simple pattern - case List(1, _*3,) => // illegal start of simple pattern - ^ -t5702-neg-bad-and-wild.scala:14: error: bad simple pattern: use _* to match a sequence - case List(1, x*) => // use _* to match a sequence - ^ -t5702-neg-bad-and-wild.scala:15: error: bad simple pattern: trailing * is not a valid pattern - case List(x*, 1) => // trailing * is not a valid pattern - ^ -t5702-neg-bad-and-wild.scala:16: error: bad simple pattern: trailing * is not a valid pattern - case (1, x*) => // trailing * is not a valid pattern - ^ -t5702-neg-bad-and-wild.scala:17: error: bad simple pattern: bad use of _* (sequence pattern not allowed) - case (1, x@_*) => // bad use of _* (sequence pattern not allowed) - ^ -t5702-neg-bad-and-wild.scala:23: error: bad simple pattern: bad use of _* (a sequence pattern must be the last pattern) - val K(ns @ _*, x) = k // bad use of _* (a sequence pattern must be the last pattern) - ^ -t5702-neg-bad-and-wild.scala:24: error: bad simple pattern: bad use of _* (sequence pattern not allowed) - val (b, _ * ) = (5,6) // bad use of _* (sequence pattern not allowed) - ^ -9 errors found diff --git a/tests/untried/neg/t5702-neg-bad-brace.check b/tests/untried/neg/t5702-neg-bad-brace.check deleted file mode 100644 index 503f7d95edc1..000000000000 --- a/tests/untried/neg/t5702-neg-bad-brace.check +++ /dev/null @@ -1,10 +0,0 @@ -t5702-neg-bad-brace.scala:14: error: Unmatched closing brace '}' ignored here - case List(1, _*} => - ^ -t5702-neg-bad-brace.scala:14: error: illegal start of simple pattern - case List(1, _*} => - ^ -t5702-neg-bad-brace.scala:15: error: ')' expected but '}' found. - } - ^ -three errors found diff --git a/tests/untried/neg/t5702-neg-bad-brace.scala b/tests/untried/neg/t5702-neg-bad-brace.scala deleted file mode 100644 index 16a341cf8c17..000000000000 --- a/tests/untried/neg/t5702-neg-bad-brace.scala +++ /dev/null @@ -1,17 +0,0 @@ - -object Test { - - def main(args: Array[String]) { - val is = List(1,2,3) - - is match { -// the erroneous brace is ignored, so we can't halt on it. -// maybe brace healing can detect overlapping unmatched (...} -// In this case, the fix emits an extra error: -// t5702-neg-bad-brace.scala:10: error: Unmatched closing brace '}' ignored here -// t5702-neg-bad-brace.scala:10: error: illegal start of simple pattern (i.e., =>) -// t5702-neg-bad-brace.scala:11: error: ')' expected but '}' found. - case List(1, _*} => - } - } -} From 8690b61fdbd487c1e98025a2ea4879ccf0b360b9 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Wed, 16 Feb 2022 19:47:37 -0500 Subject: [PATCH 1208/1244] Disable type simplify in unpickler --- .../tools/dotc/core/tasty/TreeUnpickler.scala | 2 -- tests/pos/pickleSkelom.scala | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 tests/pos/pickleSkelom.scala diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index af186e825591..ac315f4cef89 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -1297,8 +1297,6 @@ class TreeUnpickler(reader: TastyReader, } val tree = if (tag < firstLengthTreeTag) readSimpleTerm() else readLengthTerm() - if (!tree.isInstanceOf[TypTree]) // FIXME: Necessary to avoid self-type cyclic reference in tasty_tools - tree.overwriteType(tree.tpe.simplified) setSpan(start, tree) } diff --git a/tests/pos/pickleSkelom.scala b/tests/pos/pickleSkelom.scala new file mode 100644 index 000000000000..e598c8ebcbeb --- /dev/null +++ b/tests/pos/pickleSkelom.scala @@ -0,0 +1,15 @@ +class A + +type B = A + +def f[T](x: T): x.type & T = ??? + +def g = { + var a: B = ??? + f[A](a) +} + +def testNN = { + var s: String = ??? + s.nn +} \ No newline at end of file From 4b3287f29abf38ee81c9be660c63a1ae0016ab39 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Thu, 17 Feb 2022 09:19:36 -0500 Subject: [PATCH 1209/1244] Rename test file --- tests/pos/{pickleSkelom.scala => pickleSkolem.scala} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename tests/pos/{pickleSkelom.scala => pickleSkolem.scala} (98%) diff --git a/tests/pos/pickleSkelom.scala b/tests/pos/pickleSkolem.scala similarity index 98% rename from tests/pos/pickleSkelom.scala rename to tests/pos/pickleSkolem.scala index e598c8ebcbeb..852b1cee65ba 100644 --- a/tests/pos/pickleSkelom.scala +++ b/tests/pos/pickleSkolem.scala @@ -12,4 +12,4 @@ def g = { def testNN = { var s: String = ??? s.nn -} \ No newline at end of file +} From 09e19d351a3f8cb838cca4c0be7e48fe782203b5 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Tue, 8 Feb 2022 19:36:42 +0100 Subject: [PATCH 1210/1244] Search all source trees for a given span When we create a synthetic companion object, for exmaple for enums, all the value definitions are put into it and the there are actually multiple trees that contain the position we are itnerested in. Now, NavigateAST.pathTo takes in multiple trees since the method is already able to find the best fit. --- compiler/src/dotty/tools/dotc/ast/NavigateAST.scala | 6 +++--- .../dotty/tools/dotc/interactive/Interactive.scala | 12 ++++++------ .../test/dotty/tools/languageserver/HoverTest.scala | 9 +++++++++ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala index 61561d5eaa24..7222fe87523a 100644 --- a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala +++ b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala @@ -60,7 +60,7 @@ object NavigateAST { * the given `span`. */ def untypedPath(span: Span)(using Context): List[Positioned] = - pathTo(span, ctx.compilationUnit.untpdTree) + pathTo(span, List(ctx.compilationUnit.untpdTree)) /** The reverse path from node `from` to the node that closest encloses `span`, @@ -72,7 +72,7 @@ object NavigateAST { * end point are the same, so this is useful when trying to reconcile * nodes with source code. */ - def pathTo(span: Span, from: Positioned, skipZeroExtent: Boolean = false)(using Context): List[Positioned] = { + def pathTo(span: Span, from: List[Positioned], skipZeroExtent: Boolean = false)(using Context): List[Positioned] = { def childPath(it: Iterator[Any], path: List[Positioned]): List[Positioned] = { var bestFit: List[Positioned] = path while (it.hasNext) { @@ -120,6 +120,6 @@ object NavigateAST { case _ => path } } - singlePath(from, Nil) + childPath(from.iterator, Nil) } } diff --git a/compiler/src/dotty/tools/dotc/interactive/Interactive.scala b/compiler/src/dotty/tools/dotc/interactive/Interactive.scala index 20a746ceb5ac..cb41650c0b57 100644 --- a/compiler/src/dotty/tools/dotc/interactive/Interactive.scala +++ b/compiler/src/dotty/tools/dotc/interactive/Interactive.scala @@ -252,14 +252,14 @@ object Interactive { * the tree closest enclosing `pos` and ends with an element of `trees`. */ def pathTo(trees: List[SourceTree], pos: SourcePosition)(using Context): List[Tree] = - trees.find(_.pos.contains(pos)) match { - case Some(tree) => pathTo(tree.tree, pos.span) - case None => Nil - } + pathTo(trees.map(_.tree), pos.span) def pathTo(tree: Tree, span: Span)(using Context): List[Tree] = - if (tree.span.contains(span)) - NavigateAST.pathTo(span, tree, skipZeroExtent = true) + pathTo(List(tree), span) + + private def pathTo(trees: List[Tree], span: Span)(using Context): List[Tree] = + if (trees.exists(_.span.contains(span))) + NavigateAST.pathTo(span, trees, skipZeroExtent = true) .collect { case t: untpd.Tree => t } .dropWhile(!_.hasType).asInstanceOf[List[tpd.Tree]] else Nil diff --git a/language-server/test/dotty/tools/languageserver/HoverTest.scala b/language-server/test/dotty/tools/languageserver/HoverTest.scala index 868134d6ea21..b396f1a15044 100644 --- a/language-server/test/dotty/tools/languageserver/HoverTest.scala +++ b/language-server/test/dotty/tools/languageserver/HoverTest.scala @@ -222,4 +222,13 @@ class HoverTest { |""".withSource .hover(m1 to m2, hoverContent("example.SimpleEnum.Color")) } + + @Test def enums: Unit = { + code"""|package example + |enum TestEnum3: + | case ${m1}A${m2} // no tooltip + | + |""".withSource + .hover(m1 to m2, hoverContent("example.TestEnum3")) + } } From 3aa14387aad0f3ad81ad23489d7b6a43416f3da6 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Thu, 17 Feb 2022 14:31:57 +0100 Subject: [PATCH 1211/1244] Tweak `pathTo` comment in NavigateAST --- compiler/src/dotty/tools/dotc/ast/NavigateAST.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala index 7222fe87523a..730149381487 100644 --- a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala +++ b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala @@ -63,9 +63,9 @@ object NavigateAST { pathTo(span, List(ctx.compilationUnit.untpdTree)) - /** The reverse path from node `from` to the node that closest encloses `span`, + /** The reverse path from any node in `from` to the node that closest encloses `span`, * or `Nil` if no such path exists. If a non-empty path is returned it starts with - * the node closest enclosing `span` and ends with `from`. + * the node closest enclosing `span` and ends with one of the nodes in `from`. * * @param skipZeroExtent If true, skip over zero-extent nodes in the search. These nodes * do not correspond to code the user wrote since their start and From 816b1ad40c76ede1fcdddd6ed5dc29822f3c5436 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Wed, 16 Feb 2022 18:02:19 +0100 Subject: [PATCH 1212/1244] Set zero span for synthetic tuple type Fixes https://github.com/lampepfl/dotty/issues/11919 --- compiler/src/dotty/tools/dotc/ast/Desugar.scala | 2 +- .../test/dotty/tools/languageserver/HoverTest.scala | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index c6995cbac6b7..8f0abf9cd999 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -1158,7 +1158,7 @@ object desugar { mods & Lazy | Synthetic | (if (ctx.owner.isClass) PrivateLocal else EmptyFlags) val firstDef = ValDef(tmpName, TypeTree(), matchExpr) - .withSpan(pat.span.union(rhs.span)).withMods(patMods) + .withSpan(pat.span.startPos).withMods(patMods) val useSelectors = vars.length <= 22 def selector(n: Int) = if useSelectors then Select(Ident(tmpName), nme.selectorName(n)) diff --git a/language-server/test/dotty/tools/languageserver/HoverTest.scala b/language-server/test/dotty/tools/languageserver/HoverTest.scala index b396f1a15044..f23aac2ad6b6 100644 --- a/language-server/test/dotty/tools/languageserver/HoverTest.scala +++ b/language-server/test/dotty/tools/languageserver/HoverTest.scala @@ -231,4 +231,10 @@ class HoverTest { |""".withSource .hover(m1 to m2, hoverContent("example.TestEnum3")) } + + @Test def tuple: Unit = { + code"""|object A: + | val (${m1}first${m2}, second) = (1, 2)""".withSource + .hover(m1 to m2, hoverContent("Int")) + } } From 0afcd76fe06b9859cb397adc00a29f37fb38bea0 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 14 Feb 2022 16:37:39 +0100 Subject: [PATCH 1213/1244] Find inline calls inserted in synthetic members Fix #14442 --- .../dotty/tools/dotc/transform/SyntheticMembers.scala | 11 ++++++++++- tests/pos/i14442.scala | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 tests/pos/i14442.scala diff --git a/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala b/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala index 3a94a78b3d8e..4ce4619aa3b9 100644 --- a/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala +++ b/compiler/src/dotty/tools/dotc/transform/SyntheticMembers.scala @@ -610,7 +610,16 @@ class SyntheticMembers(thisPhase: DenotTransformer) { def addSyntheticMembers(impl: Template)(using Context): Template = { val clazz = ctx.owner.asClass + val syntheticMembers = serializableObjectMethod(clazz) ::: serializableEnumValueMethod(clazz) ::: caseAndValueMethods(clazz) + checkInlining(syntheticMembers) addMirrorSupport( - cpy.Template(impl)(body = serializableObjectMethod(clazz) ::: serializableEnumValueMethod(clazz) ::: caseAndValueMethods(clazz) ::: impl.body)) + cpy.Template(impl)(body = syntheticMembers ::: impl.body)) } + + private def checkInlining(syntheticMembers: List[Tree])(using Context): Unit = + if syntheticMembers.exists(_.existsSubTree { + case tree: GenericApply => tree.symbol.isAllOf(InlineMethod) + case tree: Select => tree.symbol.isAllOf(InlineMethod) + case _ => false + }) then ctx.compilationUnit.needsInlining = true } diff --git a/tests/pos/i14442.scala b/tests/pos/i14442.scala new file mode 100644 index 000000000000..60d7e26a0b3f --- /dev/null +++ b/tests/pos/i14442.scala @@ -0,0 +1,4 @@ +class Foo(val id: Int) { + inline def ==(that: Foo): Boolean = true +} +case class FooWrapper(foo: Foo) From 19fb504cdcfbf7ae0daf1ac445de8fa0e0db3d80 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Fri, 18 Feb 2022 12:35:21 +0100 Subject: [PATCH 1214/1244] Set proper position for ValDefs generated from tuples Previously, the span for ValDefs generated for tuples would encompas the entire expression, which led to difficulties identifying the exact path to the current position. Now, we set the span to be the same as the name underneath. Not sure if this is a proper solution, since normally ValDefs ecompans the entire span, but in this case it makes 2 different ValDef have the same span. An alternative solution would be to find the one with point nearer to the current position. This popped up within the Nightly tests we do in Metals. --- compiler/src/dotty/tools/dotc/ast/Desugar.scala | 17 +++++++++++++---- .../dotty/tools/languageserver/HoverTest.scala | 10 ++++++++-- .../tools/languageserver/WorksheetTest.scala | 6 ------ tests/neg/t5702-neg-bad-and-wild.check | 8 +++++++- tests/neg/t5702-neg-bad-and-wild.scala | 3 ++- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index 8f0abf9cd999..9c8201b4fa02 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -1143,10 +1143,11 @@ object desugar { ) // no `_` val ids = for ((named, _) <- vars) yield Ident(named.name) - val caseDef = CaseDef(pat, EmptyTree, makeTuple(ids)) val matchExpr = if (tupleOptimizable) rhs - else Match(makeSelector(rhs, MatchCheck.IrrefutablePatDef), caseDef :: Nil) + else + val caseDef = CaseDef(pat, EmptyTree, makeTuple(ids)) + Match(makeSelector(rhs, MatchCheck.IrrefutablePatDef), caseDef :: Nil) vars match { case Nil if !mods.is(Lazy) => matchExpr @@ -1166,8 +1167,16 @@ object desugar { val restDefs = for (((named, tpt), n) <- vars.zipWithIndex if named.name != nme.WILDCARD) yield - if (mods.is(Lazy)) derivedDefDef(original, named, tpt, selector(n), mods &~ Lazy) - else derivedValDef(original, named, tpt, selector(n), mods) + if mods.is(Lazy) then + DefDef(named.name.asTermName, Nil, tpt, selector(n)) + .withMods(mods &~ Lazy) + .withSpan(named.span) + else + valDef( + ValDef(named.name.asTermName, tpt, selector(n)) + .withMods(mods) + .withSpan(named.span) + ) flatTree(firstDef :: restDefs) } } diff --git a/language-server/test/dotty/tools/languageserver/HoverTest.scala b/language-server/test/dotty/tools/languageserver/HoverTest.scala index f23aac2ad6b6..5c2a1aa25efe 100644 --- a/language-server/test/dotty/tools/languageserver/HoverTest.scala +++ b/language-server/test/dotty/tools/languageserver/HoverTest.scala @@ -234,7 +234,13 @@ class HoverTest { @Test def tuple: Unit = { code"""|object A: - | val (${m1}first${m2}, second) = (1, 2)""".withSource - .hover(m1 to m2, hoverContent("Int")) + | val (${m1}first${m2}, second) = (1.0, 2)""".withSource + .hover(m1 to m2, hoverContent("Double")) + } + + @Test def multiAssigment: Unit = { + code"""|val ${m1}x${m2}, ${m3}y${m4} = 42.0""".withSource + .hover(m1 to m2, hoverContent("Double")) + .hover(m3 to m4, hoverContent("Double")) } } diff --git a/language-server/test/dotty/tools/languageserver/WorksheetTest.scala b/language-server/test/dotty/tools/languageserver/WorksheetTest.scala index d2e09060da9a..1b5972287659 100644 --- a/language-server/test/dotty/tools/languageserver/WorksheetTest.scala +++ b/language-server/test/dotty/tools/languageserver/WorksheetTest.scala @@ -93,12 +93,6 @@ class WorksheetTest { ((m1 to m2), "val res0: String = odd")) } - @Test def patternMatching1: Unit = { - ws"""${m1}val (foo, bar) = (1, 2)${m2}""".withSource - .run(m1, - ((m1 to m2), s"val foo: Int = 1${nl}val bar: Int = 2")) - } - @Test def evaluationException: Unit = { ws"""${m1}val foo = 1 / 0${m2} ${m3}val bar = 2${m4}""".withSource diff --git a/tests/neg/t5702-neg-bad-and-wild.check b/tests/neg/t5702-neg-bad-and-wild.check index cecfb1dfa996..761613fcf75c 100644 --- a/tests/neg/t5702-neg-bad-and-wild.check +++ b/tests/neg/t5702-neg-bad-and-wild.check @@ -23,11 +23,17 @@ | | longer explanation available when compiling with `-explain` -- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:23:17 --------------------------------------------------- -23 | val K(ns @ _*, x) = k // error: pattern expected +23 | val K(ns @ _*, xx) = k // error: pattern expected | ^ | pattern expected | | longer explanation available when compiling with `-explain` +-- [E161] Naming Error: tests/neg/t5702-neg-bad-and-wild.scala:24:10 --------------------------------------------------- +24 | val K(x) = k // error: x is already defined as value x + | ^^^^^^^^^^^^ + | x is already defined as value x + | + | Note that overloaded methods must all be defined in the same group of toplevel definitions -- Error: tests/neg/t5702-neg-bad-and-wild.scala:10:21 ----------------------------------------------------------------- 10 | case List(1, _*,) => // error: pattern expected // error | ^ diff --git a/tests/neg/t5702-neg-bad-and-wild.scala b/tests/neg/t5702-neg-bad-and-wild.scala index c8e27278eca0..b943fc15ba2b 100644 --- a/tests/neg/t5702-neg-bad-and-wild.scala +++ b/tests/neg/t5702-neg-bad-and-wild.scala @@ -20,7 +20,8 @@ object Test { // good syntax, bad semantics, detected by typer //gowild.scala:14: error: star patterns must correspond with varargs parameters val K(x @ _*) = k - val K(ns @ _*, x) = k // error: pattern expected + val K(ns @ _*, xx) = k // error: pattern expected + val K(x) = k // error: x is already defined as value x val (b, _ * ) = (5,6) // ok // no longer complains //bad-and-wild.scala:15: error: ')' expected but '}' found. From 79f6ed963acd99779dc81202df8488ad71f3603f Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 18 Feb 2022 10:13:01 +0100 Subject: [PATCH 1215/1244] Remove unnecessary newScope in newNormalizedClassSymbol This was added in #14026 --- compiler/src/dotty/tools/dotc/ast/tpd.scala | 2 +- compiler/src/dotty/tools/dotc/core/Symbols.scala | 1 - compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala | 2 +- compiler/src/dotty/tools/dotc/typer/Implicits.scala | 2 +- compiler/src/dotty/tools/dotc/typer/Inliner.scala | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index 396d85a8c58a..5845773fe65b 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -345,7 +345,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { } else parents val cls = newNormalizedClassSymbol(owner, tpnme.ANON_CLASS, Synthetic | Final, parents1, - newScope, coord = fns.map(_.span).reduceLeft(_ union _)) + coord = fns.map(_.span).reduceLeft(_ union _)) val constr = newConstructor(cls, Synthetic, Nil, Nil).entered def forwarder(fn: TermSymbol, name: TermName) = { val fwdMeth = fn.copy(cls, name, Synthetic | Method | Final).entered.asTerm diff --git a/compiler/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala index 7f0969d55f07..4fb481dfe2a9 100644 --- a/compiler/src/dotty/tools/dotc/core/Symbols.scala +++ b/compiler/src/dotty/tools/dotc/core/Symbols.scala @@ -564,7 +564,6 @@ object Symbols { name: TypeName, flags: FlagSet, parentTypes: List[Type], - decls: Scope, selfInfo: Type = NoType, privateWithin: Symbol = NoSymbol, coord: Coord = NoCoord, diff --git a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala index 0a2e49501278..250da980cfd0 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala @@ -127,7 +127,7 @@ class ExpandSAMs extends MiniPhase: val parents = List( defn.AbstractPartialFunctionClass.typeRef.appliedTo(anonTpe.firstParamTypes.head, anonTpe.resultType), defn.SerializableType) - val pfSym = newNormalizedClassSymbol(anonSym.owner, tpnme.ANON_CLASS, Synthetic | Final, parents, newScope, coord = tree.span) + val pfSym = newNormalizedClassSymbol(anonSym.owner, tpnme.ANON_CLASS, Synthetic | Final, parents, coord = tree.span) def overrideSym(sym: Symbol) = sym.copy( owner = pfSym, diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index 4824031f12bc..90e0eae4afe8 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -1799,7 +1799,7 @@ final class SearchRoot extends SearchHistory: // } val parents = List(defn.ObjectType, defn.SerializableType) - val classSym = newNormalizedClassSymbol(ctx.owner, LazyImplicitName.fresh().toTypeName, Synthetic | Final, parents, newScope, coord = span) + val classSym = newNormalizedClassSymbol(ctx.owner, LazyImplicitName.fresh().toTypeName, Synthetic | Final, parents, coord = span) val vsyms = pruned.map(_._1.symbol) val nsyms = vsyms.map(vsym => newSymbol(classSym, vsym.name, EmptyFlags, vsym.info, coord = span).entered) val vsymMap = (vsyms zip nsyms).toMap diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index c99ccbd24428..7749f4f0c0b7 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -199,7 +199,7 @@ object Inliner { val UnApply(fun, implicits, patterns) = unapp val sym = unapp.symbol - val cls = newNormalizedClassSymbol(ctx.owner, tpnme.ANON_CLASS, Synthetic | Final, List(defn.ObjectType), newScope, coord = sym.coord) + val cls = newNormalizedClassSymbol(ctx.owner, tpnme.ANON_CLASS, Synthetic | Final, List(defn.ObjectType), coord = sym.coord) val constr = newConstructor(cls, Synthetic, Nil, Nil, coord = sym.coord).entered val targs = fun match From a654314716d73e3315acdea1fc24238c1a7eab72 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Tue, 8 Feb 2022 19:17:00 -0800 Subject: [PATCH 1216/1244] Don't compute indents when in a string --- .../dotty/tools/dotc/parsing/Scanners.scala | 11 +++-- tests/neg/i14386.scala | 48 +++++++++++++++++++ 2 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 tests/neg/i14386.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index d6ef2646eacf..72b05ad073c2 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -265,7 +265,7 @@ object Scanners { val next = newTokenData private val prev = newTokenData - /** The current region. This is initially an Indented region with indentation width. */ + /** The current region. This is initially an Indented region with zero indentation width. */ var currentRegion: Region = Indented(IndentWidth.Zero, Set(), EMPTY, null) // Get next token ------------------------------------------------------------ @@ -434,8 +434,8 @@ object Scanners { && !migrateTo3 && !noindentSyntax - /** The indentation width of the given offset */ - def indentWidth(offset: Offset): IndentWidth = { + /** The indentation width of the given offset. */ + def indentWidth(offset: Offset): IndentWidth = import IndentWidth.{Run, Conc} def recur(idx: Int, ch: Char, n: Int, k: IndentWidth => IndentWidth): IndentWidth = if (idx < 0) k(Run(ch, n)) @@ -452,7 +452,7 @@ object Scanners { else recur(idx - 1, ' ', 0, identity) } recur(offset - 1, ' ', 0, identity) - } + end indentWidth /** Handle newlines, possibly inserting an INDENT, OUTDENT, NEWLINE, or NEWLINES token * in front of the current token. This depends on whether indentation is significant or not. @@ -521,6 +521,7 @@ object Scanners { lastWidth = r.width newlineIsSeparating = lastWidth <= nextWidth || r.isOutermost indentPrefix = r.prefix + case _: InString => () case r => indentIsSignificant = indentSyntax r.proposeKnownWidth(nextWidth, lastToken) @@ -1422,7 +1423,7 @@ object Scanners { nextToken() currentRegion = topLevelRegion(indentWidth(offset)) } - // end Scanner + end Scanner /** A Region indicates what encloses the current token. It can be one of the following * diff --git a/tests/neg/i14386.scala b/tests/neg/i14386.scala new file mode 100644 index 000000000000..c25b6ba9f3c1 --- /dev/null +++ b/tests/neg/i14386.scala @@ -0,0 +1,48 @@ +// scalac: -Werror +def logLevelDetail(level: Int): String = + s"""$level + +// the following line is indented using [tab][tab] + Sets the global logging level to $level. + """ + /* was 2 errors with carets as shown + | ^ ^ + | Incompatible combinations of tabs and spaces in indentation prefixes. + | Previous indent : 3 spaces + | Latest indent : 2 tabs + */ + +def log(level: Int, msg: String): String = + s""" + $level + prefixed $level suffixed + """ +/* + ^ ^ + Incompatible combinations of tabs and spaces in indentation prefixes. + Previous indent : 2 tabs + Latest indent : 2 space + */ + +// normal mixed tabs errors as a baseline +def g = + 42 + + 17 // error + +def p() = + println("hello") + println("world") // error + /* + | Incompatible combinations of tabs and spaces in indentation prefixes. + | Previous indent : 4 spaces + | Latest indent : 1 tab + */ + +def braced() = + s"""begin + ${ + val level = 10 + val msg = "hello, world" // error he lets me off with a warning + log(level, msg) // error + } + end""" From 021758122e0426d6512d9d97e27213255485e637 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Thu, 18 Nov 2021 22:02:15 -0500 Subject: [PATCH 1217/1244] Fix space in unsafe nulls --- .../src/dotty/tools/dotc/core/SymDenotations.scala | 2 +- .../dotty/tools/dotc/transform/PatternMatcher.scala | 7 ++++++- .../dotty/tools/dotc/transform/patmat/Space.scala | 12 +++++------- compiler/src/dotty/tools/dotc/typer/Nullables.scala | 7 +++++++ compiler/src/dotty/tools/dotc/typer/Typer.scala | 5 ++++- .../unsafe-common/unsafe-match-null.scala | 12 ++++++++++++ 6 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 tests/explicit-nulls/unsafe-common/unsafe-match-null.scala diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala index 2f7e3debfa6f..5c3545bb2f65 100644 --- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala @@ -813,7 +813,7 @@ object SymDenotations { /** Is this symbol a class of which `null` is a value? */ final def isNullableClass(using Context): Boolean = if ctx.mode.is(Mode.SafeNulls) && !ctx.phase.erasedTypes - then symbol == defn.NullClass || symbol == defn.AnyClass + then symbol == defn.NullClass || symbol == defn.AnyClass || symbol == defn.MatchableClass else isNullableClassAfterErasure /** Is this symbol a class of which `null` is a value after erasure? diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala index 21aa331367ca..43330115cd00 100644 --- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -13,6 +13,7 @@ import SymUtils._ import Flags._, Constants._ import Decorators._ import NameKinds.{PatMatStdBinderName, PatMatAltsName, PatMatResultName} +import typer.Nullables import config.Printers.patmatch import reporting._ import dotty.tools.dotc.ast._ @@ -43,8 +44,12 @@ class PatternMatcher extends MiniPhase { case rt => tree.tpe val translated = new Translator(matchType, this).translateMatch(tree) + val engineCtx = + if tree.hasAttachment(Nullables.UnsafeNullsMatch) + then ctx.retractMode(Mode.SafeNulls) else ctx + // check exhaustivity and unreachability - val engine = new patmat.SpaceEngine + val engine = new patmat.SpaceEngine()(using engineCtx) engine.checkExhaustivity(tree) engine.checkRedundancy(tree) diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala index 13310299ed00..dcb946a45ec3 100644 --- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala +++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala @@ -338,16 +338,13 @@ class SpaceEngine(using Context) extends SpaceLogic { override def intersectUnrelatedAtomicTypes(tp1: Type, tp2: Type): Space = trace(s"atomic intersection: ${AndType(tp1, tp2).show}", debug) { // Precondition: !isSubType(tp1, tp2) && !isSubType(tp2, tp1). - if (!ctx.explicitNulls && (tp1.isNullType || tp2.isNullType)) { + if !ctx.mode.is(Mode.SafeNulls) && (tp1.isNullType || tp2.isNullType) then // Since projections of types don't include null, intersection with null is empty. Empty - } - else { + else val res = TypeComparer.provablyDisjoint(tp1, tp2) - - if (res) Empty + if res then Empty else Typ(AndType(tp1, tp2), decomposed = true) - } } /** Return the space that represents the pattern `pat` */ @@ -549,7 +546,8 @@ class SpaceEngine(using Context) extends SpaceLogic { /** Is `tp1` a subtype of `tp2`? */ def isSubType(tp1: Type, tp2: Type): Boolean = trace(i"$tp1 <:< $tp2", debug, show = true) { - if tp1 == constantNullType && !ctx.explicitNulls then tp2 == constantNullType + if tp1 == constantNullType && !ctx.mode.is(Mode.SafeNulls) + then tp2 == constantNullType else adaptType(tp1, tp2) <:< tp2 } diff --git a/compiler/src/dotty/tools/dotc/typer/Nullables.scala b/compiler/src/dotty/tools/dotc/typer/Nullables.scala index 0ea7207c7b2b..dc3957e78510 100644 --- a/compiler/src/dotty/tools/dotc/typer/Nullables.scala +++ b/compiler/src/dotty/tools/dotc/typer/Nullables.scala @@ -20,6 +20,13 @@ import ast.Trees.mods object Nullables: import ast.tpd._ + /** An attachment that represents a match tree is created under Unsafe Nulls. + * This is used to pass Unsafe Nulls information to PatternMatcher Phase, + * so we don't get Match case Unreachable Warning when using `case null => ???` + * on non-nullable type. + */ + val UnsafeNullsMatch = Property.StickyKey[Unit] + inline def unsafeNullsEnabled(using Context): Boolean = ctx.explicitNulls && !ctx.mode.is(Mode.SafeNulls) diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 09acde2ac845..b37b1f295105 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1502,7 +1502,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer } def typedMatch(tree: untpd.Match, pt: Type)(using Context): Tree = - tree.selector match { + val tree1 = tree.selector match { case EmptyTree => if (tree.isInline) { checkInInlineContext("summonFrom", tree.srcPos) @@ -1604,6 +1604,9 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer result } } + if Nullables.unsafeNullsEnabled then + tree1.putAttachment(Nullables.UnsafeNullsMatch, ()) + tree1 /** Special typing of Match tree when the expected type is a MatchType, * and the patterns of the Match tree and the MatchType correspond. diff --git a/tests/explicit-nulls/unsafe-common/unsafe-match-null.scala b/tests/explicit-nulls/unsafe-common/unsafe-match-null.scala new file mode 100644 index 000000000000..4aa85d5ba9ae --- /dev/null +++ b/tests/explicit-nulls/unsafe-common/unsafe-match-null.scala @@ -0,0 +1,12 @@ +def test1 = + val s: String = ??? + s match + case _: String => + // under unsafeNulls, we should not get Match case Unreachable Warning + case null => // error + +def test2 = + val s: String | Null = ??? + s match + case _: String => + case null => From 98a03729abe25d7b684b13fe878613c6765923fe Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Fri, 19 Nov 2021 01:04:44 -0500 Subject: [PATCH 1218/1244] Add patman test --- .../neg-patmat/{patmat1.scala => match-pat.scala} | 14 +++++++------- .../neg-patmat/unsafe-match-null-pat.scala | 14 ++++++++++++++ .../unsafe-common/unsafe-match-null.scala | 3 +-- 3 files changed, 22 insertions(+), 9 deletions(-) rename tests/explicit-nulls/neg-patmat/{patmat1.scala => match-pat.scala} (66%) create mode 100644 tests/explicit-nulls/neg-patmat/unsafe-match-null-pat.scala diff --git a/tests/explicit-nulls/neg-patmat/patmat1.scala b/tests/explicit-nulls/neg-patmat/match-pat.scala similarity index 66% rename from tests/explicit-nulls/neg-patmat/patmat1.scala rename to tests/explicit-nulls/neg-patmat/match-pat.scala index a73b1fca2e1e..fb7180d82e34 100644 --- a/tests/explicit-nulls/neg-patmat/patmat1.scala +++ b/tests/explicit-nulls/neg-patmat/match-pat.scala @@ -1,12 +1,9 @@ class Foo { + val s: String = ??? - s match { - case s: String => 100 // warning: type test will always succeed - case _ => 200 // error: unreachable - } s match { - case s: String => 100 // warning: type test will always succeed + case s: String => 100 case _ => 200 // error: unreachable } @@ -15,20 +12,23 @@ class Foo { case object Cat extends Animal val a: Animal = ??? + a match { case Dog(name) => 100 case Cat => 200 case _ => 300 // error: unreachable } - val a2: Animal|Null = ??? + val a2: Animal | Null = ??? + a2 match { case Dog(_) => 100 case Cat => 200 case _ => 300 } - val a3: Animal|Null = ??? + val a3: Animal | Null = ??? + a3 match { case Dog(_) => 100 case Cat => 200 diff --git a/tests/explicit-nulls/neg-patmat/unsafe-match-null-pat.scala b/tests/explicit-nulls/neg-patmat/unsafe-match-null-pat.scala new file mode 100644 index 000000000000..143a79d1e2f0 --- /dev/null +++ b/tests/explicit-nulls/neg-patmat/unsafe-match-null-pat.scala @@ -0,0 +1,14 @@ +import scala.language.unsafeNulls + +def test1 = + val s: String = ??? + s match + case _: String => + // under unsafeNulls, we should not get Match case Unreachable Warning + case null => // ok + +def test2 = + val s: String | Null = ??? + s match + case _: String => + case null => diff --git a/tests/explicit-nulls/unsafe-common/unsafe-match-null.scala b/tests/explicit-nulls/unsafe-common/unsafe-match-null.scala index 4aa85d5ba9ae..fc76de6ddd3a 100644 --- a/tests/explicit-nulls/unsafe-common/unsafe-match-null.scala +++ b/tests/explicit-nulls/unsafe-common/unsafe-match-null.scala @@ -2,8 +2,7 @@ def test1 = val s: String = ??? s match case _: String => - // under unsafeNulls, we should not get Match case Unreachable Warning - case null => // error + case null => // error: Values of types Null and String cannot be compared def test2 = val s: String | Null = ??? From 282d0f3915ca591b2d320c4168cbb39a88ac026d Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Fri, 19 Nov 2021 03:42:35 -0500 Subject: [PATCH 1219/1244] Fix tests in Ycheck --- compiler/src/dotty/tools/dotc/transform/patmat/Space.scala | 6 ------ compiler/src/dotty/tools/dotc/typer/Typer.scala | 2 +- compiler/test/dotty/tools/dotc/CompilationTests.scala | 1 + .../{neg-patmat => pos-patmat}/unsafe-match-null-pat.scala | 0 4 files changed, 2 insertions(+), 7 deletions(-) rename tests/explicit-nulls/{neg-patmat => pos-patmat}/unsafe-match-null-pat.scala (100%) diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala index dcb946a45ec3..7fbd6ba22178 100644 --- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala +++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala @@ -330,12 +330,6 @@ class SpaceEngine(using Context) extends SpaceLogic { private val constantNullType = ConstantType(Constant(null)) - /** Does the given tree stand for the literal `null`? */ - def isNullLit(tree: Tree): Boolean = tree match { - case Literal(Constant(null)) => true - case _ => false - } - override def intersectUnrelatedAtomicTypes(tp1: Type, tp2: Type): Space = trace(s"atomic intersection: ${AndType(tp1, tp2).show}", debug) { // Precondition: !isSubType(tp1, tp2) && !isSubType(tp2, tp1). if !ctx.mode.is(Mode.SafeNulls) && (tp1.isNullType || tp2.isNullType) then diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index b37b1f295105..5e2d7e854a5b 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1604,7 +1604,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer result } } - if Nullables.unsafeNullsEnabled then + if Nullables.unsafeNullsEnabled && ctx.phase == Phases.typerPhase then tree1.putAttachment(Nullables.UnsafeNullsMatch, ()) tree1 diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index 88eab8d131e6..4ea8db553f54 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -247,6 +247,7 @@ class CompilationTests { aggregateTests( compileFilesInDir("tests/explicit-nulls/pos", explicitNullsOptions), compileFilesInDir("tests/explicit-nulls/pos-separate", explicitNullsOptions), + compileFilesInDir("tests/explicit-nulls/pos-patmat", explicitNullsOptions and "-Xfatal-warnings"), compileFilesInDir("tests/explicit-nulls/unsafe-common", explicitNullsOptions and "-language:unsafeNulls"), ) }.checkCompile() diff --git a/tests/explicit-nulls/neg-patmat/unsafe-match-null-pat.scala b/tests/explicit-nulls/pos-patmat/unsafe-match-null-pat.scala similarity index 100% rename from tests/explicit-nulls/neg-patmat/unsafe-match-null-pat.scala rename to tests/explicit-nulls/pos-patmat/unsafe-match-null-pat.scala From b6f6e819d63cad0224ef84df882af9fe0ce56724 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Mon, 31 Jan 2022 13:26:43 -0500 Subject: [PATCH 1220/1244] Remove StickyKey --- .../src/dotty/tools/dotc/transform/PatternMatcher.scala | 7 +------ compiler/src/dotty/tools/dotc/typer/Nullables.scala | 7 ------- compiler/src/dotty/tools/dotc/typer/Typer.scala | 5 +---- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala index 43330115cd00..21aa331367ca 100644 --- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -13,7 +13,6 @@ import SymUtils._ import Flags._, Constants._ import Decorators._ import NameKinds.{PatMatStdBinderName, PatMatAltsName, PatMatResultName} -import typer.Nullables import config.Printers.patmatch import reporting._ import dotty.tools.dotc.ast._ @@ -44,12 +43,8 @@ class PatternMatcher extends MiniPhase { case rt => tree.tpe val translated = new Translator(matchType, this).translateMatch(tree) - val engineCtx = - if tree.hasAttachment(Nullables.UnsafeNullsMatch) - then ctx.retractMode(Mode.SafeNulls) else ctx - // check exhaustivity and unreachability - val engine = new patmat.SpaceEngine()(using engineCtx) + val engine = new patmat.SpaceEngine engine.checkExhaustivity(tree) engine.checkRedundancy(tree) diff --git a/compiler/src/dotty/tools/dotc/typer/Nullables.scala b/compiler/src/dotty/tools/dotc/typer/Nullables.scala index dc3957e78510..0ea7207c7b2b 100644 --- a/compiler/src/dotty/tools/dotc/typer/Nullables.scala +++ b/compiler/src/dotty/tools/dotc/typer/Nullables.scala @@ -20,13 +20,6 @@ import ast.Trees.mods object Nullables: import ast.tpd._ - /** An attachment that represents a match tree is created under Unsafe Nulls. - * This is used to pass Unsafe Nulls information to PatternMatcher Phase, - * so we don't get Match case Unreachable Warning when using `case null => ???` - * on non-nullable type. - */ - val UnsafeNullsMatch = Property.StickyKey[Unit] - inline def unsafeNullsEnabled(using Context): Boolean = ctx.explicitNulls && !ctx.mode.is(Mode.SafeNulls) diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 5e2d7e854a5b..09acde2ac845 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -1502,7 +1502,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer } def typedMatch(tree: untpd.Match, pt: Type)(using Context): Tree = - val tree1 = tree.selector match { + tree.selector match { case EmptyTree => if (tree.isInline) { checkInInlineContext("summonFrom", tree.srcPos) @@ -1604,9 +1604,6 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer result } } - if Nullables.unsafeNullsEnabled && ctx.phase == Phases.typerPhase then - tree1.putAttachment(Nullables.UnsafeNullsMatch, ()) - tree1 /** Special typing of Match tree when the expected type is a MatchType, * and the patterns of the Match tree and the MatchType correspond. From 9cbc1fa122e757214403ae35faa26857bde6fa9c Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Tue, 23 Nov 2021 14:14:07 -0500 Subject: [PATCH 1221/1244] Relax overriding by stripping nulls deeply --- .../tools/dotc/core/NullOpsDecorator.scala | 77 +++++++++++++------ .../src/dotty/tools/dotc/core/Types.scala | 4 +- .../dotc/transform/OverridingPairs.scala | 24 +++--- .../tools/dotc/transform/ResolveSuper.scala | 13 ++-- .../explicit-nulls/neg/opaque-nullable.scala | 47 +++++++++++ .../explicit-nulls/pos/opaque-nullable.scala | 26 ------- .../pos/override-type-params.scala | 18 +++++ 7 files changed, 143 insertions(+), 66 deletions(-) create mode 100644 tests/explicit-nulls/neg/opaque-nullable.scala delete mode 100644 tests/explicit-nulls/pos/opaque-nullable.scala create mode 100644 tests/explicit-nulls/pos/override-type-params.scala diff --git a/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala b/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala index d0799ca89d24..9d39186430ca 100644 --- a/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala +++ b/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala @@ -9,6 +9,41 @@ import Types._ /** Defines operations on nullable types and tree. */ object NullOpsDecorator: + private class StripNullsMap(isDeep: Boolean)(using Context) extends TypeMap: + def strip(tp: Type): Type = tp match + case tp @ OrType(lhs, rhs) => + val llhs = this(lhs) + val rrhs = this(rhs) + if rrhs.isNullType then llhs + else if llhs.isNullType then rrhs + else derivedOrType(tp, llhs, rrhs) + case tp @ AndType(tp1, tp2) => + // We cannot `tp.derivedAndType(strip(tp1), strip(tp2))` directly, + // since `stripNull((A | Null) & B)` would produce the wrong + // result `(A & B) | Null`. + val tp1s = this(tp1) + val tp2s = this(tp2) + if isDeep || (tp1s ne tp1) && (tp2s ne tp2) then + derivedAndType(tp, tp1s, tp2s) + else tp + case tp: TypeBounds => + mapOver(tp) + case _ => tp + + def stripOver(tp: Type): Type = tp match + case appTp @ AppliedType(tycon, targs) => + derivedAppliedType(appTp, tycon, targs.map(this)) + case ptp: PolyType => + derivedLambdaType(ptp)(ptp.paramInfos, this(ptp.resType)) + case mtp: MethodType => + mapOver(mtp) + case _ => strip(tp) + + override def apply(tp: Type): Type = + if isDeep then stripOver(tp) else strip(tp) + + end StripNullsMap + extension (self: Type) /** Syntactically strips the nullability from this type. * If the type is `T1 | ... | Tn`, and `Ti` references to `Null`, @@ -17,31 +52,11 @@ object NullOpsDecorator: * The type will not be changed if explicit-nulls is not enabled. */ def stripNull(using Context): Type = { - def strip(tp: Type): Type = - val tpWiden = tp.widenDealias - val tpStripped = tpWiden match { - case tp @ OrType(lhs, rhs) => - val llhs = strip(lhs) - val rrhs = strip(rhs) - if rrhs.isNullType then llhs - else if llhs.isNullType then rrhs - else tp.derivedOrType(llhs, rrhs) - case tp @ AndType(tp1, tp2) => - // We cannot `tp.derivedAndType(strip(tp1), strip(tp2))` directly, - // since `stripNull((A | Null) & B)` would produce the wrong - // result `(A & B) | Null`. - val tp1s = strip(tp1) - val tp2s = strip(tp2) - if (tp1s ne tp1) && (tp2s ne tp2) then - tp.derivedAndType(tp1s, tp2s) - else tp - case tp @ TypeBounds(lo, hi) => - tp.derivedTypeBounds(strip(lo), strip(hi)) - case tp => tp - } - if tpStripped ne tpWiden then tpStripped else tp - - if ctx.explicitNulls then strip(self) else self + if ctx.explicitNulls then + val selfw = self.widenDealias + val selfws = new StripNullsMap(false)(selfw) + if selfws ne selfw then selfws else self + else self } /** Is self (after widening and dealiasing) a type of the form `T | Null`? */ @@ -49,6 +64,18 @@ object NullOpsDecorator: val stripped = self.stripNull stripped ne self } + + /** Strips nulls from this type deeply. + * Compaired to `stripNull`, `stripNullsDeep` will apply `stripNull` to + * each member of function types as well. + */ + def stripNullsDeep(using Context): Type = + if ctx.explicitNulls then + val selfw = self.widenDealias + val selfws = new StripNullsMap(true)(selfw) + if selfws ne selfw then selfws else self + else self + end extension import ast.tpd._ diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index b4a6172a6659..05b48cc4fc3e 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -1112,8 +1112,10 @@ object Types { */ def matches(that: Type)(using Context): Boolean = { record("matches") + val thisTp1 = this.stripNullsDeep + val thatTp1 = that.stripNullsDeep withoutMode(Mode.SafeNulls)( - TypeComparer.matchesType(this, that, relaxed = !ctx.phase.erasedTypes)) + TypeComparer.matchesType(thisTp1, thatTp1, relaxed = !ctx.phase.erasedTypes)) } /** This is the same as `matches` except that it also matches => T with T and diff --git a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala index 437dfea9f156..28ed037405b2 100644 --- a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala +++ b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala @@ -5,6 +5,7 @@ package transform import core._ import Flags._, Symbols._, Contexts._, Scopes._, Decorators._, Types.Type import NameKinds.DefaultGetterName +import NullOpsDecorator._ import collection.mutable import collection.immutable.BitSet import scala.annotation.tailrec @@ -215,15 +216,20 @@ object OverridingPairs: } ) else - // releaxed override check for explicit nulls if one of the symbols is Java defined, - // force `Null` being a subtype of reference types during override checking - val relaxedCtxForNulls = + def matchNullaryLoosely = member.matchNullaryLoosely || other.matchNullaryLoosely || fallBack + // default getters are not checked for compatibility + member.name.is(DefaultGetterName) || { if ctx.explicitNulls && (member.is(JavaDefined) || other.is(JavaDefined)) then - ctx.retractMode(Mode.SafeNulls) - else ctx - member.name.is(DefaultGetterName) // default getters are not checked for compatibility - || memberTp.overrides(otherTp, - member.matchNullaryLoosely || other.matchNullaryLoosely || fallBack - )(using relaxedCtxForNulls) + // releaxed override check for explicit nulls if one of the symbols is Java defined, + // force `Null` being a subtype of reference types during override checking. + // `stripNullsDeep` is used here because we may encounter type parameters + // (`T | Null` is not a subtype of `T` even if we retract Mode.SafeNulls). + val memberTp1 = memberTp.stripNullsDeep + val otherTp1 = otherTp.stripNullsDeep + withoutMode(Mode.SafeNulls)( + memberTp1.overrides(otherTp1, matchNullaryLoosely)) + else + memberTp.overrides(otherTp, matchNullaryLoosely) + } end OverridingPairs diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index 2a4a775b834f..cc754f91f287 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -13,6 +13,7 @@ import Names._ import StdNames._ import NameOps._ import NameKinds._ +import NullOpsDecorator._ import ResolveSuper._ import reporting.IllegalSuperAccessor @@ -113,11 +114,13 @@ object ResolveSuper { // Since the super class can be Java defined, // we use releaxed overriding check for explicit nulls if one of the symbols is Java defined. // This forces `Null` being a subtype of reference types during override checking. - val relaxedCtxForNulls = - if ctx.explicitNulls && (sym.is(JavaDefined) || acc.is(JavaDefined)) then - ctx.retractMode(Mode.SafeNulls) - else ctx - if (!(otherTp.overrides(accTp, matchLoosely = true)(using relaxedCtxForNulls))) + val overridesSuper = if ctx.explicitNulls && (sym.is(JavaDefined) || acc.is(JavaDefined)) then + val otherTp1 = otherTp.stripNullsDeep + val accTp1 = accTp.stripNullsDeep + withoutMode(Mode.SafeNulls)(otherTp1.overrides(accTp1, matchLoosely = true)) + else + otherTp.overrides(accTp, matchLoosely = true) + if !overridesSuper then report.error(IllegalSuperAccessor(base, memberName, targetName, acc, accTp, other.symbol, otherTp), base.srcPos) bcs = bcs.tail diff --git a/tests/explicit-nulls/neg/opaque-nullable.scala b/tests/explicit-nulls/neg/opaque-nullable.scala new file mode 100644 index 000000000000..1d3a22249d29 --- /dev/null +++ b/tests/explicit-nulls/neg/opaque-nullable.scala @@ -0,0 +1,47 @@ +// Unboxed option type using unions + null + opaque. +// Relies on the fact that Null is not a subtype of AnyRef. +// Test suggested by Sébastien Doeraene. + +object Nullables { + opaque type Nullable[+A <: AnyRef] = A | Null // disjoint by construction! + + object Nullable: + def apply[A <: AnyRef](x: A | Null): Nullable[A] = x + + def some[A <: AnyRef](x: A): Nullable[A] = x + def none: Nullable[Nothing] = null + + extension [A <: AnyRef](x: Nullable[A]) + def isEmpty: Boolean = x == null + def get: A | Null = x + + extension [A <: AnyRef, B <: AnyRef](x: Nullable[A]) + def flatMap(f: A => Nullable[B]): Nullable[B] = + if (x == null) null + else f(x) + + def map(f: A => B): Nullable[B] = x.flatMap(f) + + def test1 = + val s1: Nullable[String] = Nullable("hello") + val s2: Nullable[String] = "world" + val s3: Nullable[String] = Nullable.none + val s4: Nullable[String] = null + + s1.isEmpty + s1.flatMap((x) => true) + + assert(s2 != null) +} + +def test2 = + import Nullables._ + + val s1: Nullable[String] = Nullable("hello") + val s2: Nullable[String] = Nullable.none + val s3: Nullable[String] = null // error: don't leak nullable union + + s1.isEmpty + s1.flatMap((x) => Nullable(true)) + + assert(s2 == null) // error diff --git a/tests/explicit-nulls/pos/opaque-nullable.scala b/tests/explicit-nulls/pos/opaque-nullable.scala deleted file mode 100644 index a7f626054ad3..000000000000 --- a/tests/explicit-nulls/pos/opaque-nullable.scala +++ /dev/null @@ -1,26 +0,0 @@ -// Unboxed option type using unions + null + opaque. -// Relies on the fact that Null is not a subtype of AnyRef. -// Test suggested by Sébastien Doeraene. - -opaque type Nullable[+A <: AnyRef] = A | Null // disjoint by construction! - -object Nullable { - def apply[A <: AnyRef](x: A | Null): Nullable[A] = x - - def some[A <: AnyRef](x: A): Nullable[A] = x - def none: Nullable[Nothing] = null - - extension [A <: AnyRef](x: Nullable[A]) - def isEmpty: Boolean = x == null - - extension [A <: AnyRef, B <: AnyRef](x: Nullable[A]) - def flatMap(f: A => Nullable[B]): Nullable[B] = - if (x == null) null - else f(x) - - val s1: Nullable[String] = "hello" - val s2: Nullable[String] = null - - s1.isEmpty - s1.flatMap((x) => true) -} diff --git a/tests/explicit-nulls/pos/override-type-params.scala b/tests/explicit-nulls/pos/override-type-params.scala new file mode 100644 index 000000000000..7f59409a4c3c --- /dev/null +++ b/tests/explicit-nulls/pos/override-type-params.scala @@ -0,0 +1,18 @@ +// Testing relaxed overriding check for explicit nulls. +// The relaxed check is only enabled if one of the members is Java defined. + +import java.util.Comparator + +class C1[T <: AnyRef] extends Ordering[T]: + override def compare(o1: T, o2: T): Int = 0 + +// The following overriding is not allowed, because `compare` +// has already been declared in Scala class `Ordering`. +// class C2[T <: AnyRef] extends Ordering[T]: +// override def compare(o1: T | Null, o2: T | Null): Int = 0 + +class D1[T <: AnyRef] extends Comparator[T]: + override def compare(o1: T, o2: T): Int = 0 + +class D2[T <: AnyRef] extends Comparator[T]: + override def compare(o1: T | Null, o2: T | Null): Int = 0 From 4f346b4312809d0f41a38d55e7625b12e26053d1 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Tue, 23 Nov 2021 14:17:51 -0500 Subject: [PATCH 1222/1244] move widenDealias --- .../dotty/tools/dotc/core/NullOpsDecorator.scala | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala b/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala index 9d39186430ca..5c6d90fac2f8 100644 --- a/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala +++ b/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala @@ -40,7 +40,9 @@ object NullOpsDecorator: case _ => strip(tp) override def apply(tp: Type): Type = - if isDeep then stripOver(tp) else strip(tp) + val tpw = tp.widenDealias + val tpws = if isDeep then stripOver(tpw) else strip(tpw) + if tpws ne tpw then tpws else tp end StripNullsMap @@ -52,11 +54,7 @@ object NullOpsDecorator: * The type will not be changed if explicit-nulls is not enabled. */ def stripNull(using Context): Type = { - if ctx.explicitNulls then - val selfw = self.widenDealias - val selfws = new StripNullsMap(false)(selfw) - if selfws ne selfw then selfws else self - else self + if ctx.explicitNulls then new StripNullsMap(false)(self) else self } /** Is self (after widening and dealiasing) a type of the form `T | Null`? */ @@ -70,11 +68,7 @@ object NullOpsDecorator: * each member of function types as well. */ def stripNullsDeep(using Context): Type = - if ctx.explicitNulls then - val selfw = self.widenDealias - val selfws = new StripNullsMap(true)(selfw) - if selfws ne selfw then selfws else self - else self + if ctx.explicitNulls then new StripNullsMap(true)(self) else self end extension From 49c9b3956056dd96947be9bece7625f2b173b387 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Fri, 4 Feb 2022 02:22:53 -0500 Subject: [PATCH 1223/1244] Testing new approach --- compiler/src/dotty/tools/dotc/core/Mode.scala | 2 + .../tools/dotc/core/NullOpsDecorator.scala | 71 +++++++------------ .../dotty/tools/dotc/core/TypeComparer.scala | 16 +++-- .../src/dotty/tools/dotc/core/Types.scala | 8 +-- .../dotc/transform/OverridingPairs.scala | 10 +-- .../tools/dotc/transform/ResolveSuper.scala | 5 +- 6 files changed, 45 insertions(+), 67 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Mode.scala b/compiler/src/dotty/tools/dotc/core/Mode.scala index 9f5b8a9a1c05..2379cd804727 100644 --- a/compiler/src/dotty/tools/dotc/core/Mode.scala +++ b/compiler/src/dotty/tools/dotc/core/Mode.scala @@ -124,4 +124,6 @@ object Mode { * This mode forces expansion of inline calls in those positions even during typing. */ val ForceInline: Mode = newMode(29, "ForceInline") + + val RelaxedOverriding: Mode = newMode(30, "ForceInline") } diff --git a/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala b/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala index 5c6d90fac2f8..d0799ca89d24 100644 --- a/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala +++ b/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala @@ -9,43 +9,6 @@ import Types._ /** Defines operations on nullable types and tree. */ object NullOpsDecorator: - private class StripNullsMap(isDeep: Boolean)(using Context) extends TypeMap: - def strip(tp: Type): Type = tp match - case tp @ OrType(lhs, rhs) => - val llhs = this(lhs) - val rrhs = this(rhs) - if rrhs.isNullType then llhs - else if llhs.isNullType then rrhs - else derivedOrType(tp, llhs, rrhs) - case tp @ AndType(tp1, tp2) => - // We cannot `tp.derivedAndType(strip(tp1), strip(tp2))` directly, - // since `stripNull((A | Null) & B)` would produce the wrong - // result `(A & B) | Null`. - val tp1s = this(tp1) - val tp2s = this(tp2) - if isDeep || (tp1s ne tp1) && (tp2s ne tp2) then - derivedAndType(tp, tp1s, tp2s) - else tp - case tp: TypeBounds => - mapOver(tp) - case _ => tp - - def stripOver(tp: Type): Type = tp match - case appTp @ AppliedType(tycon, targs) => - derivedAppliedType(appTp, tycon, targs.map(this)) - case ptp: PolyType => - derivedLambdaType(ptp)(ptp.paramInfos, this(ptp.resType)) - case mtp: MethodType => - mapOver(mtp) - case _ => strip(tp) - - override def apply(tp: Type): Type = - val tpw = tp.widenDealias - val tpws = if isDeep then stripOver(tpw) else strip(tpw) - if tpws ne tpw then tpws else tp - - end StripNullsMap - extension (self: Type) /** Syntactically strips the nullability from this type. * If the type is `T1 | ... | Tn`, and `Ti` references to `Null`, @@ -54,7 +17,31 @@ object NullOpsDecorator: * The type will not be changed if explicit-nulls is not enabled. */ def stripNull(using Context): Type = { - if ctx.explicitNulls then new StripNullsMap(false)(self) else self + def strip(tp: Type): Type = + val tpWiden = tp.widenDealias + val tpStripped = tpWiden match { + case tp @ OrType(lhs, rhs) => + val llhs = strip(lhs) + val rrhs = strip(rhs) + if rrhs.isNullType then llhs + else if llhs.isNullType then rrhs + else tp.derivedOrType(llhs, rrhs) + case tp @ AndType(tp1, tp2) => + // We cannot `tp.derivedAndType(strip(tp1), strip(tp2))` directly, + // since `stripNull((A | Null) & B)` would produce the wrong + // result `(A & B) | Null`. + val tp1s = strip(tp1) + val tp2s = strip(tp2) + if (tp1s ne tp1) && (tp2s ne tp2) then + tp.derivedAndType(tp1s, tp2s) + else tp + case tp @ TypeBounds(lo, hi) => + tp.derivedTypeBounds(strip(lo), strip(hi)) + case tp => tp + } + if tpStripped ne tpWiden then tpStripped else tp + + if ctx.explicitNulls then strip(self) else self } /** Is self (after widening and dealiasing) a type of the form `T | Null`? */ @@ -62,14 +49,6 @@ object NullOpsDecorator: val stripped = self.stripNull stripped ne self } - - /** Strips nulls from this type deeply. - * Compaired to `stripNull`, `stripNullsDeep` will apply `stripNull` to - * each member of function types as well. - */ - def stripNullsDeep(using Context): Type = - if ctx.explicitNulls then new StripNullsMap(true)(self) else self - end extension import ast.tpd._ diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index 8b4eab685f2a..ddf7fe8268bf 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -766,13 +766,15 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling isSubType(hi1, tp2, approx.addLow) || compareGADT || tryLiftedToThis1 case _ => - def isNullable(tp: Type): Boolean = tp.widenDealias match { - case tp: TypeRef => tp.symbol.isNullableClass - case tp: RefinedOrRecType => isNullable(tp.parent) - case tp: AppliedType => isNullable(tp.tycon) - case AndType(tp1, tp2) => isNullable(tp1) && isNullable(tp2) - case OrType(tp1, tp2) => isNullable(tp1) || isNullable(tp2) - case _ => false + def isNullable(tp: Type): Boolean = ctx.mode.is(Mode.RelaxedOverriding) || { + tp.widenDealias match { + case tp: TypeRef => tp.symbol.isNullableClass + case tp: RefinedOrRecType => isNullable(tp.parent) + case tp: AppliedType => isNullable(tp.tycon) + case AndType(tp1, tp2) => isNullable(tp1) && isNullable(tp2) + case OrType(tp1, tp2) => isNullable(tp1) || isNullable(tp2) + case _ => false + } } val sym1 = tp1.symbol (sym1 eq NothingClass) && tp2.isValueTypeOrLambda || diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 05b48cc4fc3e..70d1ea29c1a8 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -1112,10 +1112,10 @@ object Types { */ def matches(that: Type)(using Context): Boolean = { record("matches") - val thisTp1 = this.stripNullsDeep - val thatTp1 = that.stripNullsDeep - withoutMode(Mode.SafeNulls)( - TypeComparer.matchesType(thisTp1, thatTp1, relaxed = !ctx.phase.erasedTypes)) + val overrideCtx = if ctx.explicitNulls + then ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) + else ctx + TypeComparer.matchesType(this, that, relaxed = !ctx.phase.erasedTypes)(using overrideCtx) } /** This is the same as `matches` except that it also matches => T with T and diff --git a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala index 28ed037405b2..bee66f2e2a17 100644 --- a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala +++ b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala @@ -221,13 +221,9 @@ object OverridingPairs: member.name.is(DefaultGetterName) || { if ctx.explicitNulls && (member.is(JavaDefined) || other.is(JavaDefined)) then // releaxed override check for explicit nulls if one of the symbols is Java defined, - // force `Null` being a subtype of reference types during override checking. - // `stripNullsDeep` is used here because we may encounter type parameters - // (`T | Null` is not a subtype of `T` even if we retract Mode.SafeNulls). - val memberTp1 = memberTp.stripNullsDeep - val otherTp1 = otherTp.stripNullsDeep - withoutMode(Mode.SafeNulls)( - memberTp1.overrides(otherTp1, matchNullaryLoosely)) + // force `Null` being a bottom types during override checking. + val overrideCtx = ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) + memberTp.overrides(otherTp, matchNullaryLoosely)(using overrideCtx) else memberTp.overrides(otherTp, matchNullaryLoosely) } diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index cc754f91f287..000d3ee846ff 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -115,9 +115,8 @@ object ResolveSuper { // we use releaxed overriding check for explicit nulls if one of the symbols is Java defined. // This forces `Null` being a subtype of reference types during override checking. val overridesSuper = if ctx.explicitNulls && (sym.is(JavaDefined) || acc.is(JavaDefined)) then - val otherTp1 = otherTp.stripNullsDeep - val accTp1 = accTp.stripNullsDeep - withoutMode(Mode.SafeNulls)(otherTp1.overrides(accTp1, matchLoosely = true)) + val overrideCtx = ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) + otherTp.overrides(accTp, matchLoosely = true)(using overrideCtx) else otherTp.overrides(accTp, matchLoosely = true) if !overridesSuper then From 6ef149c24ae0b764bcb2d915090c4f133139ef9d Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Wed, 9 Feb 2022 19:47:10 -0500 Subject: [PATCH 1224/1244] Add comments --- compiler/src/dotty/tools/dotc/core/Mode.scala | 5 ++++- .../dotty/tools/dotc/core/TypeComparer.scala | 9 +++++++-- .../dotc/transform/OverridingPairs.scala | 19 ++++++++----------- .../tools/dotc/transform/ResolveSuper.scala | 12 ++++-------- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Mode.scala b/compiler/src/dotty/tools/dotc/core/Mode.scala index 2379cd804727..7a7d50ac0d33 100644 --- a/compiler/src/dotty/tools/dotc/core/Mode.scala +++ b/compiler/src/dotty/tools/dotc/core/Mode.scala @@ -125,5 +125,8 @@ object Mode { */ val ForceInline: Mode = newMode(29, "ForceInline") - val RelaxedOverriding: Mode = newMode(30, "ForceInline") + /** This mode is enabled when we check Java overriding in explicit nulls. + * Type `Null` becomes a bottom type in TypeComparer. + */ + val RelaxedOverriding: Mode = newMode(30, "RelaxedOverriding") } diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index ddf7fe8268bf..c5c25cafc085 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -766,15 +766,20 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling isSubType(hi1, tp2, approx.addLow) || compareGADT || tryLiftedToThis1 case _ => + // `Mode.RelaxedOverriding` is only enabled when checking Java overriding + // in explicit nulls, and `Null` becomes a bottom type, which allows + // `T | Null` being a subtype of `T`. + // A type varibale `T` from Java is translated to `T >: Nothing <: Any`. + // However, `null` can always be a value of `T` for Java side. + // So the best solution here is to let `Null` be bottom type temporarily. def isNullable(tp: Type): Boolean = ctx.mode.is(Mode.RelaxedOverriding) || { - tp.widenDealias match { + tp.widenDealias match case tp: TypeRef => tp.symbol.isNullableClass case tp: RefinedOrRecType => isNullable(tp.parent) case tp: AppliedType => isNullable(tp.tycon) case AndType(tp1, tp2) => isNullable(tp1) && isNullable(tp2) case OrType(tp1, tp2) => isNullable(tp1) || isNullable(tp2) case _ => false - } } val sym1 = tp1.symbol (sym1 eq NothingClass) && tp2.isValueTypeOrLambda || diff --git a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala index bee66f2e2a17..f67f11cbf920 100644 --- a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala +++ b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala @@ -216,16 +216,13 @@ object OverridingPairs: } ) else - def matchNullaryLoosely = member.matchNullaryLoosely || other.matchNullaryLoosely || fallBack - // default getters are not checked for compatibility - member.name.is(DefaultGetterName) || { - if ctx.explicitNulls && (member.is(JavaDefined) || other.is(JavaDefined)) then - // releaxed override check for explicit nulls if one of the symbols is Java defined, - // force `Null` being a bottom types during override checking. - val overrideCtx = ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) - memberTp.overrides(otherTp, matchNullaryLoosely)(using overrideCtx) - else - memberTp.overrides(otherTp, matchNullaryLoosely) - } + // releaxed override check for explicit nulls if one of the symbols is Java defined, + // force `Null` being a bottom types during override checking. + val overrideCtx = if ctx.explicitNulls && (member.is(JavaDefined) || other.is(JavaDefined)) + then ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) else ctx + member.name.is(DefaultGetterName) // default getters are not checked for compatibility + || memberTp.overrides(otherTp, + member.matchNullaryLoosely || other.matchNullaryLoosely || fallBack + )(using overrideCtx) end OverridingPairs diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index 000d3ee846ff..1f5aa25535d7 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -113,15 +113,11 @@ object ResolveSuper { val accTp = acc.asSeenFrom(base.typeRef).info // Since the super class can be Java defined, // we use releaxed overriding check for explicit nulls if one of the symbols is Java defined. - // This forces `Null` being a subtype of reference types during override checking. - val overridesSuper = if ctx.explicitNulls && (sym.is(JavaDefined) || acc.is(JavaDefined)) then - val overrideCtx = ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) - otherTp.overrides(accTp, matchLoosely = true)(using overrideCtx) - else - otherTp.overrides(accTp, matchLoosely = true) - if !overridesSuper then + // This forces `Null` being a bottom type during override checking. + val overrideCtx = if ctx.explicitNulls && (sym.is(JavaDefined) || acc.is(JavaDefined)) + then ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) else ctx + if !otherTp.overrides(accTp, matchLoosely = true)(using overrideCtx) then report.error(IllegalSuperAccessor(base, memberName, targetName, acc, accTp, other.symbol, otherTp), base.srcPos) - bcs = bcs.tail } assert(sym.exists, i"cannot rebind $acc, ${acc.targetName} $memberName") From 4d6668a3099fb1c349fc067808507171e2865088 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Thu, 10 Feb 2022 12:15:51 -0500 Subject: [PATCH 1225/1244] Fix typos --- compiler/src/dotty/tools/dotc/core/TypeComparer.scala | 2 +- compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala | 2 +- compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index c5c25cafc085..18d469f8e2f8 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -769,7 +769,7 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling // `Mode.RelaxedOverriding` is only enabled when checking Java overriding // in explicit nulls, and `Null` becomes a bottom type, which allows // `T | Null` being a subtype of `T`. - // A type varibale `T` from Java is translated to `T >: Nothing <: Any`. + // A type variable `T` from Java is translated to `T >: Nothing <: Any`. // However, `null` can always be a value of `T` for Java side. // So the best solution here is to let `Null` be bottom type temporarily. def isNullable(tp: Type): Boolean = ctx.mode.is(Mode.RelaxedOverriding) || { diff --git a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala index f67f11cbf920..a40ef61ddebd 100644 --- a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala +++ b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala @@ -217,7 +217,7 @@ object OverridingPairs: ) else // releaxed override check for explicit nulls if one of the symbols is Java defined, - // force `Null` being a bottom types during override checking. + // force `Null` to be a bottom type during override checking. val overrideCtx = if ctx.explicitNulls && (member.is(JavaDefined) || other.is(JavaDefined)) then ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) else ctx member.name.is(DefaultGetterName) // default getters are not checked for compatibility diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index 1f5aa25535d7..1ee7ee09d843 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -112,8 +112,8 @@ object ResolveSuper { val otherTp = other.asSeenFrom(base.typeRef).info val accTp = acc.asSeenFrom(base.typeRef).info // Since the super class can be Java defined, - // we use releaxed overriding check for explicit nulls if one of the symbols is Java defined. - // This forces `Null` being a bottom type during override checking. + // we use relaxed overriding check for explicit nulls if one of the symbols is Java defined. + // This forces `Null` to be a bottom type during override checking. val overrideCtx = if ctx.explicitNulls && (sym.is(JavaDefined) || acc.is(JavaDefined)) then ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) else ctx if !otherTp.overrides(accTp, matchLoosely = true)(using overrideCtx) then From a82dcdaf5dfb94f4e56b1f809a3e73e0b47dc486 Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Fri, 18 Feb 2022 13:01:27 -0500 Subject: [PATCH 1226/1244] Add restriction --- compiler/src/dotty/tools/dotc/core/Mode.scala | 2 +- .../dotty/tools/dotc/core/TypeComparer.scala | 23 +++++++++++-------- .../dotc/transform/OverridingPairs.scala | 2 +- .../tools/dotc/transform/ResolveSuper.scala | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Mode.scala b/compiler/src/dotty/tools/dotc/core/Mode.scala index 7a7d50ac0d33..ec8ab0dbca15 100644 --- a/compiler/src/dotty/tools/dotc/core/Mode.scala +++ b/compiler/src/dotty/tools/dotc/core/Mode.scala @@ -126,7 +126,7 @@ object Mode { val ForceInline: Mode = newMode(29, "ForceInline") /** This mode is enabled when we check Java overriding in explicit nulls. - * Type `Null` becomes a bottom type in TypeComparer. + * Type `Null` becomes a subtype of non-primitive value types in TypeComparer. */ val RelaxedOverriding: Mode = newMode(30, "RelaxedOverriding") } diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index 18d469f8e2f8..9e71e362a345 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -771,16 +771,19 @@ class TypeComparer(@constructorOnly initctx: Context) extends ConstraintHandling // `T | Null` being a subtype of `T`. // A type variable `T` from Java is translated to `T >: Nothing <: Any`. // However, `null` can always be a value of `T` for Java side. - // So the best solution here is to let `Null` be bottom type temporarily. - def isNullable(tp: Type): Boolean = ctx.mode.is(Mode.RelaxedOverriding) || { - tp.widenDealias match - case tp: TypeRef => tp.symbol.isNullableClass - case tp: RefinedOrRecType => isNullable(tp.parent) - case tp: AppliedType => isNullable(tp.tycon) - case AndType(tp1, tp2) => isNullable(tp1) && isNullable(tp2) - case OrType(tp1, tp2) => isNullable(tp1) || isNullable(tp2) - case _ => false - } + // So the best solution here is to let `Null` be a subtype of non-primitive + // value types temporarily. + def isNullable(tp: Type): Boolean = tp.widenDealias match + case tp: TypeRef => + val tpSym = tp.symbol + ctx.mode.is(Mode.RelaxedOverriding) && !tpSym.isPrimitiveValueClass || + tpSym.isNullableClass + case tp: RefinedOrRecType => isNullable(tp.parent) + case tp: AppliedType => isNullable(tp.tycon) + case AndType(tp1, tp2) => isNullable(tp1) && isNullable(tp2) + case OrType(tp1, tp2) => isNullable(tp1) || isNullable(tp2) + case _ => false + val sym1 = tp1.symbol (sym1 eq NothingClass) && tp2.isValueTypeOrLambda || (sym1 eq NullClass) && isNullable(tp2) diff --git a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala index a40ef61ddebd..0490f8c513e3 100644 --- a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala +++ b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala @@ -217,7 +217,7 @@ object OverridingPairs: ) else // releaxed override check for explicit nulls if one of the symbols is Java defined, - // force `Null` to be a bottom type during override checking. + // force `Null` to be a subtype of non-primitive value types during override checking. val overrideCtx = if ctx.explicitNulls && (member.is(JavaDefined) || other.is(JavaDefined)) then ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) else ctx member.name.is(DefaultGetterName) // default getters are not checked for compatibility diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index 1ee7ee09d843..aa5ac62d6c9d 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -113,7 +113,7 @@ object ResolveSuper { val accTp = acc.asSeenFrom(base.typeRef).info // Since the super class can be Java defined, // we use relaxed overriding check for explicit nulls if one of the symbols is Java defined. - // This forces `Null` to be a bottom type during override checking. + // This forces `Null` to be a subtype of non-primitive value types during override checking. val overrideCtx = if ctx.explicitNulls && (sym.is(JavaDefined) || acc.is(JavaDefined)) then ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) else ctx if !otherTp.overrides(accTp, matchLoosely = true)(using overrideCtx) then From 9b58d19e2b764761fca17842fb2572168c95120a Mon Sep 17 00:00:00 2001 From: noti0na1 Date: Sat, 19 Feb 2022 13:52:19 -0500 Subject: [PATCH 1227/1244] Move relaxed context to a function --- compiler/src/dotty/tools/dotc/core/Contexts.scala | 3 +++ compiler/src/dotty/tools/dotc/core/Types.scala | 4 +--- compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala | 2 +- compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Contexts.scala b/compiler/src/dotty/tools/dotc/core/Contexts.scala index e9fbd6065261..27859abaae52 100644 --- a/compiler/src/dotty/tools/dotc/core/Contexts.scala +++ b/compiler/src/dotty/tools/dotc/core/Contexts.scala @@ -712,6 +712,9 @@ object Contexts { def withNotNullInfos(infos: List[NotNullInfo]): Context = if c.notNullInfos eq infos then c else c.fresh.setNotNullInfos(infos) + + def relaxedOverrideContext: Context = + c.withModeBits(c.mode &~ Mode.SafeNulls | Mode.RelaxedOverriding) end ops // TODO: Fix issue when converting ModeChanges and FreshModeChanges to extension givens diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index 70d1ea29c1a8..e9eb8ed78d02 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -1112,9 +1112,7 @@ object Types { */ def matches(that: Type)(using Context): Boolean = { record("matches") - val overrideCtx = if ctx.explicitNulls - then ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) - else ctx + val overrideCtx = if ctx.explicitNulls then ctx.relaxedOverrideContext else ctx TypeComparer.matchesType(this, that, relaxed = !ctx.phase.erasedTypes)(using overrideCtx) } diff --git a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala index 0490f8c513e3..7a0516c38991 100644 --- a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala +++ b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala @@ -219,7 +219,7 @@ object OverridingPairs: // releaxed override check for explicit nulls if one of the symbols is Java defined, // force `Null` to be a subtype of non-primitive value types during override checking. val overrideCtx = if ctx.explicitNulls && (member.is(JavaDefined) || other.is(JavaDefined)) - then ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) else ctx + then ctx.relaxedOverrideContext else ctx member.name.is(DefaultGetterName) // default getters are not checked for compatibility || memberTp.overrides(otherTp, member.matchNullaryLoosely || other.matchNullaryLoosely || fallBack diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index aa5ac62d6c9d..3c03fa012464 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -115,7 +115,7 @@ object ResolveSuper { // we use relaxed overriding check for explicit nulls if one of the symbols is Java defined. // This forces `Null` to be a subtype of non-primitive value types during override checking. val overrideCtx = if ctx.explicitNulls && (sym.is(JavaDefined) || acc.is(JavaDefined)) - then ctx.retractMode(Mode.SafeNulls).addMode(Mode.RelaxedOverriding) else ctx + then ctx.relaxedOverrideContext else ctx if !otherTp.overrides(accTp, matchLoosely = true)(using overrideCtx) then report.error(IllegalSuperAccessor(base, memberName, targetName, acc, accTp, other.symbol, otherTp), base.srcPos) bcs = bcs.tail From 12535639ea9e908fdee064a7982772ae03cea479 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Sat, 19 Feb 2022 13:21:06 +0100 Subject: [PATCH 1228/1244] fix(#11202): explicitly handle TypeTree in syntax highlighting --- .../tools/dotc/printing/SyntaxHighlighting.scala | 2 +- .../dotc/printing/SyntaxHighlightingTests.scala | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala b/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala index 623f540bd721..787caf81cd07 100644 --- a/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala +++ b/compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala @@ -112,7 +112,7 @@ object SyntaxHighlighting { highlightPosition(tree.nameSpan, TypeColor) case tree: Ident if tree.isType => highlightPosition(tree.span, TypeColor) - case _: TypTree => + case _: TypeTree => highlightPosition(tree.span, TypeColor) case _ => } diff --git a/compiler/test/dotty/tools/dotc/printing/SyntaxHighlightingTests.scala b/compiler/test/dotty/tools/dotc/printing/SyntaxHighlightingTests.scala index 53a66f1d24fb..35355fd20828 100644 --- a/compiler/test/dotty/tools/dotc/printing/SyntaxHighlightingTests.scala +++ b/compiler/test/dotty/tools/dotc/printing/SyntaxHighlightingTests.scala @@ -23,7 +23,9 @@ class SyntaxHighlightingTests extends DottyTest { if (expected != highlighted) { // assertEquals produces weird expected/found message - fail(s"expected: $expected but was: $highlighted") + fail(s"""| + |expected: $expected + |highlighted: $highlighted""".stripMargin) } } @@ -41,6 +43,8 @@ class SyntaxHighlightingTests extends DottyTest { test("type Foo = Int", " = ") test("type A = String | Int", " = ") test("type B = String & Int", " = ") + test("type Id[A] = A", " [] = ") + test("type Foo = [X] =>> List[X]", " = [] =>> []") } @Test @@ -88,6 +92,10 @@ class SyntaxHighlightingTests extends DottyTest { test("val foo", " ") test("val foo =", " =") test("val foo = 123", " = ") + test( + "val foo: List[List[Int]] = List(List(1))", + " : [[]] = List(List())" + ) test("var", "") test("var foo", " ") @@ -111,7 +119,7 @@ class SyntaxHighlightingTests extends DottyTest { test("def f1(x: Int) = 123", " (: ) = ") test("def f2[T](x: T) = { 123 }", " [](: ) = { }") - test("def f3[T[_", " [[") + test("def f3[T[_", " [[_") } @Test From b7ea842bc668dd5eb24bafe2e9902521509f50ce Mon Sep 17 00:00:00 2001 From: adampauls Date: Sun, 13 Feb 2022 21:14:28 -0800 Subject: [PATCH 1229/1244] Better positions on errorTermTree --- .../dotty/tools/dotc/parsing/Parsers.scala | 16 ++++++++----- .../dotc/parsing/xml/MarkupParsers.scala | 4 ++-- .../languageserver/DiagnosticsTest.scala | 4 +--- tests/neg/arg-eof.scala | 2 +- tests/neg/errpos.scala | 4 ++-- tests/neg/i12150.check | 6 ----- tests/neg/i1846.scala | 20 ++++++++-------- tests/neg/i3812.scala | 12 +++++----- tests/neg/i5004.scala | 4 ++-- tests/neg/i7742.scala | 4 ++-- tests/neg/parser-stability-25.scala | 2 +- tests/neg/parser-stability-27.scala | 2 +- tests/neg/parser-stability-5.scala | 2 +- tests/neg/t5702-neg-bad-and-wild.check | 24 ++++++++++--------- tests/neg/t5702-neg-bad-and-wild.scala | 6 ++--- tests/neg/trailingCommas.scala | 10 ++++---- 16 files changed, 60 insertions(+), 62 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 366ed459a6a0..cd8adfb3985b 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -377,7 +377,7 @@ object Parsers { false } - def errorTermTree: Literal = atSpan(in.offset) { Literal(Constant(null)) } + def errorTermTree(start: Offset): Literal = atSpan(start, in.offset, in.offset) { Literal(Constant(null)) } private var inFunReturnType = false private def fromWithinReturnType[T](body: => T): T = { @@ -1931,7 +1931,7 @@ object Parsers { PolyFunction(tparams, body) else { syntaxError("Implementation restriction: polymorphic function literals must have a value parameter", arrowOffset) - errorTermTree + errorTermTree(arrowOffset) } } case _ => @@ -2298,8 +2298,9 @@ object Parsers { in.nextToken() simpleExpr(location) else + val start = in.lastOffset syntaxErrorOrIncomplete(IllegalStartSimpleExpr(tokenString(in.token)), expectedOffset) - errorTermTree + errorTermTree(start) } simpleExprRest(t, location, canApply) } @@ -2738,8 +2739,9 @@ object Parsers { case _ => if (isLiteral) literal(inPattern = true) else { + val start = in.lastOffset syntaxErrorOrIncomplete(IllegalStartOfSimplePattern(), expectedOffset) - errorTermTree + errorTermTree(start) } } @@ -3314,8 +3316,9 @@ object Parsers { } val rhs2 = if rhs.isEmpty && !isAllIds then + val start = in.lastOffset syntaxError(ExpectedTokenButFound(EQUALS, in.token), Span(in.lastOffset)) - errorTermTree + errorTermTree(start) else rhs PatDef(mods, lhs, tpt, rhs2) @@ -3483,11 +3486,12 @@ object Parsers { case GIVEN => givenDef(start, mods, atSpan(in.skipToken()) { Mod.Given() }) case _ => + val start = in.lastOffset syntaxErrorOrIncomplete(ExpectedStartOfTopLevelDefinition()) mods.annotations match { case head :: Nil => head case Nil => EmptyTree - case all => Block(all, errorTermTree) + case all => Block(all, errorTermTree(start)) } } diff --git a/compiler/src/dotty/tools/dotc/parsing/xml/MarkupParsers.scala b/compiler/src/dotty/tools/dotc/parsing/xml/MarkupParsers.scala index 0a05ba34c406..72e507722b2e 100644 --- a/compiler/src/dotty/tools/dotc/parsing/xml/MarkupParsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/xml/MarkupParsers.scala @@ -131,7 +131,7 @@ object MarkupParsers { try handle.parseAttribute(Span(start, curOffset, mid), tmp) catch { case e: RuntimeException => - errorAndResult("error parsing attribute value", parser.errorTermTree) + errorAndResult("error parsing attribute value", parser.errorTermTree(parser.in.offset)) } case '{' => @@ -334,7 +334,7 @@ object MarkupParsers { finally parser.in.resume(saved) if (output == null) - parser.errorTermTree + parser.errorTermTree(parser.in.offset) else output } diff --git a/language-server/test/dotty/tools/languageserver/DiagnosticsTest.scala b/language-server/test/dotty/tools/languageserver/DiagnosticsTest.scala index 7419344a304c..6b555e15015c 100644 --- a/language-server/test/dotty/tools/languageserver/DiagnosticsTest.scala +++ b/language-server/test/dotty/tools/languageserver/DiagnosticsTest.scala @@ -21,9 +21,7 @@ class DiagnosticsTest { | Nil.map(x => x).filter(x$m1 =>$m2)$m3 |}""".withSource .diagnostics(m1, - (m2 to m2, "expression expected but ')' found", Error, Some(IllegalStartSimpleExprID)), - (m1 to m1, """Found: Null - |Required: Boolean""".stripMargin, Error, Some(TypeMismatchID)) + (m2 to m2, "expression expected but ')' found", Error, Some(IllegalStartSimpleExprID)) ) @Test def diagnosticPureExpression: Unit = diff --git a/tests/neg/arg-eof.scala b/tests/neg/arg-eof.scala index ba860b5dfae0..7e20f655ceeb 100644 --- a/tests/neg/arg-eof.scala +++ b/tests/neg/arg-eof.scala @@ -1,3 +1,3 @@ object Test: case class Widget(name: String, other: Int = 5) - Widget(name = "foo", // error // error \ No newline at end of file + Widget(name = "foo", // error \ No newline at end of file diff --git a/tests/neg/errpos.scala b/tests/neg/errpos.scala index 64ed9983dc47..8c5db4eb899d 100644 --- a/tests/neg/errpos.scala +++ b/tests/neg/errpos.scala @@ -10,7 +10,7 @@ object Test { val b = type // error: expression expected (on "type") 1 match { - case // error: pattern expected // error: cannot compare with Null + case // error: pattern expected case 2 => "" } -} \ No newline at end of file +} diff --git a/tests/neg/i12150.check b/tests/neg/i12150.check index 60f559cde474..0491973310d1 100644 --- a/tests/neg/i12150.check +++ b/tests/neg/i12150.check @@ -4,9 +4,3 @@ | expression expected but end found | | longer explanation available when compiling with `-explain` --- [E129] Potential Issue Warning: tests/neg/i12150.scala:1:11 --------------------------------------------------------- -1 |def f: Unit = // error - | ^ - | A pure expression does nothing in statement position; you may be omitting necessary parentheses - | - | longer explanation available when compiling with `-explain` diff --git a/tests/neg/i1846.scala b/tests/neg/i1846.scala index b7cdc9f75136..f661a86d5daf 100644 --- a/tests/neg/i1846.scala +++ b/tests/neg/i1846.scala @@ -3,17 +3,17 @@ object Test { val x = 42 val Y = "42" - x match { case { 42 } => () } // error // error - x match { case { 42.toString } => () } // error // error - x match { case { 42 }.toString => () } // error // error + x match { case { 42 } => () } // error + x match { case { 42.toString } => () } // error + x match { case { 42 }.toString => () } // error x match { case "42".toInt => () } // error - x match { case { "42".toInt } => () } // error // error - x match { case { "42" }.toInt => () } // error // error - x match { case { "42".toInt } => () } // error // error + x match { case { "42".toInt } => () } // error + x match { case { "42" }.toInt => () } // error + x match { case { "42".toInt } => () } // error x match { case Y => () } // error - x match { case { Y.toInt } => () } // error // error - x match { case { Y }.toInt => () } // error // error - x match { case { Y }.toString => () } // error // error - x match { case { Y.toString } => () } // error // error + x match { case { Y.toInt } => () } // error + x match { case { Y }.toInt => () } // error + x match { case { Y }.toString => () } // error + x match { case { Y.toString } => () } // error } } diff --git a/tests/neg/i3812.scala b/tests/neg/i3812.scala index d8cc21ec7293..182721d65ea0 100644 --- a/tests/neg/i3812.scala +++ b/tests/neg/i3812.scala @@ -3,11 +3,11 @@ object Test { val x = 42 val Y = "42" - x match { case { 42 } => () } // error // error - x match { case { "42".toInt } => () } // error // error - x match { case { "42" }.toInt => () } // error // error - x match { case { "42".toInt } => () } // error // error - x match { case { Y.toInt } => () } // error // error - x match { case { Y }.toInt => () } // error // error + x match { case { 42 } => () } // error + x match { case { "42".toInt } => () } // error + x match { case { "42" }.toInt => () } // error + x match { case { "42".toInt } => () } // error + x match { case { Y.toInt } => () } // error + x match { case { Y }.toInt => () } // error } } diff --git a/tests/neg/i5004.scala b/tests/neg/i5004.scala index dab26430e7fe..a8acfa231bca 100644 --- a/tests/neg/i5004.scala +++ b/tests/neg/i5004.scala @@ -1,6 +1,6 @@ object i0 { 1 match { def this(): Int // error - def this() + def this() // error +} } -} \ No newline at end of file diff --git a/tests/neg/i7742.scala b/tests/neg/i7742.scala index 9294decf531d..425e47daa873 100644 --- a/tests/neg/i7742.scala +++ b/tests/neg/i7742.scala @@ -1,3 +1,3 @@ object A { - for // error // error -} \ No newline at end of file + for // error +} diff --git a/tests/neg/parser-stability-25.scala b/tests/neg/parser-stability-25.scala index 23db4498af0e..9d5212233e87 100644 --- a/tests/neg/parser-stability-25.scala +++ b/tests/neg/parser-stability-25.scala @@ -11,5 +11,5 @@ class D extends (Int => 1) { } class Wrap(x: Int) -class E extends (Wrap)( // error +class E extends (Wrap)( // error \ No newline at end of file diff --git a/tests/neg/parser-stability-27.scala b/tests/neg/parser-stability-27.scala index ed841d95c08b..d6ec69299961 100644 --- a/tests/neg/parser-stability-27.scala +++ b/tests/neg/parser-stability-27.scala @@ -1,2 +1,2 @@ -class F extends (Int => 1)( // error +class F extends (Int => 1)( // error \ No newline at end of file diff --git a/tests/neg/parser-stability-5.scala b/tests/neg/parser-stability-5.scala index c9ad5f76fb9b..69f4568aab73 100644 --- a/tests/neg/parser-stability-5.scala +++ b/tests/neg/parser-stability-5.scala @@ -1,4 +1,4 @@ trait x0 { x1 : { // error -var x2 // error +var x2 // error \ No newline at end of file diff --git a/tests/neg/t5702-neg-bad-and-wild.check b/tests/neg/t5702-neg-bad-and-wild.check index 761613fcf75c..72b3d952241a 100644 --- a/tests/neg/t5702-neg-bad-and-wild.check +++ b/tests/neg/t5702-neg-bad-and-wild.check @@ -1,15 +1,19 @@ -- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:10:22 --------------------------------------------------- -10 | case List(1, _*,) => // error: pattern expected // error +10 | case List(1, _*,) => // error: pattern expected | ^ | pattern expected | | longer explanation available when compiling with `-explain` -- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:12:23 --------------------------------------------------- -12 | case List(1, _*3,) => // error: pattern expected // error // error +12 | case List(1, _*3,) => // error: pattern expected // error | ^ | pattern expected | | longer explanation available when compiling with `-explain` +-- [E040] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:13:23 --------------------------------------------------- +13 | case List(1, _*3:) => // error // error + | ^ + | an identifier expected, but ')' found -- [E032] Syntax Error: tests/neg/t5702-neg-bad-and-wild.scala:15:18 --------------------------------------------------- 15 | case List(x*, 1) => // error: pattern expected | ^ @@ -34,17 +38,15 @@ | x is already defined as value x | | Note that overloaded methods must all be defined in the same group of toplevel definitions --- Error: tests/neg/t5702-neg-bad-and-wild.scala:10:21 ----------------------------------------------------------------- -10 | case List(1, _*,) => // error: pattern expected // error - | ^ - | Values of types Null and Int cannot be compared with == or != -- [E006] Not Found Error: tests/neg/t5702-neg-bad-and-wild.scala:12:20 ------------------------------------------------ -12 | case List(1, _*3,) => // error: pattern expected // error // error +12 | case List(1, _*3,) => // error: pattern expected // error + | ^ + | Not found: * + | + | longer explanation available when compiling with `-explain` +-- [E006] Not Found Error: tests/neg/t5702-neg-bad-and-wild.scala:13:20 ------------------------------------------------ +13 | case List(1, _*3:) => // error // error | ^ | Not found: * | | longer explanation available when compiling with `-explain` --- Error: tests/neg/t5702-neg-bad-and-wild.scala:12:22 ----------------------------------------------------------------- -12 | case List(1, _*3,) => // error: pattern expected // error // error - | ^ - | Values of types Null and Int cannot be compared with == or != diff --git a/tests/neg/t5702-neg-bad-and-wild.scala b/tests/neg/t5702-neg-bad-and-wild.scala index b943fc15ba2b..d9fec80cf493 100644 --- a/tests/neg/t5702-neg-bad-and-wild.scala +++ b/tests/neg/t5702-neg-bad-and-wild.scala @@ -7,10 +7,10 @@ object Test { val is = List(1,2,3) is match { - case List(1, _*,) => // error: pattern expected // error + case List(1, _*,) => // error: pattern expected - case List(1, _*3,) => // error: pattern expected // error // error - //case List(1, _*3:) => // poor recovery by parens + case List(1, _*3,) => // error: pattern expected // error + case List(1, _*3:) => // error // error case List(1, x*) => // ok case List(x*, 1) => // error: pattern expected case (1, x*) => //ok diff --git a/tests/neg/trailingCommas.scala b/tests/neg/trailingCommas.scala index 5cc243a9c8be..2a24fc83c79e 100644 --- a/tests/neg/trailingCommas.scala +++ b/tests/neg/trailingCommas.scala @@ -2,10 +2,10 @@ package foo // Multi-line only cases: make sure trailing commas are only supported when multi-line -trait ArgumentExprs1 { validMethod(23, "bar", )(Ev0, Ev1) } // error // error -trait ArgumentExprs2 { validMethod(23, "bar")(Ev0, Ev1, ) } // error // error -trait ArgumentExprs3 { new ValidClass(23, "bar", )(Ev0, Ev1) } // error // error -trait ArgumentExprs4 { new ValidClass(23, "bar")(Ev0, Ev1, ) } // error // error +trait ArgumentExprs1 { validMethod(23, "bar", )(Ev0, Ev1) } // error +trait ArgumentExprs2 { validMethod(23, "bar")(Ev0, Ev1, ) } // error +trait ArgumentExprs3 { new ValidClass(23, "bar", )(Ev0, Ev1) } // error +trait ArgumentExprs4 { new ValidClass(23, "bar")(Ev0, Ev1, ) } // error trait Params1 { def f(foo: Int, bar: String, )(implicit ev0: Ev0, ev1: Ev1, ) = 1 } // error // error @@ -55,4 +55,4 @@ object `package` { case class Foo(foo: Any) case class Bar(foo: Any) -} \ No newline at end of file +} From 618d3e7fbe1219cd641416711cf058c40f7a7d28 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sun, 20 Feb 2022 15:08:44 +0100 Subject: [PATCH 1230/1244] Thread context through block in transforms correctly and efficiently Fixes #14319 --- .../tools/dotc/ast/TreeMapWithImplicits.scala | 8 +------ compiler/src/dotty/tools/dotc/ast/Trees.scala | 6 +++-- compiler/src/dotty/tools/dotc/ast/tpd.scala | 23 ++++++++++++++----- .../tools/dotc/transform/MegaPhase.scala | 17 ++++++++++---- .../tools/dotc/transform/PostTyper.scala | 4 ++-- tests/explicit-nulls/pos/unsafe-chain.scala | 10 ++++++++ 6 files changed, 47 insertions(+), 21 deletions(-) create mode 100644 tests/explicit-nulls/pos/unsafe-chain.scala diff --git a/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala b/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala index 3f4ff4687787..999a80c5e446 100644 --- a/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala +++ b/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala @@ -48,13 +48,7 @@ class TreeMapWithImplicits extends tpd.TreeMapWithPreciseStatContexts { override def transform(tree: Tree)(using Context): Tree = { try tree match { case Block(stats, expr) => - inContext(nestedScopeCtx(stats)) { - if stats.exists(_.isInstanceOf[Import]) then - // need to transform stats and expr together to account for import visibility - val stats1 = transformStats(stats :+ expr, ctx.owner) - cpy.Block(tree)(stats1.init, stats1.last) - else super.transform(tree) - } + super.transform(tree)(using nestedScopeCtx(stats)) case tree: DefDef => inContext(localCtx(tree)) { cpy.DefDef(tree)( diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala index 7aa4491c31de..9a371e946e08 100644 --- a/compiler/src/dotty/tools/dotc/ast/Trees.scala +++ b/compiler/src/dotty/tools/dotc/ast/Trees.scala @@ -1399,8 +1399,8 @@ object Trees { cpy.NamedArg(tree)(name, transform(arg)) case Assign(lhs, rhs) => cpy.Assign(tree)(transform(lhs), transform(rhs)) - case Block(stats, expr) => - cpy.Block(tree)(transformStats(stats, ctx.owner), transform(expr)) + case blk: Block => + transformBlock(blk) case If(cond, thenp, elsep) => cpy.If(tree)(transform(cond), transform(thenp), transform(elsep)) case Closure(env, meth, tpt) => @@ -1489,6 +1489,8 @@ object Trees { def transformStats(trees: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = transform(trees) + def transformBlock(blk: Block)(using Context): Block = + cpy.Block(blk)(transformStats(blk.stats, ctx.owner), transform(blk.expr)) def transform(trees: List[Tree])(using Context): List[Tree] = flatten(trees mapConserve (transform(_))) def transformSub[Tr <: Tree](tree: Tr)(using Context): Tr = diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index 5845773fe65b..a75ccd107736 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -1157,9 +1157,12 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { * - be tail-recursive where possible * - don't re-allocate trees where nothing has changed */ - inline def mapStatements(exprOwner: Symbol, inline op: Tree => Context ?=> Tree)(using Context): List[Tree] = + inline def mapStatements[T]( + exprOwner: Symbol, + inline op: Tree => Context ?=> Tree, + inline wrapResult: List[Tree] => Context ?=> T)(using Context): T = @tailrec - def loop(mapped: mutable.ListBuffer[Tree] | Null, unchanged: List[Tree], pending: List[Tree])(using Context): List[Tree] = + def loop(mapped: mutable.ListBuffer[Tree] | Null, unchanged: List[Tree], pending: List[Tree])(using Context): T = pending match case stat :: rest => val statCtx = stat match @@ -1182,8 +1185,9 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { case _ => buf += stat1 loop(buf, rest, rest)(using restCtx) case nil => - if mapped == null then unchanged - else mapped.prependToList(unchanged) + wrapResult( + if mapped == null then unchanged + else mapped.prependToList(unchanged)) loop(null, trees, trees) end mapStatements @@ -1195,8 +1199,15 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo { * - imports are reflected in the contexts of subsequent statements */ class TreeMapWithPreciseStatContexts(cpy: TreeCopier = tpd.cpy) extends TreeMap(cpy): - override def transformStats(trees: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = - trees.mapStatements(exprOwner, transform(_)) + def transformStats[T](trees: List[Tree], exprOwner: Symbol, wrapResult: List[Tree] => Context ?=> T)(using Context): T = + trees.mapStatements(exprOwner, transform(_), wrapResult) + final override def transformStats(trees: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = + transformStats(trees, exprOwner, sameStats) + override def transformBlock(blk: Block)(using Context) = + transformStats(blk.stats, ctx.owner, + stats1 => ctx ?=> cpy.Block(blk)(stats1, transform(blk.expr))) + + val sameStats: List[Tree] => Context ?=> List[Tree] = stats => stats /** Map Inlined nodes, NamedArgs, Blocks with no statements and local references to underlying arguments. * Also drops Inline and Block with no statements. diff --git a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala index 56342322824c..8de60186b26c 100644 --- a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala +++ b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala @@ -296,9 +296,7 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase { } case tree: Block => inContext(prepBlock(tree, start)(using outerCtx)) { - val stats = transformStats(tree.stats, ctx.owner, start) - val expr = transformTree(tree.expr, start) - goBlock(cpy.Block(tree)(stats, expr), start) + transformBlock(tree, start) } case tree: TypeApply => inContext(prepTypeApply(tree, start)(using outerCtx)) { @@ -434,9 +432,20 @@ class MegaPhase(val miniPhases: Array[MiniPhase]) extends Phase { def transformStats(trees: List[Tree], exprOwner: Symbol, start: Int)(using Context): List[Tree] = val nestedCtx = prepStats(trees, start) - val trees1 = trees.mapStatements(exprOwner, transformTree(_, start))(using nestedCtx) + val trees1 = trees.mapStatements(exprOwner, transformTree(_, start), stats1 => stats1)(using nestedCtx) goStats(trees1, start)(using nestedCtx) + def transformBlock(tree: Block, start: Int)(using Context): Tree = + val nestedCtx = prepStats(tree.stats, start) + val block1 = tree.stats.mapStatements(ctx.owner, + transformTree(_, start), + stats1 => ctx ?=> { + val stats2 = goStats(stats1, start)(using nestedCtx) + val expr2 = transformTree(tree.expr, start) + cpy.Block(tree)(stats2, expr2) + })(using nestedCtx) + goBlock(block1, start) + def transformUnit(tree: Tree)(using Context): Tree = { val nestedCtx = prepUnit(tree, 0) val tree1 = transformTree(tree, 0)(using nestedCtx) diff --git a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala index bfcf6cc6e5bf..926600ebbdd4 100644 --- a/compiler/src/dotty/tools/dotc/transform/PostTyper.scala +++ b/compiler/src/dotty/tools/dotc/transform/PostTyper.scala @@ -458,8 +458,8 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase throw ex } - override def transformStats(trees: List[Tree], exprOwner: Symbol)(using Context): List[Tree] = - try super.transformStats(trees, exprOwner) + override def transformStats[T](trees: List[Tree], exprOwner: Symbol, wrapResult: List[Tree] => Context ?=> T)(using Context): T = + try super.transformStats(trees, exprOwner, wrapResult) finally Checking.checkExperimentalImports(trees) /** Transforms the rhs tree into a its default tree if it is in an `erased` val/def. diff --git a/tests/explicit-nulls/pos/unsafe-chain.scala b/tests/explicit-nulls/pos/unsafe-chain.scala new file mode 100644 index 000000000000..76c80d0c53fe --- /dev/null +++ b/tests/explicit-nulls/pos/unsafe-chain.scala @@ -0,0 +1,10 @@ +import java.nio.file.FileSystems +import java.util.ArrayList + +def directorySeparator: String = + import scala.language.unsafeNulls + FileSystems.getDefault().getSeparator() + +def getFirstOfFirst(xs: ArrayList[ArrayList[ArrayList[String]]]): String = + import scala.language.unsafeNulls + xs.get(0).get(0).get(0) \ No newline at end of file From 55f980814c5df9fb08560fced88e69756193beec Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Sun, 20 Feb 2022 19:24:40 +0100 Subject: [PATCH 1231/1244] Fix "forward reference from self constructor" checking The previous check did not consider the case where the self constructor was itself a block that originated from named and default parameters in the actual self constructor call. That gave a false negative for some code in akka. The negative was not discovered before since we did not propagate the correct context information into the expression of a block. --- .../dotc/transform/ForwardDepChecks.scala | 50 +++++++++++++------ tests/neg/complex-self-call.scala | 30 +++++++++++ tests/pos/complex-self-call.scala | 29 +++++++++++ 3 files changed, 94 insertions(+), 15 deletions(-) create mode 100644 tests/neg/complex-self-call.scala create mode 100644 tests/pos/complex-self-call.scala diff --git a/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala b/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala index e01c975d0f0d..0de1a523d265 100644 --- a/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala +++ b/compiler/src/dotty/tools/dotc/transform/ForwardDepChecks.scala @@ -25,10 +25,10 @@ object ForwardDepChecks: } /** A class to help in forward reference checking */ - class LevelInfo(outerLevelAndIndex: LevelAndIndex, stats: List[Tree])(using Context) + class LevelInfo(val outer: OptLevelInfo, val owner: Symbol, stats: List[Tree])(using Context) extends OptLevelInfo { override val levelAndIndex: LevelAndIndex = - stats.foldLeft(outerLevelAndIndex, 0) {(mi, stat) => + stats.foldLeft(outer.levelAndIndex, 0) {(mi, stat) => val (m, idx) = mi val m1 = stat match { case stat: MemberDef => m.updated(stat.symbol, (this, idx)) @@ -71,7 +71,7 @@ class ForwardDepChecks extends MiniPhase: override def prepareForStats(trees: List[Tree])(using Context): Context = if (ctx.owner.isTerm) - ctx.fresh.updateStore(LevelInfo, new LevelInfo(currentLevel.levelAndIndex, trees)) + ctx.fresh.updateStore(LevelInfo, new LevelInfo(currentLevel, ctx.owner, trees)) else ctx override def transformValDef(tree: ValDef)(using Context): ValDef = @@ -89,19 +89,39 @@ class ForwardDepChecks extends MiniPhase: tree } - override def transformApply(tree: Apply)(using Context): Apply = { - if (isSelfConstrCall(tree)) { - assert(currentLevel.isInstanceOf[LevelInfo], s"${ctx.owner}/" + i"$tree") - val level = currentLevel.asInstanceOf[LevelInfo] - if (level.maxIndex > 0) { - // An implementation restriction to avoid VerifyErrors and lazyvals mishaps; see SI-4717 - report.debuglog("refsym = " + level.refSym) - report.error("forward reference not allowed from self constructor invocation", - ctx.source.atSpan(level.refSpan)) - } - } + /** Check that self constructor call does not contain references to vals or defs + * defined later in the secondary constructor's right hand side. This is tricky + * since the complete self constructor might itself be a block that originated from + * expanding named and default parameters. In that case we have to go outwards + * and find the enclosing expression that consists of that block. Test cases in + * {pos,neg}/complex-self-call.scala. + */ + private def checkSelfConstructorCall()(using Context): Unit = + // Find level info corresponding to constructor's RHS. This is the info of the + // outermost LevelInfo that has the constructor as owner. + def rhsLevelInfo(l: OptLevelInfo): OptLevelInfo = l match + case l: LevelInfo if l.owner == ctx.owner => + rhsLevelInfo(l.outer) match + case l1: LevelInfo => l1 + case _ => l + case _ => + NoLevelInfo + + rhsLevelInfo(currentLevel) match + case level: LevelInfo => + if level.maxIndex > 0 then + report.debuglog("refsym = " + level.refSym.showLocated) + report.error("forward reference not allowed from self constructor invocation", + ctx.source.atSpan(level.refSpan)) + case _ => + assert(false, s"${ctx.owner.showLocated}") + end checkSelfConstructorCall + + override def transformApply(tree: Apply)(using Context): Apply = + if (isSelfConstrCall(tree)) + assert(ctx.owner.isConstructor) + checkSelfConstructorCall() tree - } override def transformNew(tree: New)(using Context): New = { currentLevel.enterReference(tree.tpe.typeSymbol, tree.span) diff --git a/tests/neg/complex-self-call.scala b/tests/neg/complex-self-call.scala new file mode 100644 index 000000000000..bd9651e8200f --- /dev/null +++ b/tests/neg/complex-self-call.scala @@ -0,0 +1,30 @@ +// An example extracted from akka that demonstrated a spurious +// "forward reference not allowed from self constructor invocation" error. +class Resizer +class SupervisorStrategy +class Pool +object Pool: + def defaultSupervisorStrategy: SupervisorStrategy = ??? +object Dispatchers: + def DefaultDispatcherId = ??? +object Resizer: + def fromConfig(config: Config): Option[Resizer] = ??? + +class Config: + def getInt(str: String): Int = ??? + def hasPath(str: String): Boolean = ??? + +final case class BroadcastPool( + nrOfInstances: Int, + val resizer: Option[Resizer] = None, + val supervisorStrategy: SupervisorStrategy = Pool.defaultSupervisorStrategy, + val routerDispatcher: String = Dispatchers.DefaultDispatcherId, + val usePoolDispatcher: Boolean = false) + extends Pool: + + def this(config: Config) = + this( + nrOfInstances = config.getInt("nr-of-instances"), + resizer = resiz, // error: forward reference not allowed from self constructor invocation + usePoolDispatcher = config.hasPath("pool-dispatcher")) + def resiz = Resizer.fromConfig(config) \ No newline at end of file diff --git a/tests/pos/complex-self-call.scala b/tests/pos/complex-self-call.scala new file mode 100644 index 000000000000..2e0e09c7a3e7 --- /dev/null +++ b/tests/pos/complex-self-call.scala @@ -0,0 +1,29 @@ +// An example extracted from akka that demonstrated a spurious +// "forward reference not allowed from self constructor invocation" error. +class Resizer +class SupervisorStrategy +class Pool +object Pool: + def defaultSupervisorStrategy: SupervisorStrategy = ??? +object Dispatchers: + def DefaultDispatcherId = ??? +object Resizer: + def fromConfig(config: Config): Option[Resizer] = ??? + +class Config: + def getInt(str: String): Int = ??? + def hasPath(str: String): Boolean = ??? + +final case class BroadcastPool( + nrOfInstances: Int, + val resizer: Option[Resizer] = None, + val supervisorStrategy: SupervisorStrategy = Pool.defaultSupervisorStrategy, + val routerDispatcher: String = Dispatchers.DefaultDispatcherId, + val usePoolDispatcher: Boolean = false) + extends Pool: + + def this(config: Config) = + this( + nrOfInstances = config.getInt("nr-of-instances"), + resizer = Resizer.fromConfig(config), + usePoolDispatcher = config.hasPath("pool-dispatcher")) From 105036d3ddc5d3f7d9e3bdf7f9e77bd4ca849464 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 13 Jan 2022 10:26:36 +0000 Subject: [PATCH 1232/1244] Protected case class constructor -> private apply --- .../src/dotty/tools/dotc/ast/Desugar.scala | 16 ++------------- tests/neg/caseclass-access.scala | 16 +++++++++++---- tests/neg/i14187.scala | 7 +++++++ tests/pos/caseclass-access.scala | 20 +++++++++---------- 4 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 tests/neg/i14187.scala diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index 9c8201b4fa02..47638d3a88fd 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -697,23 +697,11 @@ object desugar { // For all other classes, the parent is AnyRef. val companions = if (isCaseClass) { - - // true if access to the apply method has to be restricted - // i.e. if the case class constructor is either private or qualified private - def restrictedAccess = { - val mods = constr1.mods - mods.is(Private) || (!mods.is(Protected) && mods.hasPrivateWithin) - } - val applyMeths = if (mods.is(Abstract)) Nil else { - val copiedFlagsMask = copiedAccessFlags & Private - val appMods = { - val mods = Modifiers(Synthetic | constr1.mods.flags & copiedFlagsMask) - if (restrictedAccess) mods.withPrivateWithin(constr1.mods.privateWithin) - else mods - } + val appMods = + Modifiers(Synthetic | constr1.mods.flags & copiedAccessFlags).withPrivateWithin(constr1.mods.privateWithin) val appParamss = derivedVparamss.nestedZipWithConserve(constrVparamss)((ap, cp) => ap.withMods(ap.mods | (cp.mods.flags & HasDefault))) diff --git a/tests/neg/caseclass-access.scala b/tests/neg/caseclass-access.scala index b14ee104ecca..de2305b6e3ec 100644 --- a/tests/neg/caseclass-access.scala +++ b/tests/neg/caseclass-access.scala @@ -1,12 +1,14 @@ case class A private (i: Int) object A object ATest { + def a0: A = new A(0) // error: constructor is private def a1: A = A(1) // error: apply is private def a2: A = a1.copy(2) // error: copy is private } case class B private (i: Int) // ok: no user-defined companion object object BTest { + def b0: B = new B(0) // error: constructor is private def b1: B = B(1) // error: apply is private def b2: B = b1.copy(2) // error: copy is private } @@ -19,17 +21,21 @@ object qualified_private { } object QPrivTest { import qualified_private.* + def c0: C = new C(0) // error: constructor is private def c1: C = C(1) // error: apply is private def c2: C = c1.copy(2) // error: copy is private + def d0: D = new D(0) // error: constructor is private def d1: D = D(1) // error: apply is private def d2: D = d1.copy(2) // error: copy is private } case class E protected (i: Int) object ETest { - def e1: E = E(1) - def e2: E = e2.copy(2) // error: copy is protected + def e0: E = new E(0) // error: constructor is protected + def e1: E = E(1) // error: apply is protected + def e2: E = e1.copy(2) // error: copy is protected + def eta: Int => E = E // error: apply is protected } object qualified_protected { @@ -37,6 +43,8 @@ object qualified_protected { } object QProtTest { import qualified_protected.* - def f1: F = F(1) - def f2: F = f2.copy(2) // error: copy is protected + def f0: F = new F(0) // error: constructor is protected + def f1: F = F(1) // error: apply is protected + def f2: F = f1.copy(2) // error: copy is protected + def eta: Int => F = F // error: apply is protected } diff --git a/tests/neg/i14187.scala b/tests/neg/i14187.scala new file mode 100644 index 000000000000..6e915dc02f38 --- /dev/null +++ b/tests/neg/i14187.scala @@ -0,0 +1,7 @@ +sealed case class Foo protected (i: Int, j: Int) + +final class Bar(n: Int) extends Foo(n, n) + +class Other: + def foo = Foo(1, 2) // error + def foo2 = Foo.apply(1, 2) // error diff --git a/tests/pos/caseclass-access.scala b/tests/pos/caseclass-access.scala index 1d8dc03089e7..6e5ed7a0f05e 100644 --- a/tests/pos/caseclass-access.scala +++ b/tests/pos/caseclass-access.scala @@ -1,24 +1,30 @@ case class A private (i: Int) object A { + def a0 = new A(0) // constructor is accessible in companion def a = A(1).copy(2) // apply and copy are accessible in companion } case class B private (i: Int) { // no user-defined companion object, should compile + def b0 = new B(0) // constructor is accessible def b = B(1).copy(2) // apply and copy are accessible } object qualified_private { case class A private[qualified_private] (i: Int) object A { + def a0 = new A(0) // constructor is accessible in companion def a = A(1).copy(2) // apply and copy are accessible in companion } + def a0 = new A(0) // constructor is accessible in qualified_private object def a = A(1).copy(2) // apply and copy are accessible in qualified_private object case class B private[qualified_private] (i: Int) { // no user-defined companion object, should compile + def b0 = new B(0) // constructor is accessible def b = B(1).copy(2) // apply and copy are accessible } + def b0 = new B(0) // constructor is accessible in qualified_private object def b = B(1).copy(2) // apply and copy are accessible in qualified_private object } @@ -26,22 +32,14 @@ case class C protected (i: Int) class CSub extends C(1) { def c = copy(2) // copy is accessible in subclass } -object CTest { - def c = C(1) // apply is public -} object qualified_protected { case class C protected[qualified_protected] (i: Int) class CSub extends C(1) { def c = copy(2) // copy is accessible in subclass } - object CTest { - def c = C(1) // apply is public - def checkExtendsFunction: Int => C = C // companion extends (Int => C) - } + def eta: Int => C = C // can eta-expand C.apply method - def c = C(1).copy(2) -} -object CQualifiedTest { - def c = qualified_protected.C(1) // apply is public + def c0 = new C(0) // constructor is accessible in qualified_protected object + def c = C(1).copy(2) // apply and copy are accessible in qualified_protected object } From 60fe22f0caef7b246c27c88badcf70affd81d5da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=8BAndrzej=20Ressel?= Date: Wed, 16 Feb 2022 10:21:28 +0100 Subject: [PATCH 1233/1244] Set context when reporting summonInline errors --- .../src/dotty/tools/dotc/typer/Inliner.scala | 16 +++++++++------- tests/neg-macros/i13406/Qux_1.scala | 4 ++++ tests/neg-macros/i13406/Test_2.scala | 8 ++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 tests/neg-macros/i13406/Qux_1.scala create mode 100644 tests/neg-macros/i13406/Test_2.scala diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index 7749f4f0c0b7..eae58373fb07 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -849,13 +849,15 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) { def searchImplicit(tpt: Tree) = val evTyper = new Typer(ctx.nestingLevel + 1) val evCtx = ctx.fresh.setTyper(evTyper) - val evidence = evTyper.inferImplicitArg(tpt.tpe, tpt.span)(using evCtx) - evidence.tpe match - case fail: Implicits.SearchFailureType => - val msg = evTyper.missingArgMsg(evidence, tpt.tpe, "") - errorTree(call, em"$msg") - case _ => - evidence + inContext(evCtx) { + val evidence = evTyper.inferImplicitArg(tpt.tpe, tpt.span) + evidence.tpe match + case fail: Implicits.SearchFailureType => + val msg = evTyper.missingArgMsg(evidence, tpt.tpe, "") + errorTree(call, em"$msg") + case _ => + evidence + } return searchImplicit(callTypeArgs.head) } diff --git a/tests/neg-macros/i13406/Qux_1.scala b/tests/neg-macros/i13406/Qux_1.scala new file mode 100644 index 000000000000..f68c92de6612 --- /dev/null +++ b/tests/neg-macros/i13406/Qux_1.scala @@ -0,0 +1,4 @@ +// Qux_1.scala +sealed trait Qux[T] // anonymous mirror because no companion +object QuxImpl: + case class Foo[A](a: A) extends Qux[A] diff --git a/tests/neg-macros/i13406/Test_2.scala b/tests/neg-macros/i13406/Test_2.scala new file mode 100644 index 000000000000..f2cb0a3f05ee --- /dev/null +++ b/tests/neg-macros/i13406/Test_2.scala @@ -0,0 +1,8 @@ +// Test_2.scala +trait Bar + +inline given derivedReducible(using scala.deriving.Mirror.SumOf[Qux[_]]): Bar = + scala.compiletime.summonInline[Bar] + ??? + +def test = derivedReducible // error From 0133a3e95008e220a9bbc1c846d0279506dd1507 Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Sat, 19 Feb 2022 21:14:23 +0100 Subject: [PATCH 1234/1244] fix(parser): make empty catch an incomplete. When parsing a `TRY` if there is an empty catch block instead of just returning a syntax error return an incomplete if you're at the EOF. This ensures that in the REPL if you are in a position like: ```scala scala> try { | ??? | } catch ``` And you hit enter you'll still be able to continue. Fixes #4393 --- compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 8 +++++++- compiler/test/dotty/tools/repl/ReplCompilerTests.scala | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index cd8adfb3985b..5543ebc0b798 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -280,6 +280,12 @@ object Parsers { syntaxError(msg, offset) skip(stopAtComma = true) + def syntaxErrorOrIncomplete(msg: Message, span: Span): Unit = + if (in.token == EOF) incompleteInputError(msg) + else + syntaxError(msg, span) + skip(stopAtComma = true) + /** Consume one token of the specified type, or * signal an error if it is not there. * @@ -2003,7 +2009,7 @@ object Parsers { handler match { case Block(Nil, EmptyTree) => assert(handlerStart != -1) - syntaxError( + syntaxErrorOrIncomplete( EmptyCatchBlock(body), Span(handlerStart, endOffset(handler)) ) diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala index c02552aac83c..69b3df423c5b 100644 --- a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala +++ b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala @@ -300,4 +300,14 @@ class ReplVerboseTests extends ReplTest(ReplTest.defaultOptions :+ "-verbose"): run("val a = 42") assert(storedOutput().trim().endsWith("val a: Int = 42")) } + + @Test def `i4393-incomplete-catch`: Unit = contextually { + assert(ParseResult.isIncomplete("""|try { + | ??? + |} catch""".stripMargin)) + assert(ParseResult.isIncomplete("""|try { + | ??? + |} catch {""".stripMargin)) + } + end ReplVerboseTests From 69ede37c3a25a8e091e54144ee6fbf6a9671bc15 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 21 Feb 2022 14:43:19 +0100 Subject: [PATCH 1235/1244] Don't skip override tests when overridden is AbsOverride Fixes #14415 --- .../dotty/tools/dotc/typer/RefChecks.scala | 7 ++++++- tests/neg/i14415.check | 5 +++++ tests/neg/i14415.scala | 21 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tests/neg/i14415.check create mode 100644 tests/neg/i14415.scala diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala index 834cfba2a8a0..520c5d03e32e 100644 --- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala @@ -208,15 +208,20 @@ object RefChecks { false precedesIn(parent.asClass.baseClasses) - // We can exclude pairs safely from checking only under two additional conditions + // We can exclude pairs safely from checking only under three additional conditions // - their signatures also match in the parent class. // See neg/i12828.scala for an example where this matters. // - They overriding/overridden appear in linearization order. // See neg/i5094.scala for an example where this matters. + // - The overridden symbol is not `abstract override`. For such symbols + // we need a more extensive test since the virtual super chain depends + // on the precise linearization order, which might be different for the + // subclass. See neg/i14415.scala. override def canBeHandledByParent(sym1: Symbol, sym2: Symbol, parent: Symbol): Boolean = isOverridingPair(sym1, sym2, parent.thisType) .showing(i"already handled ${sym1.showLocated}: ${sym1.asSeenFrom(parent.thisType).signature}, ${sym2.showLocated}: ${sym2.asSeenFrom(parent.thisType).signature} = $result", refcheck) && inLinearizationOrder(sym1, sym2, parent) + && !sym2.is(AbsOverride) def checkAll(checkOverride: (Symbol, Symbol) => Unit) = while hasNext do diff --git a/tests/neg/i14415.check b/tests/neg/i14415.check new file mode 100644 index 000000000000..596debf175dc --- /dev/null +++ b/tests/neg/i14415.check @@ -0,0 +1,5 @@ +-- [E164] Declaration Error: tests/neg/i14415.scala:21:6 --------------------------------------------------------------- +21 |class X extends E with D // error + | ^ + | error overriding method m in trait C of type (a: Int): Int; + | method m in trait D of type (a: Int): Int needs `abstract override` modifiers diff --git a/tests/neg/i14415.scala b/tests/neg/i14415.scala new file mode 100644 index 000000000000..8683766625ad --- /dev/null +++ b/tests/neg/i14415.scala @@ -0,0 +1,21 @@ +trait A { + def m(a:Int): Int +} + +trait B extends A { + override def m(a:Int): Int = { return a; } +} + +trait C extends A { + abstract override def m(a:Int):Int = { return super.m(a); } +} + +trait D extends B with C { + override def m(a:Int):Int = { return super.m(a); } +} + +trait E extends C with B { + abstract override def m(a:Int):Int = { return super.m(a); } +} + +class X extends E with D // error From 5bb036c9592c9458c8684f70596b3f202c971503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Mon, 14 Feb 2022 08:35:16 +0100 Subject: [PATCH 1236/1244] Introduce generation config for Scaladoc --- library/src/scala/quoted/Exprs.scala | 2 +- project/Build.scala | 243 +++++++++++++++++---------- project/ScaladocGeneration.scala | 181 ++++++++++++++++++++ 3 files changed, 340 insertions(+), 86 deletions(-) create mode 100644 project/ScaladocGeneration.scala diff --git a/library/src/scala/quoted/Exprs.scala b/library/src/scala/quoted/Exprs.scala index f4504ed2f50d..24e1ed16552f 100644 --- a/library/src/scala/quoted/Exprs.scala +++ b/library/src/scala/quoted/Exprs.scala @@ -5,7 +5,7 @@ object Exprs: /** Matches literal sequence of literal constant value expressions and return a sequence of values. * * Usage: - * ```scala + * ```scala sc:nocompile * inline def sum(args: Int*): Int = ${ sumExpr('args) } * def sumExpr(argsExpr: Expr[Seq[Int]])(using Quotes): Expr[Int] = argsExpr match * case Varargs(Exprs(args)) => diff --git a/project/Build.scala b/project/Build.scala index 21321e60d6d7..d5f97cfb72e6 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -2,6 +2,7 @@ import java.io.File import java.nio.file._ import Modes._ +import ScaladocGeneration._ import com.jsuereth.sbtpgp.PgpKeys import sbt.Keys._ import sbt._ @@ -59,6 +60,8 @@ object DottyJSPlugin extends AutoPlugin { } object Build { + import ScaladocConfigs._ + val referenceVersion = "3.1.2-RC1" val baseVersion = "3.1.3-RC1" @@ -1287,39 +1290,15 @@ object Build { libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13) ) - def generateDocumentation(targets: Seq[String], name: String, outDir: String, ref: String, params: Seq[String] = Nil, includeExternalMappings: Boolean = true) = + def generateDocumentation(configTask: Def.Initialize[Task[GenerationConfig]]) = Def.taskDyn { - val distLocation = (dist / pack).value - val projectVersion = version.value - IO.createDirectory(file(outDir)) - val stdLibVersion = stdlibVersion(NonBootstrapped) - val scalaLib = findArtifactPath(externalCompilerClasspathTask.value, "scala-library") - val dottyLib = (`scala3-library` / Compile / classDirectory).value - // TODO add versions etc. - def srcManaged(v: String, s: String) = s"out/bootstrap/stdlib-bootstrapped/scala-$v/src_managed/main/$s-library-src" - def scalaSrcLink(v: String, s: String) = s"-source-links:${s}github://scala/scala/v$v#src/library" - def dottySrcLink(v: String, sourcesPrefix: String = "", outputPrefix: String = "") = - sys.env.get("GITHUB_SHA") match { - case Some(sha) => - s"-source-links:${sourcesPrefix}github://${sys.env("GITHUB_REPOSITORY")}/$sha$outputPrefix" - case None => s"-source-links:${sourcesPrefix}github://lampepfl/dotty/$v$outputPrefix" - } - - val revision = Seq("-revision", ref, "-project-version", projectVersion) - val cmd = Seq( - "-d", - outDir, - "-project", - name, - scalaSrcLink(stdLibVersion, srcManaged(dottyNonBootstrappedVersion, "scala") + "="), - dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "dotty") + "=", "#library/src"), - dottySrcLink(referenceVersion), - "-Ygenerate-inkuire", - ) ++ scalacOptionsDocSettings(includeExternalMappings) ++ revision ++ params ++ targets - import _root_.scala.sys.process._ - val escapedCmd = cmd.map(arg => if(arg.contains(" ")) s""""$arg"""" else arg) + val config = configTask.value + config.get[OutputDir].foreach { outDir => + IO.createDirectory(file(outDir.value)) + } + val command = generateCommand(config) Def.task { - (Compile / run).toTask(escapedCmd.mkString(" ", " ", "")).value + (Compile / run).toTask(command).value } } @@ -1363,66 +1342,40 @@ object Build { Test / testcasesSourceRoot := ((`scaladoc-testcases` / baseDirectory).value / "src").getAbsolutePath.toString, run / baseDirectory := (ThisBuild / baseDirectory).value, generateSelfDocumentation := Def.taskDyn { - generateDocumentation( - (Compile / classDirectory).value.getAbsolutePath :: Nil, - "scaladoc", "scaladoc/output/self", VersionUtil.gitHash, Seq("-usejavacp") - ) + generateDocumentation(Scaladoc) }.value, + generateScalaDocumentation := Def.inputTaskDyn { - val extraArgs = spaceDelimited("[output]").parsed - val dest = file(extraArgs.headOption.getOrElse("scaladoc/output/scala3")).getAbsoluteFile - val justAPI = extraArgs.drop(1).headOption == Some("--justAPI") val majorVersion = (LocalProject("scala3-library-bootstrapped") / scalaBinaryVersion).value - val dottyJars: Seq[java.io.File] = Seq( - (`stdlib-bootstrapped`/Compile/products).value, - (`scala3-interfaces`/Compile/products).value, - (`tasty-core-bootstrapped`/Compile/products).value, - ).flatten - - val roots = dottyJars.map(_.getAbsolutePath) - - val managedSources = - (`stdlib-bootstrapped`/Compile/sourceManaged).value / "scala-library-src" - val projectRoot = (ThisBuild/baseDirectory).value.toPath - val stdLibRoot = projectRoot.relativize(managedSources.toPath.normalize()) - val docRootFile = stdLibRoot.resolve("rootdoc.txt") - - val dottyManagesSources = - (`stdlib-bootstrapped`/Compile/sourceManaged).value / "dotty-library-src" - - val dottyLibRoot = projectRoot.relativize(dottyManagesSources.toPath.normalize()) - - def generateDocTask = - generateDocumentation( - roots, "Scala 3", dest.getAbsolutePath, "main", - Seq( - "-comment-syntax", "wiki", - s"-source-links:docs=github://lampepfl/dotty/main#docs", - "-doc-root-content", docRootFile.toString, - "-versions-dictionary-url", - "https://scala-lang.org/api/versions.json", - "-Ydocument-synthetic-types", - s"-snippet-compiler:${dottyLibRoot}/scala/quoted=compile,${dottyLibRoot}/scala/compiletime=compile" - ) ++ (if (justAPI) Nil else Seq("-siteroot", "docs", "-Yapi-subdirectory")), includeExternalMappings = false) - - if (dottyJars.isEmpty) Def.task { streams.value.log.error("Dotty lib wasn't found") } - else if (justAPI) generateDocTask - else Def.task{ - IO.write(dest / "versions" / "latest-nightly-base", majorVersion) - - // This file is used by GitHub Pages when the page is available in a custom domain - IO.write(dest / "CNAME", "dotty.epfl.ch") - }.dependsOn(generateDocTask) + + val extraArgs = spaceDelimited("[] [--justAPI]").parsed + val outputDirOverride = extraArgs.headOption.fold(identity[GenerationConfig](_))(newDir => { + config: GenerationConfig => config.add(OutputDir(newDir)) + }) + val justAPIArg: Option[String] = extraArgs.drop(1).find(_ == "--justAPI") + val justAPI = justAPIArg.fold(identity[GenerationConfig](_))(_ => { + config: GenerationConfig => config.remove[SiteRoot] + }) + val overrideFunc = outputDirOverride.andThen(justAPI) + + val config = Def.task { + overrideFunc(Scala3.value) + } + + val writeAdditionalFiles = Def.task { + val dest = file(config.value.get[OutputDir].get.value) + if (justAPIArg.isEmpty) { + IO.write(dest / "versions" / "latest-nightly-base", majorVersion) + // This file is used by GitHub Pages when the page is available in a custom domain + IO.write(dest / "CNAME", "dotty.epfl.ch") + } + } + + writeAdditionalFiles.dependsOn(generateDocumentation(config)) }.evaluated, generateTestcasesDocumentation := Def.taskDyn { - generateDocumentation( - (Test / Build.testcasesOutputDir).value, - "scaladoc testcases", - "scaladoc/output/testcases", - "main", - Seq("-usejavacp", "-snippet-compiler:scaladoc-testcases/docs=compile", "-siteroot", "scaladoc-testcases/docs") - ) + generateDocumentation(Testcases) }.value, Test / buildInfoKeys := Seq[BuildInfoKey]( @@ -1803,3 +1756,123 @@ object Build { }) } } + +object ScaladocConfigs { + import Build._ + private lazy val currentYear: String = java.util.Calendar.getInstance().get(java.util.Calendar.YEAR).toString + + def dottyExternalMapping = ".*scala/.*::scaladoc3::https://dotty.epfl.ch/api/" + def javaExternalMapping = ".*java/.*::javadoc::https://docs.oracle.com/javase/8/docs/api/" + + lazy val DefaultGenerationConfig = Def.task { + def distLocation = (dist / pack).value + def projectVersion = version.value + def stdLibVersion = stdlibVersion(NonBootstrapped) + def scalaLib = findArtifactPath(externalCompilerClasspathTask.value, "scala-library") + def dottyLib = (`scala3-library` / Compile / classDirectory).value + def srcManaged(v: String, s: String) = s"out/bootstrap/stdlib-bootstrapped/scala-$v/src_managed/main/$s-library-src" + def scalaSrcLink(v: String, s: String) = s"${s}github://scala/scala/v$v#src/library" + def dottySrcLink(v: String, sourcesPrefix: String = "", outputPrefix: String = "") = + sys.env.get("GITHUB_SHA") match { + case Some(sha) => + s"${sourcesPrefix}github://${sys.env("GITHUB_REPOSITORY")}/$sha$outputPrefix" + case None => s"${sourcesPrefix}github://lampepfl/dotty/$v$outputPrefix" + } + + def defaultSourceLinks: SourceLinks = SourceLinks( + List( + scalaSrcLink(stdLibVersion, srcManaged(dottyNonBootstrappedVersion, "scala") + "="), + dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "dotty") + "=", "#library/src"), + dottySrcLink(referenceVersion), + "docs=github://lampepfl/dotty/main#docs" + ) + ) + def socialLinks = SocialLinks(List( + "github::https://github.com/lampepfl/dotty", + "discord::https://discord.com/invite/scala", + "twitter::https://twitter.com/scala_lang", + )) + def projectLogo = ProjectLogo("docs/_assets/images/logo.svg") + def skipByRegex = SkipByRegex(List(".+\\.internal($|\\..+)", ".+\\.impl($|\\..+)")) + def skipById = SkipById(List( + "scala.runtime.stdLibPatches", + "scala.runtime.MatchCase" + )) + def projectFooter = ProjectFooter(s"Copyright (c) 2002-$currentYear, LAMP/EPFL") + def defaultTemplate = DefaultTemplate("static-site-main") + GenerationConfig( + List(), + ProjectVersion(projectVersion), + GenerateInkuire(true), + defaultSourceLinks, + skipByRegex, + skipById, + projectLogo, + socialLinks, + projectFooter, + defaultTemplate, + Author(true), + Groups(true) + ) + } + + lazy val Scaladoc = Def.task { + DefaultGenerationConfig.value + .add(UseJavacp(true)) + .add(ProjectName("scaladoc")) + .add(OutputDir("scaladoc/output/self")) + .add(Revision(VersionUtil.gitHash)) + .add(ExternalMappings(List(dottyExternalMapping, javaExternalMapping))) + .withTargets((Compile / classDirectory).value.getAbsolutePath :: Nil) + } + + lazy val Testcases = Def.task { + val tastyRoots = (Test / Build.testcasesOutputDir).value + DefaultGenerationConfig.value + .add(UseJavacp(true)) + .add(OutputDir("scaladoc/output/testcases")) + .add(ProjectName("scaladoc testcases")) + .add(Revision("main")) + .add(SnippetCompiler(List("scaladoc-testcases/docs=compile"))) + .add(SiteRoot("scaladoc-testcases/docs")) + .add(ExternalMappings(List(dottyExternalMapping, javaExternalMapping))) + .withTargets(tastyRoots) + } + + lazy val Scala3 = Def.task { + val dottyJars: Seq[java.io.File] = Seq( + (`stdlib-bootstrapped`/Compile/products).value, + (`scala3-interfaces`/Compile/products).value, + (`tasty-core-bootstrapped`/Compile/products).value, + ).flatten + + val roots = dottyJars.map(_.getAbsolutePath) + + val managedSources = + (`stdlib-bootstrapped`/Compile/sourceManaged).value / "scala-library-src" + val projectRoot = (ThisBuild/baseDirectory).value.toPath + val stdLibRoot = projectRoot.relativize(managedSources.toPath.normalize()) + val docRootFile = stdLibRoot.resolve("rootdoc.txt") + + val dottyManagesSources = + (`stdlib-bootstrapped`/Compile/sourceManaged).value / "dotty-library-src" + + val dottyLibRoot = projectRoot.relativize(dottyManagesSources.toPath.normalize()) + DefaultGenerationConfig.value + .add(ProjectName("Scala 3")) + .add(OutputDir(file("scaladoc/output/scala3").getAbsoluteFile.getAbsolutePath)) + .add(Revision("main")) + .add(ExternalMappings(List(javaExternalMapping))) + .add(DocRootContent(docRootFile.toString)) + .add(CommentSyntax("wiki")) + .add(VersionsDictionaryUrl("https://scala-lang.org/api/versions.json")) + .add(DocumentSyntheticTypes(true)) + .add(SnippetCompiler(List( + s"${dottyLibRoot}/scala/quoted=compile", + s"${dottyLibRoot}/scala/compiletime=compile" + ))) + .add(SiteRoot("docs")) + .add(ApiSubdirectory(true)) + .withTargets(roots) + } +} \ No newline at end of file diff --git a/project/ScaladocGeneration.scala b/project/ScaladocGeneration.scala new file mode 100644 index 000000000000..bce20b23ec37 --- /dev/null +++ b/project/ScaladocGeneration.scala @@ -0,0 +1,181 @@ +import sbt._ +import Build._ + +object ScaladocGeneration { + def generateCommand(config: GenerationConfig): String = + " " + config.serialize + + sealed trait Arg[T] { + def key: String + def value: T + + def serialize: String = + value match { + case s: String => s"$key ${escape(s)}" + case true => s"$key" + case list: List[String] => s"$key:${list.map(escape).mkString(",")}" + case _ => + println(s"Unsupported setting: $key -> $value") + "" + } + + private def escape(s: String) = if(s.contains(" ")) s""""$s"""" else s + } + case class ProjectName(value: String) extends Arg[String] { + def key: String = "-project" + } + + case class OutputDir(value: String) extends Arg[String] { + def key: String = "-d" + } + + case class ProjectVersion(value: String) extends Arg[String] { + def key: String = "-project-version" + } + + case class ProjectLogo(value: String) extends Arg[String] { + def key: String = "-project-logo" + } + + case class ProjectFooter(value: String) extends Arg[String] { + def key: String = "-project-footer" + } + + case class SourceLinks(value: List[String]) extends Arg[List[String]] { + def key: String = "-source-links" + } + + case class CommentSyntax(value: String) extends Arg[String] { + def key: String = "-comment-syntax" + } + + case class Revision(value: String) extends Arg[String] { + def key: String = "-revision" + } + + case class ExternalMappings(value: List[String]) extends Arg[List[String]] { + def key: String = "-external-mappings" + } + + case class SocialLinks(value: List[String]) extends Arg[List[String]] { + def key: String = "-social-links" + } + + case class SkipPackages(value: List[String]) extends Arg[List[String]] { + def key: String = "-skip-packages" + } + + case class SkipById(value: List[String]) extends Arg[List[String]] { + def key: String = "-skip-by-id" + } + + case class SkipByRegex(value: List[String]) extends Arg[List[String]] { + def key: String = "-skip-by-regex" + } + + case class DocRootContent(value: String) extends Arg[String] { + def key: String = "-doc-root-content" + } + + case class Author(value: Boolean) extends Arg[Boolean] { + def key: String = "-author" + } + + case class Groups(value: Boolean) extends Arg[Boolean] { + def key: String = "-groups" + } + + case class DocCanonicalBaseUrl(value: String) extends Arg[String] { + def key: String = "-doc-canonical-base-url" + } + + case class SiteRoot(value: String) extends Arg[String] { + def key: String = "-siteroot" + } + + case class NoLinkWarnings(value: Boolean) extends Arg[Boolean] { + def key: String = "-no-link-warnings" + } + + case class VersionsDictionaryUrl(value: String) extends Arg[String] { + def key: String = "-versions-dictionary-url" + } + + case class DocumentSyntheticTypes(value: Boolean) extends Arg[Boolean] { + def key: String = "-Ydocument-synthetic-types" + } + + case class SnippetCompiler(value: List[String]) extends Arg[List[String]] { + def key: String = "-snippet-compiler" + } + + case class GenerateInkuire(value: Boolean) extends Arg[Boolean] { + def key: String = "-Ygenerate-inkuire" + } + + case class ApiSubdirectory(value: Boolean) extends Arg[Boolean] { + def key: String = "-Yapi-subdirectory" + } + + case class ScastieConfiguration(value: String) extends Arg[String] { + def key: String = "-scastie-configuration" + } + + case class DefaultTemplate(value: String) extends Arg[String] { + def key: String = "-default-template" + } + + case class UseJavacp(value: Boolean) extends Arg[Boolean] { + def key: String = "-usejavacp" + } + + import _root_.scala.reflect._ + + trait GenerationConfig { + def get[T <: Arg[_] : ClassTag]: Option[T] + def add[T <: Arg[_]](arg: T): GenerationConfig + def remove[T <: Arg[_]: ClassTag]: GenerationConfig + def withTargets(targets: Seq[String]): GenerationConfig + def serialize: String + } + + object GenerationConfig { + def apply(): GenerationConfig = GenerationConfigImpl(Seq.empty, Seq.empty) + def apply(targets: List[String], args: Arg[_]*): GenerationConfig = args.foldLeft(GenerationConfig()) { (config, elem) => + config.add(elem) + } + private case class GenerationConfigImpl(targets: Seq[String], args: Seq[Arg[_]]) extends GenerationConfig { + override def add[T <: Arg[_]](arg: T): GenerationConfig = { + implicit val tag: ClassTag[T] = ClassTag(arg.getClass) + val (removedElem, argsWithoutElem) = argsWithout[T](tag) + removedElem.foreach(elem => println(s"$elem has been overwritten by $arg")) + GenerationConfigImpl(targets, argsWithoutElem :+ arg) + } + override def remove[T <: Arg[_] : ClassTag]: GenerationConfig = { + GenerationConfigImpl(targets, argsWithout[T]._2) + } + + override def get[T <: Arg[_] : ClassTag]: Option[T] = { + val tag = implicitly[ClassTag[T]] + args.collect { + case tag(t) => t + }.headOption + } + + override def withTargets(targets: Seq[String]) = copy(targets = targets) + override def serialize: String = ( + args + .map(_.serialize) + ++ targets + ).mkString(" ") + + private def argsWithout[T <: Arg[_]]( + implicit tag: ClassTag[T] + ): (Option[T], Seq[Arg[_]]) = args.foldLeft[(Option[T], Seq[Arg[_]])]((None, Seq.empty)) { + case ((removedElem, rest), tag(t)) => (Some(t), rest) + case ((removedElem, rest), elem) => (removedElem, rest :+ elem) + } + } + } + +} \ No newline at end of file From 6c8f21d27a3644cc8f71001918696ee233404cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Tue, 15 Feb 2022 11:25:30 +0100 Subject: [PATCH 1237/1244] Add task generating Scala 3 language reference --- project/Build.scala | 41 +++++- .../_layouts/static-site-main.html | 44 ++++++ .../referenceReplacements/sidebar.yml | 139 ++++++++++++++++++ .../src/dotty/tools/scaladoc/PathBased.scala | 4 +- .../tools/scaladoc/renderers/Renderer.scala | 4 +- 5 files changed, 221 insertions(+), 11 deletions(-) create mode 100644 project/resources/referenceReplacements/_layouts/static-site-main.html create mode 100644 project/resources/referenceReplacements/sidebar.yml diff --git a/project/Build.scala b/project/Build.scala index d5f97cfb72e6..65de7af82a48 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1256,6 +1256,8 @@ object Build { val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib") val generateTestcasesDocumentation = taskKey[Unit]("Generate documentation for testcases, usefull for debugging tests") + val generateReferenceDocumentation = taskKey[Unit]("Generate language reference documentation for Scala 3") + lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")). dependsOn(`scala3-compiler-bootstrapped`). settings(commonBootstrappedSettings) @@ -1378,6 +1380,31 @@ object Build { generateDocumentation(Testcases) }.value, + generateReferenceDocumentation := Def.taskDyn { + val temp = IO.createTemporaryDirectory + IO.copyDirectory(file("docs"), temp / "docs") + IO.delete(temp / "docs" / "_blog") + + IO.copyDirectory( + file("project") / "resources" / "referenceReplacements", + temp / "docs", + overwrite = true + ) + + val languageReferenceConfig = Def.task { + Scala3.value + .add(OutputDir("scaladoc/output/reference")) + .add(SiteRoot(s"${temp.getAbsolutePath}/docs")) + .add(ProjectName("Scala 3 Reference")) + .add(SourceLinks(List( + dottySrcLink(referenceVersion, temp.getAbsolutePath + "=") + ))) + .withTargets(List("___fake___.scala")) + } + + generateDocumentation(languageReferenceConfig) + }.value, + Test / buildInfoKeys := Seq[BuildInfoKey]( (Test / Build.testcasesOutputDir), (Test / Build.testcasesSourceRoot), @@ -1763,6 +1790,13 @@ object ScaladocConfigs { def dottyExternalMapping = ".*scala/.*::scaladoc3::https://dotty.epfl.ch/api/" def javaExternalMapping = ".*java/.*::javadoc::https://docs.oracle.com/javase/8/docs/api/" + def scalaSrcLink(v: String, s: String) = s"${s}github://scala/scala/v$v#src/library" + def dottySrcLink(v: String, sourcesPrefix: String = "", outputPrefix: String = "") = + sys.env.get("GITHUB_SHA") match { + case Some(sha) => + s"${sourcesPrefix}github://${sys.env("GITHUB_REPOSITORY")}/$sha$outputPrefix" + case None => s"${sourcesPrefix}github://lampepfl/dotty/$v$outputPrefix" + } lazy val DefaultGenerationConfig = Def.task { def distLocation = (dist / pack).value @@ -1771,13 +1805,6 @@ object ScaladocConfigs { def scalaLib = findArtifactPath(externalCompilerClasspathTask.value, "scala-library") def dottyLib = (`scala3-library` / Compile / classDirectory).value def srcManaged(v: String, s: String) = s"out/bootstrap/stdlib-bootstrapped/scala-$v/src_managed/main/$s-library-src" - def scalaSrcLink(v: String, s: String) = s"${s}github://scala/scala/v$v#src/library" - def dottySrcLink(v: String, sourcesPrefix: String = "", outputPrefix: String = "") = - sys.env.get("GITHUB_SHA") match { - case Some(sha) => - s"${sourcesPrefix}github://${sys.env("GITHUB_REPOSITORY")}/$sha$outputPrefix" - case None => s"${sourcesPrefix}github://lampepfl/dotty/$v$outputPrefix" - } def defaultSourceLinks: SourceLinks = SourceLinks( List( diff --git a/project/resources/referenceReplacements/_layouts/static-site-main.html b/project/resources/referenceReplacements/_layouts/static-site-main.html new file mode 100644 index 000000000000..d47907819956 --- /dev/null +++ b/project/resources/referenceReplacements/_layouts/static-site-main.html @@ -0,0 +1,44 @@ +--- +layout: main +--- +
+ + {{ content }} + +
diff --git a/project/resources/referenceReplacements/sidebar.yml b/project/resources/referenceReplacements/sidebar.yml new file mode 100644 index 000000000000..7d43febb562f --- /dev/null +++ b/project/resources/referenceReplacements/sidebar.yml @@ -0,0 +1,139 @@ +index: reference/overview.md +subsection: + - page: reference/overview.md + - title: New Types + index: reference/new-types/new-types.md + subsection: + - page: reference/new-types/intersection-types.md + - page: reference/new-types/intersection-types-spec.md + - page: reference/new-types/union-types.md + - page: reference/new-types/union-types-spec.md + - page: reference/new-types/type-lambdas.md + - page: reference/new-types/type-lambdas-spec.md + - page: reference/new-types/match-types.md + - page: reference/new-types/dependent-function-types.md + - page: reference/new-types/dependent-function-types-spec.md + - page: reference/new-types/polymorphic-function-types.md + - title: Enums + index: reference/enums/enums-index.md + subsection: + - page: reference/enums/enums.md + - page: reference/enums/adts.md + - page: reference/enums/desugarEnums.md + - title: Contextual Abstractions + index: reference/contextual/contextual.md + directory: contextual + subsection: + - page: reference/contextual/givens.md + - page: reference/contextual/using-clauses.md + - page: reference/contextual/context-bounds.md + - page: reference/contextual/given-imports.md + - page: reference/contextual/extension-methods.md + - page: reference/contextual/right-associative-extension-methods.md + - page: reference/contextual/type-classes.md + - page: reference/contextual/derivation.md + - page: reference/contextual/derivation-macro.md + - page: reference/contextual/multiversal-equality.md + - page: reference/contextual/context-functions.md + - page: reference/contextual/context-functions-spec.md + - page: reference/contextual/conversions.md + - page: reference/contextual/by-name-context-parameters.md + - page: reference/contextual/relationship-implicits.md + - title: Metaprogramming + index: reference/metaprogramming/metaprogramming.md + subsection: + - page: reference/metaprogramming/inline.md + - page: reference/metaprogramming/compiletime-ops.md + - page: reference/metaprogramming/macros.md + - page: reference/metaprogramming/macros-spec.md + - page: reference/metaprogramming/staging.md + - page: reference/metaprogramming/reflection.md + - page: reference/metaprogramming/tasty-inspect.md + - title: Other New Features + index: reference/other-new-features/other-new-types.md + subsection: + - page: reference/other-new-features/trait-parameters.md + - page: reference/other-new-features/transparent-traits.md + - page: reference/other-new-features/creator-applications.md + - page: reference/other-new-features/export.md + - page: reference/other-new-features/opaques.md + - page: reference/other-new-features/opaques-details.md + - page: reference/other-new-features/open-classes.md + - page: reference/other-new-features/parameter-untupling.md + - page: reference/other-new-features/parameter-untupling-spec.md + - page: reference/other-new-features/kind-polymorphism.md + - page: reference/other-new-features/matchable.md + - page: reference/other-new-features/threadUnsafe-annotation.md + - page: reference/other-new-features/targetName.md + - page: reference/other-new-features/control-syntax.md + - page: reference/other-new-features/indentation.md + - page: reference/other-new-features/safe-initialization.md + - page: reference/other-new-features/type-test.md + - page: reference/other-new-features/experimental-defs.md + - title: Other Changed Features + directory: changed-features + index: reference/changed-features/changed-features.md + subsection: + - page: reference/changed-features/numeric-literals.md + - page: reference/changed-features/structural-types.md + - page: reference/changed-features/structural-types-spec.md + - page: reference/changed-features/operators.md + - page: reference/changed-features/wildcards.md + - page: reference/changed-features/imports.md + - page: reference/changed-features/type-checking.md + - page: reference/changed-features/type-inference.md + - page: reference/changed-features/implicit-resolution.md + - page: reference/changed-features/implicit-conversions.md + - page: reference/changed-features/implicit-conversions-spec.md + - page: reference/changed-features/overload-resolution.md + - page: reference/changed-features/match-syntax.md + - page: reference/changed-features/vararg-splices.md + - page: reference/changed-features/pattern-bindings.md + - page: reference/changed-features/pattern-matching.md + - page: reference/changed-features/eta-expansion.md + - page: reference/changed-features/eta-expansion-spec.md + - page: reference/changed-features/compiler-plugins.md + - page: reference/changed-features/lazy-vals-init.md + - page: reference/changed-features/main-functions.md + - title: Dropped Features + index: reference/dropped-features/dropped-features.md + subsection: + - page: reference/dropped-features/delayed-init.md + - page: reference/dropped-features/macros.md + - page: reference/dropped-features/existential-types.md + - page: reference/dropped-features/type-projection.md + - page: reference/dropped-features/do-while.md + - page: reference/dropped-features/procedure-syntax.md + - page: reference/dropped-features/package-objects.md + - page: reference/dropped-features/early-initializers.md + - page: reference/dropped-features/class-shadowing.md + - page: reference/dropped-features/class-shadowing-spec.md + - page: reference/dropped-features/limit22.md + - page: reference/dropped-features/xml.md + - page: reference/dropped-features/symlits.md + - page: reference/dropped-features/auto-apply.md + - page: reference/dropped-features/weak-conformance.md + - page: reference/dropped-features/weak-conformance-spec.md + - page: reference/dropped-features/nonlocal-returns.md + - page: reference/dropped-features/this-qualifier.md + - page: reference/dropped-features/wildcard-init.md + - title: Experimental Features + directory: experimental + subsection: + - page: reference/experimental/overview.md + - page: reference/experimental/canthrow.md + - page: reference/experimental/erased-defs.md + - page: reference/experimental/erased-defs-spec.md + - page: reference/experimental/named-typeargs.md + - page: reference/experimental/named-typeargs-spec.md + - page: reference/experimental/numeric-literals.md + - page: reference/experimental/explicit-nulls.md + - page: reference/experimental/cc.md + - page: reference/syntax.md + - title: Language Versions + index: reference/language-versions/language-versions.md + subsection: + - page: reference/language-versions/source-compatibility.md + - page: reference/language-versions/binary-compatibility.md + - page: reference/soft-modifier.md + - page: reference/features-classification.md \ No newline at end of file diff --git a/scaladoc/src/dotty/tools/scaladoc/PathBased.scala b/scaladoc/src/dotty/tools/scaladoc/PathBased.scala index 231fe8989c26..ab73fc683846 100644 --- a/scaladoc/src/dotty/tools/scaladoc/PathBased.scala +++ b/scaladoc/src/dotty/tools/scaladoc/PathBased.scala @@ -4,9 +4,7 @@ import java.nio.file.{Path, Paths} case class PathBased[T](entries: List[PathBased.Entry[T]], projectRoot: Path): def get(path: Path): Option[PathBased.Result[T]] = - if path.isAbsolute then - if path.startsWith(projectRoot) then get(projectRoot.relativize(path)) - else None + if path.isAbsolute && path.startsWith(projectRoot) then get(projectRoot.relativize(path)) else entries.filter(_.path.forall(p => path.startsWith(p))).maxByOption(_.path.map(_.toString.length)).map(entry => PathBased.Result(entry.path.fold(path)(_.relativize(path)), entry.elem) ) diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala index 45a080d4828a..913b40c4dd41 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Renderer.scala @@ -83,7 +83,9 @@ abstract class Renderer(rootPackage: Member, val members: Map[DRI, Member], prot then rootPckPage.withTitle(args.name) else { val newRootPage = templateToPage(newRoot, siteContext) - newRootPage.withNewChildren(Seq(rootPckPage.withTitle("API"))) + newRootPage.withNewChildren( + Seq(rootPckPage.withTitle("API")).filter(_ => rootPackage.members.nonEmpty) + ) } val redirectPages: Seq[Page] = staticSite.fold(Seq.empty)(siteContext => siteContext.redirectTemplates.map { From bdbc32e4157dc41a231c8dbd18569d756d8b4224 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Tue, 22 Feb 2022 05:59:07 -0800 Subject: [PATCH 1238/1244] Edit unused imports --- .../src/dotty/tools/MainGenericRunner.scala | 5 ++--- .../tools/backend/WorklistAlgorithm.scala | 2 -- .../tools/backend/jvm/BCodeAsmCommon.scala | 2 +- .../tools/backend/jvm/BCodeBodyBuilder.scala | 4 +--- .../tools/backend/jvm/BCodeHelpers.scala | 3 +-- .../tools/backend/jvm/BCodeIdiomatic.scala | 1 - .../tools/backend/jvm/BCodeSkelBuilder.scala | 4 ---- .../tools/backend/jvm/BCodeSyncAndTry.scala | 3 +-- .../src/dotty/tools/backend/jvm/BTypes.scala | 2 +- .../tools/backend/jvm/BytecodeWriters.scala | 5 +---- .../dotty/tools/backend/jvm/CoreBTypes.scala | 5 +---- .../backend/jvm/DottyBackendInterface.scala | 19 +++---------------- .../dotty/tools/backend/jvm/GenBCode.scala | 1 - .../tools/backend/jvm/scalaPrimitives.scala | 2 -- .../dotty/tools/backend/sjs/JSCodeGen.scala | 7 ------- .../tools/backend/sjs/JSDefinitions.scala | 2 -- .../dotty/tools/backend/sjs/JSEncoding.scala | 11 ----------- .../tools/backend/sjs/JSExportsGen.scala | 12 ++---------- .../tools/backend/sjs/JSPrimitives.scala | 4 ---- .../dotty/tools/backend/sjs/ScopedVar.scala | 2 -- .../dotty/tools/dotc/CompilationUnit.scala | 1 - compiler/src/dotty/tools/dotc/Driver.scala | 6 +----- compiler/src/dotty/tools/dotc/Run.scala | 9 ++++----- .../src/dotty/tools/dotc/ast/Desugar.scala | 4 ++-- .../dotty/tools/dotc/ast/DesugarEnums.scala | 2 +- .../dotty/tools/dotc/ast/MainProxies.scala | 3 +-- .../dotty/tools/dotc/ast/NavigateAST.scala | 1 - .../src/dotty/tools/dotc/ast/Positioned.scala | 5 +---- .../tools/dotc/ast/TreeMapWithImplicits.scala | 2 -- compiler/src/dotty/tools/dotc/ast/Trees.scala | 1 - compiler/src/dotty/tools/dotc/ast/tpd.scala | 3 +-- compiler/src/dotty/tools/dotc/ast/untpd.scala | 1 - .../ZipAndJarFileLookupFactory.scala | 1 - .../dotty/tools/dotc/config/CliCommand.scala | 3 --- .../tools/dotc/config/CompilerCommand.scala | 5 ----- .../src/dotty/tools/dotc/config/Config.scala | 1 - .../src/dotty/tools/dotc/config/Feature.scala | 6 +++--- .../tools/dotc/config/JavaPlatform.scala | 2 +- .../tools/dotc/config/PathResolver.scala | 1 - .../dotty/tools/dotc/config/Platform.scala | 1 - .../dotty/tools/dotc/config/SJSPlatform.scala | 3 --- .../dotty/tools/dotc/config/Settings.scala | 1 - .../tools/dotc/config/SourceVersion.scala | 5 +---- .../dotty/tools/dotc/core/Annotations.scala | 9 +++------ .../src/dotty/tools/dotc/core/Comments.scala | 2 +- .../src/dotty/tools/dotc/core/Constants.scala | 1 - .../tools/dotc/core/ConstraintHandling.scala | 2 -- .../dotty/tools/dotc/core/ContextOps.scala | 4 ++-- .../dotty/tools/dotc/core/Decorators.scala | 5 +---- .../dotty/tools/dotc/core/Definitions.scala | 1 - .../dotty/tools/dotc/core/Denotations.scala | 1 - .../tools/dotc/core/GadtConstraint.scala | 1 - .../tools/dotc/core/JavaNullInterop.scala | 2 -- .../tools/dotc/core/MacroClassLoader.scala | 2 -- .../src/dotty/tools/dotc/core/NameOps.scala | 1 - .../src/dotty/tools/dotc/core/NamerOps.scala | 3 --- .../src/dotty/tools/dotc/core/Names.scala | 2 -- .../tools/dotc/core/NullOpsDecorator.scala | 4 +--- .../src/dotty/tools/dotc/core/Scopes.scala | 3 +-- .../tools/dotc/core/StagingContext.scala | 5 ----- .../src/dotty/tools/dotc/core/StdNames.scala | 1 - .../dotty/tools/dotc/core/Substituters.scala | 2 +- .../tools/dotc/core/SymDenotations.scala | 3 +-- .../dotty/tools/dotc/core/SymbolLoaders.scala | 3 --- .../src/dotty/tools/dotc/core/Symbols.scala | 5 +---- .../tools/dotc/core/TypeApplications.scala | 2 -- .../dotty/tools/dotc/core/TypeComparer.scala | 3 +-- .../src/dotty/tools/dotc/core/TypeOps.scala | 7 ++----- .../dotty/tools/dotc/core/TyperState.scala | 2 +- .../src/dotty/tools/dotc/core/Types.scala | 5 +---- .../dotc/core/classfile/ClassfileParser.scala | 8 +++----- .../dotc/core/tasty/CommentPickler.scala | 3 +-- .../tools/dotc/core/tasty/NameBuffer.scala | 1 - .../dotc/core/tasty/PositionUnpickler.scala | 1 - .../dotc/core/tasty/TastyClassName.scala | 4 +--- .../tools/dotc/core/tasty/TastyPickler.scala | 3 +-- .../tools/dotc/core/tasty/TastyPrinter.scala | 3 +-- .../tools/dotc/core/tasty/TreePickler.scala | 6 ------ .../tools/dotc/core/tasty/TreeUnpickler.scala | 6 +----- .../core/unpickleScala2/Scala2Erasure.scala | 1 - .../decompiler/DecompilationPrinter.scala | 1 - .../tools/dotc/fromtasty/TASTYCompiler.scala | 1 - .../tools/dotc/interactive/Completion.scala | 14 ++++---------- .../tools/dotc/interactive/Interactive.scala | 5 ----- .../dotc/interactive/InteractiveDriver.scala | 2 +- .../tools/dotc/interactive/SourceTree.scala | 1 - .../tools/dotc/parsing/JavaParsers.scala | 1 - .../tools/dotc/parsing/ParserPhase.scala | 3 --- .../dotty/tools/dotc/parsing/Parsers.scala | 5 ++--- .../dotty/tools/dotc/parsing/Scanners.scala | 7 +------ .../src/dotty/tools/dotc/plugins/Plugin.scala | 1 - .../dotc/printing/DecompilerPrinter.scala | 1 - .../tools/dotc/printing/RefinedPrinter.scala | 7 ++----- .../src/dotty/tools/dotc/printing/Texts.scala | 1 - .../tools/dotc/quoted/MacroExpansion.scala | 3 +-- .../tools/dotc/quoted/PickledQuotes.scala | 4 ---- .../dotty/tools/dotc/quoted/QuoteUtils.scala | 2 -- .../dotty/tools/dotc/quoted/QuotesCache.scala | 2 -- .../dotty/tools/dotc/quoted/TastyString.scala | 1 - .../dotc/quoted/reflect/FromSymbol.scala | 1 - .../dotc/reporting/ConsoleReporter.scala | 2 +- .../dotty/tools/dotc/reporting/Message.scala | 1 - .../dotty/tools/dotc/reporting/Reporter.scala | 3 --- .../dotty/tools/dotc/reporting/WConf.scala | 1 - .../dotty/tools/dotc/reporting/messages.scala | 1 - .../src/dotty/tools/dotc/sbt/APIUtils.scala | 5 ----- .../src/dotty/tools/dotc/sbt/ExtractAPI.scala | 4 +--- .../tools/dotc/sbt/ExtractDependencies.scala | 2 -- .../dotc/semanticdb/ExtractSemanticDB.scala | 6 +----- .../tools/dotc/semanticdb/Language.scala | 1 - .../dotty/tools/dotc/semanticdb/PPrint.scala | 2 +- .../dotty/tools/dotc/semanticdb/Scala3.scala | 2 -- .../dotty/tools/dotc/semanticdb/Schema.scala | 1 - .../semanticdb/SemanticSymbolBuilder.scala | 1 - .../dotc/semanticdb/SyntheticsExtractor.scala | 1 - .../dotty/tools/dotc/semanticdb/Tools.scala | 2 +- .../dotty/tools/dotc/semanticdb/TypeOps.scala | 1 - .../dotc/semanticdb/internal/LiteParser.scala | 1 - .../SemanticdbGeneratedMessageCompanion.scala | 1 - .../tools/dotc/transform/AccessProxies.scala | 2 -- .../tools/dotc/transform/ArrayApply.scala | 3 --- .../dotc/transform/ArrayConstructors.scala | 1 - .../tools/dotc/transform/BeanProperties.scala | 1 - .../tools/dotc/transform/BetaReduce.scala | 1 - .../dotty/tools/dotc/transform/Bridges.scala | 1 - .../tools/dotc/transform/CapturedVars.scala | 2 -- .../transform/CheckLoopingImplicits.scala | 2 -- .../dotc/transform/CheckNoSuperThis.scala | 2 -- .../tools/dotc/transform/CheckStatic.scala | 1 - .../dotc/transform/CollectEntryPoints.scala | 6 ------ .../dotc/transform/CompleteJavaEnums.scala | 4 +--- .../tools/dotc/transform/Constructors.scala | 3 --- .../transform/ContextFunctionResults.scala | 1 - .../dotc/transform/CountOuterAccesses.scala | 2 -- .../tools/dotc/transform/Dependencies.scala | 1 - .../dotc/transform/DropOuterAccessors.scala | 2 -- .../tools/dotc/transform/ElimOpaque.scala | 3 --- .../tools/dotc/transform/ElimRepeated.scala | 3 --- .../dotty/tools/dotc/transform/Erasure.scala | 4 +--- .../tools/dotc/transform/EtaReduce.scala | 1 - .../tools/dotc/transform/ExpandPrivate.scala | 1 - .../tools/dotc/transform/ExpandSAMs.scala | 3 --- .../tools/dotc/transform/ExplicitOuter.scala | 1 - .../dotc/transform/ExtensionMethods.scala | 2 +- .../tools/dotc/transform/FirstTransform.scala | 2 -- .../dotc/transform/FullParameterization.scala | 2 -- .../dotc/transform/GenericSignatures.scala | 4 +--- .../dotty/tools/dotc/transform/Getters.scala | 1 - .../tools/dotc/transform/InlinePatterns.scala | 3 --- .../dotty/tools/dotc/transform/Inlining.scala | 18 ------------------ .../dotc/transform/Instrumentation.scala | 3 --- .../dotc/transform/InterceptedMethods.scala | 1 - .../tools/dotc/transform/LambdaLift.scala | 1 - .../tools/dotc/transform/LetOverApply.scala | 1 - .../tools/dotc/transform/MacroTransform.scala | 3 --- .../tools/dotc/transform/MegaPhase.scala | 1 - .../dotty/tools/dotc/transform/Memoize.scala | 2 -- .../dotty/tools/dotc/transform/Mixin.scala | 2 -- .../dotty/tools/dotc/transform/MixinOps.scala | 1 - .../tools/dotc/transform/MoveStatics.scala | 2 -- .../dotc/transform/NonLocalReturns.scala | 1 - .../dotc/transform/OverridingPairs.scala | 1 - .../dotc/transform/PCPCheckAndHeal.scala | 8 +------- .../dotc/transform/ParamForwarding.scala | 2 -- .../tools/dotc/transform/PatternMatcher.scala | 1 - .../tools/dotc/transform/PickleQuotes.scala | 5 +---- .../tools/dotc/transform/PostInlining.scala | 1 - .../dotc/transform/PruneErasedDefs.scala | 2 -- .../tools/dotc/transform/ResolveSuper.scala | 1 - .../tools/dotc/transform/RestoreScopes.scala | 2 -- .../tools/dotc/transform/SelectStatic.scala | 1 - .../tools/dotc/transform/SetRootTree.scala | 1 - .../dotc/transform/SpecializeFunctions.scala | 1 - .../dotty/tools/dotc/transform/Splicer.scala | 5 ++--- .../dotty/tools/dotc/transform/Staging.scala | 14 ++------------ .../tools/dotc/transform/SuperAccessors.scala | 2 -- .../dotty/tools/dotc/transform/SymUtils.scala | 2 -- .../dotty/tools/dotc/transform/TailRec.scala | 3 --- .../tools/dotc/transform/TreeChecker.scala | 1 - .../dotc/transform/TreeMapWithStages.scala | 13 +------------ .../dotc/transform/TryCatchPatterns.scala | 1 - .../dotc/transform/TupleOptimizations.scala | 4 ---- .../tools/dotc/transform/TypeTestsCasts.scala | 1 - .../dotc/transform/UncacheGivenAliases.scala | 4 ---- .../dotc/transform/UninitializedDefs.scala | 4 ---- .../dotc/transform/YCheckPositions.scala | 1 - .../tools/dotc/transform/init/Checker.scala | 1 - .../tools/dotc/transform/init/Semantic.scala | 1 - .../transform/localopt/FormatChecker.scala | 1 - .../localopt/StringInterpolatorOpt.scala | 2 -- .../tools/dotc/transform/patmat/Space.scala | 3 --- .../transform/sjs/AddLocalJSFakeNews.scala | 4 ---- .../transform/sjs/ExplicitJSClasses.scala | 5 ----- .../dotc/transform/sjs/JSExportUtils.scala | 17 ----------------- .../tools/dotc/transform/sjs/JSSymUtils.scala | 7 ------- .../transform/sjs/JUnitBootstrappers.scala | 3 --- .../dotc/transform/sjs/PrepJSExports.scala | 11 +---------- .../dotc/transform/sjs/PrepJSInterop.scala | 14 ++------------ .../dotty/tools/dotc/typer/Applications.scala | 11 ++++------- .../src/dotty/tools/dotc/typer/Checking.scala | 3 --- .../dotty/tools/dotc/typer/ConstFold.scala | 1 - .../src/dotty/tools/dotc/typer/Deriving.scala | 5 ----- .../src/dotty/tools/dotc/typer/Dynamic.scala | 1 - .../tools/dotc/typer/ErrorReporting.scala | 1 - .../dotty/tools/dotc/typer/EtaExpansion.scala | 2 -- .../dotty/tools/dotc/typer/Implicits.scala | 9 ++------- .../dotty/tools/dotc/typer/ImportInfo.scala | 3 --- .../tools/dotc/typer/ImportSuggestions.scala | 2 -- .../dotty/tools/dotc/typer/Inferencing.scala | 5 +---- .../src/dotty/tools/dotc/typer/Inliner.scala | 6 ++---- .../src/dotty/tools/dotc/typer/Namer.scala | 2 -- .../tools/dotc/typer/PrepareInlineable.scala | 4 +--- .../dotty/tools/dotc/typer/ProtoTypes.scala | 1 - .../tools/dotc/typer/QuotesAndSplices.scala | 9 +-------- .../src/dotty/tools/dotc/typer/ReTyper.scala | 3 +-- .../dotty/tools/dotc/typer/RefChecks.scala | 6 +----- .../dotty/tools/dotc/typer/Synthesizer.scala | 2 +- .../dotty/tools/dotc/typer/TypeAssigner.scala | 6 +----- .../src/dotty/tools/dotc/typer/Typer.scala | 4 +--- .../dotty/tools/dotc/typer/TyperPhase.scala | 10 +--------- .../tools/dotc/typer/VarianceChecker.scala | 1 - .../src/dotty/tools/dotc/util/EqHashMap.scala | 1 - .../src/dotty/tools/dotc/util/HashMap.scala | 1 - .../tools/dotc/util/NameTransformer.scala | 2 -- .../dotty/tools/dotc/util/ParsedComment.scala | 3 +-- .../dotty/tools/dotc/util/Signatures.scala | 3 --- .../dotty/tools/dotc/util/WeakHashSet.scala | 1 - compiler/src/dotty/tools/io/Jar.scala | 1 - .../tools/repl/CollectTopLevelImports.scala | 1 - compiler/src/dotty/tools/repl/Rendering.scala | 6 +----- .../src/dotty/tools/repl/ReplCompiler.scala | 5 ++--- .../src/dotty/tools/repl/ReplDriver.scala | 4 ++-- .../src/dotty/tools/repl/ScriptEngine.scala | 2 +- .../dotty/tools/runner/ScalaClassLoader.scala | 1 - .../tools/scripting/ScriptingDriver.scala | 1 - .../quoted/runtime/impl/QuoteMatcher.scala | 3 --- .../quoted/runtime/impl/QuotesImpl.scala | 3 +-- .../test/dotty/tools/CheckTypesTests.scala | 4 +--- compiler/test/dotty/tools/DottyTest.scala | 4 ---- .../test/dotty/tools/DottyTypeStealer.scala | 1 - .../tools/dotc/ast/AttachmentsTest.scala | 1 - .../dotty/tools/dotc/ast/DesugarTests.scala | 1 - .../dotty/tools/dotc/ast/TreeInfoTest.scala | 3 +-- .../dotc/config/CommandLineParserTest.scala | 2 +- .../dotc/core/SealedDescendantsTest.scala | 2 +- .../interactive/CustomCompletionTests.scala | 1 - .../tools/dotc/parsing/DeSugarTest.scala | 4 ---- .../tools/dotc/parsing/DocstringTests.scala | 1 - .../dotty/tools/dotc/parsing/ParserTest.scala | 2 -- .../tools/dotc/parsing/desugarPackage.scala | 1 - .../dotty/tools/dotc/parsing/showTree.scala | 5 ----- .../tools/dotc/printing/PrinterTests.scala | 3 +-- .../dotc/reporting/ErrorMessagesTest.scala | 1 - .../dotc/reporting/TestMessageLaziness.scala | 1 - .../tools/dotc/reporting/TestReporter.scala | 4 +--- .../CreateCompanionObjectsTest.scala | 11 +---------- .../tools/dotc/transform/LazyValsTest.scala | 2 -- .../transform/PostTyperTransformerTest.scala | 9 --------- .../transform/SpecializeFunctionsTests.scala | 4 ---- .../tools/dotc/typer/DivergenceChecker.scala | 6 +----- .../test/dotty/tools/repl/ScriptedTests.scala | 1 - .../tools/repl/ShadowingBatchTests.scala | 3 +-- 262 files changed, 119 insertions(+), 725 deletions(-) diff --git a/compiler/src/dotty/tools/MainGenericRunner.scala b/compiler/src/dotty/tools/MainGenericRunner.scala index b7ef90dcdc60..bcaa00b02133 100644 --- a/compiler/src/dotty/tools/MainGenericRunner.scala +++ b/compiler/src/dotty/tools/MainGenericRunner.scala @@ -3,17 +3,16 @@ package dotty.tools import scala.annotation.tailrec import scala.io.Source -import scala.util.{ Try, Success, Failure } +import scala.util.Try import java.io.File import java.lang.Thread import scala.annotation.internal.sharable import dotty.tools.dotc.util.ClasspathFromClassloader import dotty.tools.runner.ObjectRunner import dotty.tools.dotc.config.Properties.envOrNone -import java.util.jar._ import dotty.tools.io.Jar import dotty.tools.runner.ScalaClassLoader -import java.nio.file.{Files, Paths, Path} +import java.nio.file.Paths import dotty.tools.dotc.config.CommandLineParser import dotty.tools.scripting.StringDriver diff --git a/compiler/src/dotty/tools/backend/WorklistAlgorithm.scala b/compiler/src/dotty/tools/backend/WorklistAlgorithm.scala index fa0a5a96687c..b3d98d425b2a 100644 --- a/compiler/src/dotty/tools/backend/WorklistAlgorithm.scala +++ b/compiler/src/dotty/tools/backend/WorklistAlgorithm.scala @@ -1,8 +1,6 @@ package dotty.tools package backend -import scala.collection.mutable - /** * Simple implementation of a worklist algorithm. A processing * function is applied repeatedly to the first element in the diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala b/compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala index 5fe63a8cfa61..e72d94fff82f 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeAsmCommon.scala @@ -11,7 +11,7 @@ import dotty.tools.dotc.report * the compiler cake (Global). */ final class BCodeAsmCommon[I <: DottyBackendInterface](val interface: I) { - import interface.{_, given} + import interface.given import DottyBackendInterface.symExtensions /** diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala index 96ae4e8a00af..ed7a65000ce2 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala @@ -6,13 +6,12 @@ import scala.annotation.switch import scala.collection.mutable.SortedMap import scala.tools.asm -import scala.tools.asm.{Handle, Label, Opcodes} +import scala.tools.asm.{Handle, Opcodes} import BCodeHelpers.InvokeStyle import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.CompilationUnit import dotty.tools.dotc.core.Constants._ -import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Flags.{Label => LabelFlag, _} import dotty.tools.dotc.core.Types._ import dotty.tools.dotc.core.StdNames.{nme, str} @@ -915,7 +914,6 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder { var default: asm.Label = null var indirectBlocks: List[(asm.Label, Tree)] = Nil - import scala.collection.mutable // Cases grouped by their hashCode val casesByHash = SortedMap.empty[Int, List[(String, Either[asm.Label, Tree])]] diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala b/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala index 4085d87ad7ca..3321a061325e 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala @@ -62,7 +62,6 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters { @threadUnsafe lazy val JavaAnnotationClass: ClassSymbol = requiredClass("java.lang.annotation.Annotation") val bCodeAsmCommon: BCodeAsmCommon[int.type] = new BCodeAsmCommon(int) - import bCodeAsmCommon._ /* * must-single-thread @@ -479,7 +478,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters { } // end of trait BCAnnotGen trait BCJGenSigGen { - import int.{_, given} + import int.given def getCurrentCUnit(): CompilationUnit diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala b/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala index fffefae8a165..c222f01518cc 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeIdiomatic.scala @@ -4,7 +4,6 @@ package jvm import scala.tools.asm import scala.annotation.switch -import scala.collection.mutable import Primitives.{NE, EQ, TestOp, ArithmeticOp} import scala.tools.asm.tree.MethodInsnNode import dotty.tools.dotc.report diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala index 86150f114d2c..8e4bec9acb8e 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeSkelBuilder.scala @@ -3,16 +3,12 @@ package backend package jvm import scala.collection.{ mutable, immutable } -import scala.annotation.switch import scala.tools.asm -import scala.tools.asm.util.{TraceMethodVisitor, ASMifier} -import java.io.PrintWriter import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.ast.TreeTypeMap import dotty.tools.dotc.CompilationUnit -import dotty.tools.dotc.core.Annotations.Annotation import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Flags._ import dotty.tools.dotc.core.StdNames._ diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala b/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala index d326bcfa242a..344c9bf22be8 100644 --- a/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala +++ b/compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala @@ -9,7 +9,6 @@ import dotty.tools.dotc.CompilationUnit import dotty.tools.dotc.core.StdNames.nme import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.ast.tpd.TreeOps /* * @@ -18,7 +17,7 @@ import dotty.tools.dotc.ast.tpd.TreeOps * */ trait BCodeSyncAndTry extends BCodeBodyBuilder { - import int.{_, given} + import int.given import tpd._ import bTypes._ import coreBTypes._ diff --git a/compiler/src/dotty/tools/backend/jvm/BTypes.scala b/compiler/src/dotty/tools/backend/jvm/BTypes.scala index 8f4589aba83a..42f950af312b 100644 --- a/compiler/src/dotty/tools/backend/jvm/BTypes.scala +++ b/compiler/src/dotty/tools/backend/jvm/BTypes.scala @@ -15,7 +15,7 @@ import scala.tools.asm abstract class BTypes { val int: DottyBackendInterface - import int.{_, given} + import int.given /** * A map from internal names to ClassBTypes. Every ClassBType is added to this map on its * construction. diff --git a/compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala b/compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala index 2bf32030e987..1c721552485b 100644 --- a/compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala +++ b/compiler/src/dotty/tools/backend/jvm/BytecodeWriters.scala @@ -2,14 +2,11 @@ package dotty.tools package backend package jvm -import java.io.{ DataOutputStream, FileOutputStream, IOException, OutputStream, File => JFile } +import java.io.{ DataOutputStream, FileOutputStream, IOException, File as JFile } import java.nio.channels.ClosedByInterruptException -import java.nio.file.Files import dotty.tools.io._ import dotty.tools.dotc.report -import java.util.jar.Attributes.Name -import scala.language.postfixOps /** Can't output a file due to the state of the file system. */ class FileConflictException(msg: String, val file: AbstractFile) extends IOException(msg) diff --git a/compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala b/compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala index 2e4905e7e3a3..88a2bf8faa35 100644 --- a/compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala +++ b/compiler/src/dotty/tools/backend/jvm/CoreBTypes.scala @@ -2,9 +2,7 @@ package dotty.tools package backend package jvm -import scala.annotation.switch -import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.transform.Erasure @@ -33,7 +31,7 @@ import dotty.tools.dotc.transform.Erasure */ class CoreBTypes[BTFS <: BTypesFromSymbols[_ <: DottyBackendInterface]](val bTypes: BTFS) { import bTypes._ - import int.{_, given} + import int.given import DottyBackendInterface._ //import global._ @@ -212,7 +210,6 @@ trait CoreBTypesProxyGlobalIndependent[BTS <: BTypes] { */ final class CoreBTypesProxy[BTFS <: BTypesFromSymbols[_ <: DottyBackendInterface]](val bTypes: BTFS) extends CoreBTypesProxyGlobalIndependent[BTFS] { import bTypes._ - import bTypes.int._ private var _coreBTypes: CoreBTypes[bTypes.type] = _ def setBTypes(coreBTypes: CoreBTypes[BTFS]): Unit = { diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala index 64e667d95b68..b6392ec80b4e 100644 --- a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala +++ b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala @@ -1,38 +1,25 @@ package dotty.tools.backend.jvm import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.ast.Trees -import dotty.tools.dotc import dotty.tools.dotc.core.Flags._ -import dotty.tools.dotc.transform.{Erasure, GenericSignatures} import dotty.tools.dotc.transform.SymUtils._ import java.io.{File => _} -import scala.annotation.threadUnsafe -import scala.collection.generic.Clearable -import scala.collection.mutable import scala.reflect.ClassTag import dotty.tools.io.AbstractFile -import scala.tools.asm.AnnotationVisitor import dotty.tools.dotc.core._ import Contexts._ import Types._ import Symbols._ import Phases._ -import dotty.tools.dotc.util -import dotty.tools.dotc.util.{Spans, ReadOnlyMap} +import dotty.tools.dotc.util.ReadOnlyMap import dotty.tools.dotc.report -import Decorators._ -import Constants._ import tpd._ -import scala.tools.asm -import StdNames.{nme, str} -import NameKinds.{DefaultGetterName, ExpandedName, LazyBitMapName} -import Names.TermName -import Annotations.Annotation +import StdNames.nme +import NameKinds.LazyBitMapName import Names.Name class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap: ReadOnlyMap[Symbol, Set[ClassSymbol]])(using val ctx: Context) { diff --git a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala index 2f2f653ae2e2..1bf0b697ef50 100644 --- a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala +++ b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala @@ -19,7 +19,6 @@ import dotty.tools.dotc.sbt.ExtractDependencies import Contexts._ import Phases._ import Symbols._ -import Decorators._ import java.io.DataOutputStream import java.nio.channels.ClosedByInterruptException diff --git a/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala b/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala index e1b6d8d922f7..2d4c3ce5c9c4 100644 --- a/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala +++ b/compiler/src/dotty/tools/backend/jvm/scalaPrimitives.scala @@ -12,8 +12,6 @@ import dotc.report import dotc.util.ReadOnlyMap import scala.annotation.threadUnsafe -import scala.collection.immutable - /** Scala primitive operations are represented as methods in `Any` and * `AnyVal` subclasses. Here we demultiplex them by providing a mapping diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala index 56e16647d080..901355945672 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala @@ -8,20 +8,15 @@ import dotty.tools.FatalError import dotty.tools.dotc.CompilationUnit import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.core.Phases.Phase import dotty.tools.dotc.core._ -import Periods._ -import SymDenotations._ import Contexts._ import Decorators._ import Flags._ -import dotty.tools.dotc.ast.Trees._ import Names._ import NameKinds.DefaultGetterName import Types._ import Symbols._ -import Denotations._ import Phases._ import StdNames._ import TypeErasure.ErasedValueType @@ -29,7 +24,6 @@ import TypeErasure.ErasedValueType import dotty.tools.dotc.transform.{Erasure, ValueClasses} import dotty.tools.dotc.transform.SymUtils._ import dotty.tools.dotc.util.SourcePosition -import dotty.tools.dotc.util.Spans.Span import dotty.tools.dotc.report import org.scalajs.ir @@ -2580,7 +2574,6 @@ class JSCodeGen()(using genCtx: Context) { /** Gen JS code for a simple binary operation. */ private def genSimpleBinaryOp(tree: Apply, lhs: Tree, rhs: Tree, code: Int): js.Tree = { import dotty.tools.backend.ScalaPrimitivesOps._ - import js.UnaryOp._ implicit val pos: SourcePosition = tree.sourcePos diff --git a/compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala b/compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala index c02e0c030657..1b24a24101a1 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSDefinitions.scala @@ -6,9 +6,7 @@ import scala.annotation.threadUnsafe import Types._ import Contexts._ import Symbols._ -import Names._ import StdNames._ -import Decorators._ import dotty.tools.dotc.config.SJSPlatform diff --git a/compiler/src/dotty/tools/backend/sjs/JSEncoding.scala b/compiler/src/dotty/tools/backend/sjs/JSEncoding.scala index 55cb600182c7..a2b2fed93d83 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSEncoding.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSEncoding.scala @@ -1,20 +1,12 @@ package dotty.tools.backend.sjs -import scala.annotation.tailrec - import scala.collection.mutable -import dotty.tools.FatalError - import dotty.tools.dotc.core._ -import Decorators._ -import Periods._ -import SymDenotations._ import Contexts._ import Flags._ import Types._ import Symbols._ -import Denotations._ import NameOps._ import Names._ import StdNames._ @@ -28,9 +20,6 @@ import org.scalajs.ir.OriginalName import org.scalajs.ir.OriginalName.NoOriginalName import org.scalajs.ir.UTF8String -import ScopedVar.withScopedVars -import JSDefinitions._ - import dotty.tools.backend.jvm.DottyBackendInterface.symExtensions /** Encoding of symbol names for JavaScript diff --git a/compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala b/compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala index ab2211b7073b..3a9476d9638a 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala @@ -4,7 +4,6 @@ import scala.annotation.tailrec import scala.collection.mutable -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.core._ import Contexts._ @@ -14,23 +13,16 @@ import Flags._ import Names._ import NameKinds.DefaultGetterName import NameOps._ -import Periods._ import Phases._ -import StdNames._ import Symbols._ -import SymDenotations._ import Types._ import TypeErasure.ErasedValueType -import dotty.tools.dotc.transform.Erasure import dotty.tools.dotc.util.{SourcePosition, SrcPos} -import dotty.tools.dotc.util.Spans.Span import dotty.tools.dotc.report -import org.scalajs.ir -import org.scalajs.ir.{ClassKind, Position, Names => jsNames, Trees => js, Types => jstpe} -import org.scalajs.ir.Names.{ClassName, DefaultModuleID, MethodName, SimpleMethodName} -import org.scalajs.ir.OriginalName +import org.scalajs.ir.{Position, Names => jsNames, Trees => js, Types => jstpe} +import org.scalajs.ir.Names.DefaultModuleID import org.scalajs.ir.OriginalName.NoOriginalName import org.scalajs.ir.Position.NoPosition import org.scalajs.ir.Trees.OptimizerHints diff --git a/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala b/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala index ac7b492e3e1f..000ec334a127 100644 --- a/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala +++ b/compiler/src/dotty/tools/backend/sjs/JSPrimitives.scala @@ -2,7 +2,6 @@ package dotty.tools.backend.sjs import dotty.tools.dotc.core._ import Names.TermName -import StdNames._ import Types._ import Contexts._ import Symbols._ @@ -12,8 +11,6 @@ import dotty.tools.backend.jvm.DottyPrimitives import dotty.tools.dotc.report import dotty.tools.dotc.util.ReadOnlyMap -import scala.collection.mutable - object JSPrimitives { inline val FirstJSPrimitiveCode = 300 @@ -60,7 +57,6 @@ object JSPrimitives { class JSPrimitives(ictx: Context) extends DottyPrimitives(ictx) { import JSPrimitives._ - import dotty.tools.backend.ScalaPrimitivesOps._ private lazy val jsPrimitives: ReadOnlyMap[Symbol, Int] = initJSPrimitives(using ictx) diff --git a/compiler/src/dotty/tools/backend/sjs/ScopedVar.scala b/compiler/src/dotty/tools/backend/sjs/ScopedVar.scala index 4ce4030fb440..be5b8e7bb416 100644 --- a/compiler/src/dotty/tools/backend/sjs/ScopedVar.scala +++ b/compiler/src/dotty/tools/backend/sjs/ScopedVar.scala @@ -1,7 +1,5 @@ package dotty.tools.backend.sjs -import language.implicitConversions - class ScopedVar[A](init: A) { import ScopedVar.Assignment diff --git a/compiler/src/dotty/tools/dotc/CompilationUnit.scala b/compiler/src/dotty/tools/dotc/CompilationUnit.scala index 3c73b1126889..413d616f108d 100644 --- a/compiler/src/dotty/tools/dotc/CompilationUnit.scala +++ b/compiler/src/dotty/tools/dotc/CompilationUnit.scala @@ -9,7 +9,6 @@ import util.{FreshNameCreator, SourceFile, NoSource} import util.Spans.Span import ast.{tpd, untpd} import tpd.{Tree, TreeTraverser} -import typer.PrepareInlineable.InlineAccessors import typer.Nullables import transform.SymUtils._ import core.Decorators._ diff --git a/compiler/src/dotty/tools/dotc/Driver.scala b/compiler/src/dotty/tools/dotc/Driver.scala index 17177e72a7de..81331ce06e9b 100644 --- a/compiler/src/dotty/tools/dotc/Driver.scala +++ b/compiler/src/dotty/tools/dotc/Driver.scala @@ -1,19 +1,15 @@ package dotty.tools.dotc -import java.nio.file.{Files, Paths} - import dotty.tools.FatalError import config.CompilerCommand import core.Comments.{ContextDoc, ContextDocstrings} import core.Contexts._ -import core.{MacroClassLoader, Mode, TypeError} -import core.StdNames.nme +import core.{MacroClassLoader, TypeError} import dotty.tools.dotc.ast.Positioned import dotty.tools.io.AbstractFile import reporting._ import core.Decorators._ import config.Feature -import util.SourceFile import scala.util.control.NonFatal import fromtasty.{TASTYCompiler, TastyFileUtil} diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala index a258036466ff..3c48e737cff8 100644 --- a/compiler/src/dotty/tools/dotc/Run.scala +++ b/compiler/src/dotty/tools/dotc/Run.scala @@ -5,18 +5,17 @@ import core._ import Contexts._ import Periods._ import Symbols._ -import Types._ import Scopes._ import Names.Name import Denotations.Denotation -import typer.{Typer, PrepareInlineable} -import typer.ImportInfo._ +import typer.Typer +import typer.ImportInfo.withRootImports import Decorators._ -import io.{AbstractFile, PlainFile, VirtualFile} +import io.{AbstractFile, VirtualFile} import Phases.unfusedPhases import util._ -import reporting.{Reporter, Suppression, Action} +import reporting.{Suppression, Action} import reporting.Diagnostic import reporting.Diagnostic.Warning import rewrites.Rewrites diff --git a/compiler/src/dotty/tools/dotc/ast/Desugar.scala b/compiler/src/dotty/tools/dotc/ast/Desugar.scala index 47638d3a88fd..3b9e12e28ad1 100644 --- a/compiler/src/dotty/tools/dotc/ast/Desugar.scala +++ b/compiler/src/dotty/tools/dotc/ast/Desugar.scala @@ -4,10 +4,10 @@ package ast import core._ import util.Spans._, Types._, Contexts._, Constants._, Names._, NameOps._, Flags._ -import Symbols._, StdNames._, Trees._, Phases._, ContextOps._ +import Symbols._, StdNames._, Trees._, ContextOps._ import Decorators._, transform.SymUtils._ import NameKinds.{UniqueName, EvidenceParamName, DefaultGetterName} -import typer.{TyperPhase, Namer, Checking} +import typer.{Namer, Checking} import util.{Property, SourceFile, SourcePosition} import config.Feature.{sourceVersion, migrateTo3, enabled} import config.SourceVersion._ diff --git a/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala b/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala index 009aba09f2f6..b86d87a41889 100644 --- a/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala +++ b/compiler/src/dotty/tools/dotc/ast/DesugarEnums.scala @@ -3,7 +3,7 @@ package dotc package ast import core._ -import util.Spans._, Types._, Contexts._, Constants._, Names._, NameOps._, Flags._ +import util.Spans._, Types._, Contexts._, Constants._, Names._, Flags._ import Symbols._, StdNames._, Trees._ import Decorators._ import util.{Property, SourceFile} diff --git a/compiler/src/dotty/tools/dotc/ast/MainProxies.scala b/compiler/src/dotty/tools/dotc/ast/MainProxies.scala index 2eafeca16e39..ea41984c5766 100644 --- a/compiler/src/dotty/tools/dotc/ast/MainProxies.scala +++ b/compiler/src/dotty/tools/dotc/ast/MainProxies.scala @@ -2,9 +2,8 @@ package dotty.tools.dotc package ast import core._ -import Symbols._, Types._, Contexts._, Decorators._, util.Spans._, Flags._, Constants._ +import Symbols._, Types._, Contexts._, Flags._, Constants._ import StdNames.nme -import ast.Trees._ /** Generate proxy classes for @main functions. * A function like diff --git a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala index 730149381487..bcedc4dfa50b 100644 --- a/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala +++ b/compiler/src/dotty/tools/dotc/ast/NavigateAST.scala @@ -5,7 +5,6 @@ import core.Contexts._ import core.Decorators._ import util.Spans._ import Trees.{MemberDef, DefTree, WithLazyField} -import dotty.tools.dotc.core.Annotations.ConcreteAnnotation import dotty.tools.dotc.core.Types.AnnotatedType import dotty.tools.dotc.core.Types.ImportType import dotty.tools.dotc.core.Types.Type diff --git a/compiler/src/dotty/tools/dotc/ast/Positioned.scala b/compiler/src/dotty/tools/dotc/ast/Positioned.scala index 964b9855ae13..ded6db413e55 100644 --- a/compiler/src/dotty/tools/dotc/ast/Positioned.scala +++ b/compiler/src/dotty/tools/dotc/ast/Positioned.scala @@ -3,7 +3,7 @@ package dotc package ast import util.Spans._ -import util.{SourceFile, NoSource, SourcePosition, SrcPos} +import util.{SourceFile, SourcePosition, SrcPos} import core.Contexts._ import core.Decorators._ import core.NameOps._ @@ -12,9 +12,6 @@ import core.StdNames.nme import ast.Trees.mods import annotation.constructorOnly import annotation.internal.sharable -import reporting.Reporter - -import java.io.{ PrintWriter } /** A base class for things that have positions (currently: modifiers and trees) */ diff --git a/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala b/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala index 999a80c5e446..caf8d68442f6 100644 --- a/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala +++ b/compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala @@ -8,8 +8,6 @@ import core.Flags._ import core.Symbols._ import core.TypeError -import scala.annotation.tailrec - /** A TreeMap that maintains the necessary infrastructure to support * contextual implicit searches (type-scope implicits are supported anyway). * diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala index 9a371e946e08..cb84f14ccc4d 100644 --- a/compiler/src/dotty/tools/dotc/ast/Trees.scala +++ b/compiler/src/dotty/tools/dotc/ast/Trees.scala @@ -6,7 +6,6 @@ import core._ import Types._, Names._, NameOps._, Flags._, util.Spans._, Contexts._, Constants._ import typer.{ ConstFold, ProtoTypes } import SymDenotations._, Symbols._, Denotations._, StdNames._, Comments._ -import language.higherKinds import collection.mutable.ListBuffer import printing.Printer import printing.Texts.Text diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala index a75ccd107736..684f33a4cad4 100644 --- a/compiler/src/dotty/tools/dotc/ast/tpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/tpd.scala @@ -12,12 +12,11 @@ import util.Spans._, Types._, Contexts._, Constants._, Names._, Flags._, NameOps import Symbols._, StdNames._, Annotations._, Trees._, Symbols._ import Decorators._, DenotTransformers._ import collection.{immutable, mutable} -import util.{Property, SourceFile, NoSource} +import util.{Property, SourceFile} import NameKinds.{TempResultName, OuterSelectName} import typer.ConstFold import scala.annotation.tailrec -import scala.io.Codec /** Some creators for typed trees */ object tpd extends Trees.Instance[Type] with TypedTreeInfo { diff --git a/compiler/src/dotty/tools/dotc/ast/untpd.scala b/compiler/src/dotty/tools/dotc/ast/untpd.scala index 7e00972f354d..4905290c86b2 100644 --- a/compiler/src/dotty/tools/dotc/ast/untpd.scala +++ b/compiler/src/dotty/tools/dotc/ast/untpd.scala @@ -8,7 +8,6 @@ import dotty.tools.dotc.typer.ProtoTypes import Symbols._, StdNames._, Trees._ import util.{Property, SourceFile, NoSource} import util.Spans.Span -import language.higherKinds import annotation.constructorOnly import annotation.internal.sharable import Decorators._ diff --git a/compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala b/compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala index 99ea4f25ff49..eb689b8b2950 100644 --- a/compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala +++ b/compiler/src/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactory.scala @@ -13,7 +13,6 @@ import scala.annotation.tailrec import dotty.tools.io.{AbstractFile, ClassPath, ClassRepresentation, FileZipArchive, ManifestResources} import dotty.tools.dotc.core.Contexts._ import FileUtils._ -import util._ /** * A trait providing an optional cache for classpath entries obtained from zip and jar files. diff --git a/compiler/src/dotty/tools/dotc/config/CliCommand.scala b/compiler/src/dotty/tools/dotc/config/CliCommand.scala index 5a648db2b504..dc503705d81b 100644 --- a/compiler/src/dotty/tools/dotc/config/CliCommand.scala +++ b/compiler/src/dotty/tools/dotc/config/CliCommand.scala @@ -1,11 +1,8 @@ package dotty.tools.dotc package config -import java.nio.file.{Files, Paths} - import Settings._ import core.Contexts._ -import Properties._ import scala.PartialFunction.cond diff --git a/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala b/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala index 29a02b7f7a29..41e123472a75 100644 --- a/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala +++ b/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala @@ -1,13 +1,8 @@ package dotty.tools.dotc package config -import java.nio.file.{Files, Paths} - import Settings._ import core.Contexts._ -import Properties._ - -import scala.collection.JavaConverters._ abstract class CompilerCommand extends CliCommand: type ConcreteSettings = ScalaSettings diff --git a/compiler/src/dotty/tools/dotc/config/Config.scala b/compiler/src/dotty/tools/dotc/config/Config.scala index ac1708378e73..b9a8c96f49d9 100644 --- a/compiler/src/dotty/tools/dotc/config/Config.scala +++ b/compiler/src/dotty/tools/dotc/config/Config.scala @@ -1,5 +1,4 @@ package dotty.tools.dotc.config -import annotation.internal.sharable object Config { diff --git a/compiler/src/dotty/tools/dotc/config/Feature.scala b/compiler/src/dotty/tools/dotc/config/Feature.scala index ed592e76ace1..d72131161d25 100644 --- a/compiler/src/dotty/tools/dotc/config/Feature.scala +++ b/compiler/src/dotty/tools/dotc/config/Feature.scala @@ -3,9 +3,9 @@ package dotc package config import core._ -import Contexts._, Symbols._, Names._, NameOps._, Phases._ +import Contexts._, Symbols._, Names._ import StdNames.nme -import Decorators.{_, given} +import Decorators.* import util.{SrcPos, NoSourcePosition} import SourceVersion._ import reporting.Message @@ -122,4 +122,4 @@ object Feature: def isExperimentalEnabled(using Context): Boolean = Properties.experimental && !ctx.settings.YnoExperimental.value -end Feature \ No newline at end of file +end Feature diff --git a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala index 36bedd8db3db..2b2f35e49451 100644 --- a/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala +++ b/compiler/src/dotty/tools/dotc/config/JavaPlatform.scala @@ -5,7 +5,7 @@ package config import io._ import classpath.AggregateClassPath import core._ -import Symbols._, Types._, Contexts._, SymDenotations._, StdNames._ +import Symbols._, Types._, Contexts._, StdNames._ import Flags._ import transform.ExplicitOuter, transform.SymUtils._ diff --git a/compiler/src/dotty/tools/dotc/config/PathResolver.scala b/compiler/src/dotty/tools/dotc/config/PathResolver.scala index e98552a9df28..ae7cd314972c 100644 --- a/compiler/src/dotty/tools/dotc/config/PathResolver.scala +++ b/compiler/src/dotty/tools/dotc/config/PathResolver.scala @@ -7,7 +7,6 @@ import io.{ClassPath, Directory, Path} import classpath.{AggregateClassPath, ClassPathFactory, JrtClassPath} import ClassPath.split import PartialFunction.condOpt -import scala.language.postfixOps import core.Contexts._ import Settings._ import dotty.tools.io.File diff --git a/compiler/src/dotty/tools/dotc/config/Platform.scala b/compiler/src/dotty/tools/dotc/config/Platform.scala index a39b801ed39b..0faacf1bcebb 100644 --- a/compiler/src/dotty/tools/dotc/config/Platform.scala +++ b/compiler/src/dotty/tools/dotc/config/Platform.scala @@ -5,7 +5,6 @@ package config import io.{ClassPath, AbstractFile} import core.Contexts._, core.Symbols._ import core.SymbolLoader -import core.SymDenotations.SymDenotation import core.StdNames.nme import core.Flags.Module diff --git a/compiler/src/dotty/tools/dotc/config/SJSPlatform.scala b/compiler/src/dotty/tools/dotc/config/SJSPlatform.scala index 98dae40c3504..0275e0d6a227 100644 --- a/compiler/src/dotty/tools/dotc/config/SJSPlatform.scala +++ b/compiler/src/dotty/tools/dotc/config/SJSPlatform.scala @@ -3,12 +3,9 @@ package dotty.tools.dotc.config import dotty.tools.dotc.core._ import Contexts._ import Symbols._ -import SymDenotations._ import dotty.tools.backend.sjs.JSDefinitions -import org.scalajs.ir.Trees.JSNativeLoadSpec - object SJSPlatform { /** The `SJSPlatform` for the current context. */ def sjsPlatform(using Context): SJSPlatform = diff --git a/compiler/src/dotty/tools/dotc/config/Settings.scala b/compiler/src/dotty/tools/dotc/config/Settings.scala index 29a52defa4c6..dea34bbc263d 100644 --- a/compiler/src/dotty/tools/dotc/config/Settings.scala +++ b/compiler/src/dotty/tools/dotc/config/Settings.scala @@ -7,7 +7,6 @@ import dotty.tools.io.{AbstractFile, Directory, JarArchive, PlainDirectory} import annotation.tailrec import collection.mutable.ArrayBuffer -import language.existentials import reflect.ClassTag import scala.util.{Success, Failure} diff --git a/compiler/src/dotty/tools/dotc/config/SourceVersion.scala b/compiler/src/dotty/tools/dotc/config/SourceVersion.scala index 7311beb07601..466e503e1a66 100644 --- a/compiler/src/dotty/tools/dotc/config/SourceVersion.scala +++ b/compiler/src/dotty/tools/dotc/config/SourceVersion.scala @@ -2,10 +2,7 @@ package dotty.tools package dotc package config -import core.Contexts._ -import core.Names.TermName -import core.StdNames.nme -import core.Decorators.{_, given} +import core.Decorators.* import util.Property enum SourceVersion: diff --git a/compiler/src/dotty/tools/dotc/core/Annotations.scala b/compiler/src/dotty/tools/dotc/core/Annotations.scala index b8d62210ce26..a6c424ef13db 100644 --- a/compiler/src/dotty/tools/dotc/core/Annotations.scala +++ b/compiler/src/dotty/tools/dotc/core/Annotations.scala @@ -1,11 +1,8 @@ package dotty.tools.dotc package core -import Symbols._, Types._, Contexts._, Constants._, ast.tpd._, Phases._ -import config.ScalaVersion -import StdNames._ -import dotty.tools.dotc.ast.tpd -import scala.util.Try +import Symbols._, Types._, Contexts._, Constants._ +import dotty.tools.dotc.ast.tpd, tpd.* import util.Spans.Span import printing.{Showable, Printer} import printing.Texts.Text @@ -30,7 +27,7 @@ object Annotations { if (tree eq this.tree) this else Annotation(tree) /** All arguments to this annotation in a single flat list */ - def arguments(using Context): List[Tree] = ast.tpd.allArguments(tree) + def arguments(using Context): List[Tree] = tpd.allArguments(tree) def argument(i: Int)(using Context): Option[Tree] = { val args = arguments diff --git a/compiler/src/dotty/tools/dotc/core/Comments.scala b/compiler/src/dotty/tools/dotc/core/Comments.scala index 183b581ce2e7..969cf76dc3fa 100644 --- a/compiler/src/dotty/tools/dotc/core/Comments.scala +++ b/compiler/src/dotty/tools/dotc/core/Comments.scala @@ -3,7 +3,7 @@ package dotc package core import ast.{ untpd, tpd } -import Decorators._, Symbols._, Contexts._ +import Symbols._, Contexts._ import util.{SourceFile, ReadOnlyMap} import util.Spans._ import util.CommentParsing._ diff --git a/compiler/src/dotty/tools/dotc/core/Constants.scala b/compiler/src/dotty/tools/dotc/core/Constants.scala index f2e6f6fc489a..63baf50fae02 100644 --- a/compiler/src/dotty/tools/dotc/core/Constants.scala +++ b/compiler/src/dotty/tools/dotc/core/Constants.scala @@ -5,7 +5,6 @@ package core import Types._, Symbols._, Contexts._ import printing.Printer import printing.Texts.Text -import Decorators._ object Constants { diff --git a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala index 835da2176a33..aded1cede9b4 100644 --- a/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala +++ b/compiler/src/dotty/tools/dotc/core/ConstraintHandling.scala @@ -9,9 +9,7 @@ import Decorators._ import Flags._ import config.Config import config.Printers.typr -import reporting.trace import typer.ProtoTypes.{newTypeVar, representedParamRef} -import StdNames.tpnme import UnificationDirection.* import NameKinds.AvoidNameKind diff --git a/compiler/src/dotty/tools/dotc/core/ContextOps.scala b/compiler/src/dotty/tools/dotc/core/ContextOps.scala index 594f103b8481..b7fd43735dd0 100644 --- a/compiler/src/dotty/tools/dotc/core/ContextOps.scala +++ b/compiler/src/dotty/tools/dotc/core/ContextOps.scala @@ -1,7 +1,7 @@ package dotty.tools.dotc package core -import Contexts._, Symbols._, Types._, Flags._, Scopes._, Decorators._, NameOps._ +import Contexts._, Symbols._, Types._, Flags._ import Denotations._, SymDenotations._ import Names.Name, StdNames.nme import ast.untpd @@ -110,4 +110,4 @@ object ContextOps: if (pkg.is(Package)) ctx.fresh.setOwner(pkg.moduleClass).setTree(tree) else ctx } -end ContextOps \ No newline at end of file +end ContextOps diff --git a/compiler/src/dotty/tools/dotc/core/Decorators.scala b/compiler/src/dotty/tools/dotc/core/Decorators.scala index 3ea05af0292a..6f823ba5cc7a 100644 --- a/compiler/src/dotty/tools/dotc/core/Decorators.scala +++ b/compiler/src/dotty/tools/dotc/core/Decorators.scala @@ -4,12 +4,9 @@ package core import annotation.tailrec import Symbols._ -import Contexts._, Names._, Phases._, printing.Texts._, printing.Printer -import util.Spans.Span +import Contexts._, Names._, Phases._, printing.Texts._ import collection.mutable.ListBuffer import dotty.tools.dotc.transform.MegaPhase -import ast.tpd._ -import scala.language.implicitConversions import printing.Formatting._ /** This object provides useful implicit decorators for types defined elsewhere */ diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 794119cd7a79..76e6918f214d 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -8,7 +8,6 @@ import Flags._, Scopes._, Decorators._, NameOps._, Periods._, NullOpsDecorator._ import unpickleScala2.Scala2Unpickler.ensureConstructor import scala.collection.mutable import collection.mutable -import Denotations.SingleDenotation import util.{SimpleIdentityMap, SourceFile, NoSource} import typer.ImportInfo.RootRef import Comments.CommentsContext diff --git a/compiler/src/dotty/tools/dotc/core/Denotations.scala b/compiler/src/dotty/tools/dotc/core/Denotations.scala index d97ae8ca2f6e..a5e1f64d58cb 100644 --- a/compiler/src/dotty/tools/dotc/core/Denotations.scala +++ b/compiler/src/dotty/tools/dotc/core/Denotations.scala @@ -18,7 +18,6 @@ import Signature.MatchDegree._ import printing.Texts._ import printing.Printer import io.AbstractFile -import config.Feature.migrateTo3 import config.Config import config.Printers.overload import util.common._ diff --git a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala index fb1ed9acaa4f..c49b5e888904 100644 --- a/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala +++ b/compiler/src/dotty/tools/dotc/core/GadtConstraint.scala @@ -11,7 +11,6 @@ import collection.mutable import printing._ import scala.annotation.internal.sharable -import scala.annotation.unused /** Represents GADT constraints currently in scope */ sealed abstract class GadtConstraint extends Showable { diff --git a/compiler/src/dotty/tools/dotc/core/JavaNullInterop.scala b/compiler/src/dotty/tools/dotc/core/JavaNullInterop.scala index acd0088f09aa..60fc4a4274e0 100644 --- a/compiler/src/dotty/tools/dotc/core/JavaNullInterop.scala +++ b/compiler/src/dotty/tools/dotc/core/JavaNullInterop.scala @@ -1,10 +1,8 @@ package dotty.tools.dotc package core -import config.Feature._ import Contexts._ import Flags.JavaDefined -import NullOpsDecorator._ import StdNames.nme import Symbols._ import Types._ diff --git a/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala b/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala index e56835d59c54..a65abe56edb9 100644 --- a/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala +++ b/compiler/src/dotty/tools/dotc/core/MacroClassLoader.scala @@ -5,8 +5,6 @@ import dotty.tools.dotc.util.Property import dotty.tools.dotc.reporting.trace import dotty.tools.io.ClassPath -import scala.collection.mutable - object MacroClassLoader { /** A key to be used in a context property that caches the class loader used for macro expansion */ diff --git a/compiler/src/dotty/tools/dotc/core/NameOps.scala b/compiler/src/dotty/tools/dotc/core/NameOps.scala index fb35ac0ac91f..21d44d9a4daa 100644 --- a/compiler/src/dotty/tools/dotc/core/NameOps.scala +++ b/compiler/src/dotty/tools/dotc/core/NameOps.scala @@ -10,7 +10,6 @@ import Names._, StdNames._, Contexts._, Symbols._, Flags._, NameKinds._, Types._ import util.Chars.{isOperatorPart, digit2int} import Definitions._ import nme._ -import Decorators._ object NameOps { diff --git a/compiler/src/dotty/tools/dotc/core/NamerOps.scala b/compiler/src/dotty/tools/dotc/core/NamerOps.scala index 9444270ccb05..f55b0665abcc 100644 --- a/compiler/src/dotty/tools/dotc/core/NamerOps.scala +++ b/compiler/src/dotty/tools/dotc/core/NamerOps.scala @@ -3,10 +3,7 @@ package dotc package core import Contexts._, Symbols._, Types._, Flags._, Scopes._, Decorators._, Names._, NameOps._ -import Denotations._ import SymDenotations.{LazyType, SymDenotation}, StdNames.nme -import config.Config -import ast.untpd /** Operations that are shared between Namer and TreeUnpickler */ object NamerOps: diff --git a/compiler/src/dotty/tools/dotc/core/Names.scala b/compiler/src/dotty/tools/dotc/core/Names.scala index f12aaecdd12d..23c2441ba728 100644 --- a/compiler/src/dotty/tools/dotc/core/Names.scala +++ b/compiler/src/dotty/tools/dotc/core/Names.scala @@ -7,8 +7,6 @@ import util.NameTransformer import printing.{Showable, Texts, Printer} import Texts.Text import StdNames.str -import util.Chars.isIdentifierStart -import collection.immutable import config.Config import util.{LinearMap, HashSet} diff --git a/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala b/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala index d0799ca89d24..e18271772ff1 100644 --- a/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala +++ b/compiler/src/dotty/tools/dotc/core/NullOpsDecorator.scala @@ -1,9 +1,7 @@ package dotty.tools.dotc package core -import ast.Trees._ import Contexts._ -import Symbols.defn import Types._ /** Defines operations on nullable types and tree. */ @@ -59,4 +57,4 @@ object NullOpsDecorator: case OrNull(tp) => self.cast(tp) case _ => self } -end NullOpsDecorator \ No newline at end of file +end NullOpsDecorator diff --git a/compiler/src/dotty/tools/dotc/core/Scopes.scala b/compiler/src/dotty/tools/dotc/core/Scopes.scala index ecc61530601d..44b97a25503e 100644 --- a/compiler/src/dotty/tools/dotc/core/Scopes.scala +++ b/compiler/src/dotty/tools/dotc/core/Scopes.scala @@ -14,11 +14,10 @@ import Names._ import Contexts._ import Phases._ import Denotations._ -import SymDenotations._ import printing.Texts._ import printing.Printer -import util.common._ import SymDenotations.NoDenotation + import collection.mutable object Scopes { diff --git a/compiler/src/dotty/tools/dotc/core/StagingContext.scala b/compiler/src/dotty/tools/dotc/core/StagingContext.scala index 9fbb009f6e5f..4a4f451df099 100644 --- a/compiler/src/dotty/tools/dotc/core/StagingContext.scala +++ b/compiler/src/dotty/tools/dotc/core/StagingContext.scala @@ -2,15 +2,10 @@ package dotty.tools.dotc.core import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.Types._ -import dotty.tools.dotc.core.Symbols._ -import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.util.Property import dotty.tools.dotc.transform.PCPCheckAndHeal -import scala.collection.mutable - object StagingContext { /** A key to be used in a context property that tracks the quoteation level */ diff --git a/compiler/src/dotty/tools/dotc/core/StdNames.scala b/compiler/src/dotty/tools/dotc/core/StdNames.scala index f8c70176482c..01a3306b8fe8 100644 --- a/compiler/src/dotty/tools/dotc/core/StdNames.scala +++ b/compiler/src/dotty/tools/dotc/core/StdNames.scala @@ -1,7 +1,6 @@ package dotty.tools.dotc package core -import scala.language.implicitConversions import scala.collection.mutable import scala.annotation.switch import Names._ diff --git a/compiler/src/dotty/tools/dotc/core/Substituters.scala b/compiler/src/dotty/tools/dotc/core/Substituters.scala index f00edcb189c6..bc292d4724a6 100644 --- a/compiler/src/dotty/tools/dotc/core/Substituters.scala +++ b/compiler/src/dotty/tools/dotc/core/Substituters.scala @@ -1,6 +1,6 @@ package dotty.tools.dotc.core -import Types._, Symbols._, Contexts._, Decorators._ +import Types._, Symbols._, Contexts._ /** Substitution operations on types. See the corresponding `subst` and * `substThis` methods on class Type for an explanation. diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala index 5c3545bb2f65..96c629517719 100644 --- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala @@ -12,7 +12,7 @@ import Scopes.Scope import dotty.tools.io.AbstractFile import Decorators._ import ast._ -import ast.Trees.{LambdaTypeTree, TypeBoundsTree, ValDef, TypeDef} +import ast.Trees.{LambdaTypeTree, TypeBoundsTree} import Trees.Literal import Variances.Variance import annotation.tailrec @@ -23,7 +23,6 @@ import scala.util.control.NonFatal import config.Config import reporting._ import collection.mutable -import transform.TypeUtils._ import scala.annotation.internal.sharable diff --git a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala index 83198ab65857..597cf1dc76b0 100644 --- a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala +++ b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala @@ -5,7 +5,6 @@ package core import java.io.{IOException, File} import java.nio.channels.ClosedByInterruptException -import scala.compat.Platform.currentTime import scala.util.control.NonFatal import dotty.tools.io.{ ClassPath, ClassRepresentation, AbstractFile } @@ -19,9 +18,7 @@ import Decorators._ import util.Stats import reporting.trace -import config.Config -import ast.Trees._ import ast.desugar import parsing.JavaParsers.OutlineJavaParser diff --git a/compiler/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala index 4fb481dfe2a9..75db5f7c04e9 100644 --- a/compiler/src/dotty/tools/dotc/core/Symbols.scala +++ b/compiler/src/dotty/tools/dotc/core/Symbols.scala @@ -7,7 +7,6 @@ import Names._ import Scopes._ import Flags._ import Decorators._ -import Symbols._ import Contexts._ import Phases._ import SymDenotations._ @@ -25,13 +24,11 @@ import ast.tpd import tpd.{Tree, TreeProvider, TreeOps} import ast.TreeTypeMap import Constants.Constant -import Variances.{Variance, varianceFromInt} +import Variances.Variance import reporting.Message import collection.mutable import io.AbstractFile -import language.implicitConversions import util.{SourceFile, NoSource, Property, SourcePosition, SrcPos, EqHashMap} -import scala.collection.JavaConverters._ import scala.annotation.internal.sharable import config.Printers.typr diff --git a/compiler/src/dotty/tools/dotc/core/TypeApplications.scala b/compiler/src/dotty/tools/dotc/core/TypeApplications.scala index 95ad0b95b335..da1817090d7a 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeApplications.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeApplications.scala @@ -9,9 +9,7 @@ import SymDenotations.LazyType import Decorators._ import util.Stats._ import Names._ -import NameOps._ import Flags.Module -import Variances.variancesConform import dotty.tools.dotc.config.Config object TypeApplications { diff --git a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala index 9e71e362a345..777a569e8d36 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeComparer.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeComparer.scala @@ -11,7 +11,7 @@ import collection.mutable import util.Stats import config.Config import config.Feature.migrateTo3 -import config.Printers.{constr, subtyping, gadts, matchTypes, noPrinter} +import config.Printers.{subtyping, gadts, matchTypes, noPrinter} import TypeErasure.{erasedLub, erasedGlb} import TypeApplications._ import Variances.{Variance, variancesConform} @@ -22,7 +22,6 @@ import scala.util.control.NonFatal import typer.ProtoTypes.constrained import typer.Applications.productSelectorTypes import reporting.trace -import NullOpsDecorator._ import annotation.constructorOnly /** Provides methods to compare types. diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala index 2d5c2a6da88a..cd570b57d3b3 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeOps.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeOps.scala @@ -10,15 +10,12 @@ import Decorators._ import StdNames._ import collection.mutable import ast.tpd._ -import reporting.{trace, Message} -import config.Printers.{gadts, typr} +import reporting.trace +import config.Printers.typr import config.Feature -import typer.Applications._ import typer.ProtoTypes._ import typer.ForceDegree import typer.Inferencing._ -import typer.IfBottom -import reporting.TestingReporter import scala.annotation.internal.sharable import scala.annotation.threadUnsafe diff --git a/compiler/src/dotty/tools/dotc/core/TyperState.scala b/compiler/src/dotty/tools/dotc/core/TyperState.scala index 6163eebfbef4..a537234208a1 100644 --- a/compiler/src/dotty/tools/dotc/core/TyperState.scala +++ b/compiler/src/dotty/tools/dotc/core/TyperState.scala @@ -4,7 +4,7 @@ package core import Types._ import Contexts._ -import util.{SimpleIdentityMap, SimpleIdentitySet} +import util.SimpleIdentitySet import reporting._ import config.Config import config.Printers.constr diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala index e9eb8ed78d02..4fd3e6770194 100644 --- a/compiler/src/dotty/tools/dotc/core/Types.scala +++ b/compiler/src/dotty/tools/dotc/core/Types.scala @@ -2,7 +2,6 @@ package dotty.tools package dotc package core -import util.common._ import Symbols._ import Flags._ import Names._ @@ -19,7 +18,7 @@ import Decorators._ import Denotations._ import Periods._ import CheckRealizable._ -import Variances.{Variance, varianceFromInt, varianceToInt, setStructuralVariances, Invariant} +import Variances.{Variance, setStructuralVariances, Invariant} import typer.Nullables import util.Stats._ import util.SimpleIdentitySet @@ -31,9 +30,7 @@ import Hashable._ import Uniques._ import collection.mutable import config.Config -import config.Feature import annotation.{tailrec, constructorOnly} -import language.implicitConversions import scala.util.hashing.{ MurmurHash3 => hashing } import config.Printers.{core, typr, matchTypes} import reporting.{trace, Message} diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala index 9920fc060142..c96141a73676 100644 --- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala +++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala @@ -3,18 +3,16 @@ package dotc package core package classfile -import dotty.tools.tasty.{ TastyFormat, TastyReader, TastyHeaderUnpickler } +import dotty.tools.tasty.{ TastyReader, TastyHeaderUnpickler } import Contexts._, Symbols._, Types._, Names._, StdNames._, NameOps._, Scopes._, Decorators._ import SymDenotations._, unpickleScala2.Scala2Unpickler._, Constants._, Annotations._, util.Spans._ import Phases._ -import NameKinds.DefaultGetterName import ast.{ tpd, untpd } import ast.tpd._, util._ -import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, DataInputStream, IOException } +import java.io.{ ByteArrayOutputStream, IOException } import java.lang.Integer.toHexString -import java.net.URLClassLoader import java.util.UUID import scala.collection.immutable @@ -22,7 +20,7 @@ import scala.collection.mutable.{ ListBuffer, ArrayBuffer } import scala.annotation.switch import tasty.TastyVersion import typer.Checking.checkNonCyclic -import io.{AbstractFile, PlainFile, ZipArchive} +import io.{AbstractFile, ZipArchive} import scala.util.control.NonFatal object ClassfileParser { diff --git a/compiler/src/dotty/tools/dotc/core/tasty/CommentPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/CommentPickler.scala index 068def1abdbd..2fd75516ad70 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/CommentPickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/CommentPickler.scala @@ -1,8 +1,7 @@ package dotty.tools.dotc.core.tasty import dotty.tools.dotc.ast.{tpd, untpd} -import dotty.tools.dotc.core.Comments.{Comment, CommentsContext, ContextDocstrings} -import dotty.tools.dotc.core.Contexts._ +import dotty.tools.dotc.core.Comments.Comment import dotty.tools.tasty.TastyBuffer import TastyBuffer.{Addr, NoAddr} diff --git a/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala b/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala index e09b2b74fc9e..623508780325 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala @@ -10,7 +10,6 @@ import collection.mutable import Names.{Name, chrs, SimpleName, DerivedName, TypeName} import NameKinds._ import NameOps._ -import Decorators._ import scala.io.Codec import NameTags.{SIGNED, TARGETSIGNED} diff --git a/compiler/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala index 782a6ac3a598..9c66e43eae80 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala @@ -8,7 +8,6 @@ import TastyFormat.SOURCE import TastyBuffer.{Addr, NameRef} import util.Spans._ -import collection.{mutable, Map} import Names.TermName /** Unpickler for tree positions */ diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyClassName.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyClassName.scala index 0a05cd8edc4a..c938868a3c48 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TastyClassName.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyClassName.scala @@ -6,11 +6,9 @@ import dotty.tools.tasty.{TastyBuffer, TastyReader} import TastyBuffer.NameRef import Contexts._, Decorators._ -import Names.{Name, TermName} +import Names.TermName import StdNames.nme import TastyUnpickler._ -import util.Spans.offsetToInt -import printing.Highlighting._ import dotty.tools.tasty.TastyFormat.ASTsSection /** Reads the package and class name of the class contained in this TASTy */ diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala index 74b8b357e00c..f4654022f38c 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala @@ -10,8 +10,7 @@ import TastyBuffer._ import Contexts._ import collection.mutable -import core.Symbols.{Symbol, ClassSymbol} -import ast.tpd +import core.Symbols.ClassSymbol import Decorators._ object TastyPickler { diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala index d1c9904cf6cb..f8c93c27c086 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala @@ -3,13 +3,12 @@ package core package tasty import dotty.tools.tasty.{TastyBuffer, TastyReader} -import TastyBuffer.{Addr, NameRef} +import TastyBuffer.NameRef import Contexts._, Decorators._ import Names.Name import TastyUnpickler._ import util.Spans.offsetToInt -import printing.Highlighting._ import dotty.tools.tasty.TastyFormat.{ASTsSection, PositionsSection, CommentsSection} import java.nio.file.{Files, Paths} import dotty.tools.io.{JarArchive, Path} diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala index 8f5910c3dd56..c8bffbc17252 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala @@ -9,16 +9,10 @@ import dotty.tools.tasty.TastyBuffer._ import ast.Trees._ import ast.{untpd, tpd} import Contexts._, Symbols._, Types._, Names._, Constants._, Decorators._, Annotations._, Flags._ -import Denotations.MultiDenotation import Comments.{Comment, CommentsContext} -import typer.Inliner import NameKinds._ import StdNames.nme import transform.SymUtils._ -import printing.Printer -import printing.Texts._ -import util.SourceFile -import annotation.constructorOnly import collection.mutable import dotty.tools.tasty.TastyFormat.ASTsSection diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index ac315f4cef89..475e8dccd997 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -5,7 +5,6 @@ package tasty import Comments.CommentsContext import Contexts._ -import Phases._ import Symbols._ import Types._ import Scopes._ @@ -27,10 +26,9 @@ import typer.Checking.checkNonCyclic import typer.Nullables._ import util.Spans._ import util.SourceFile -import ast.{TreeTypeMap, Trees, tpd, untpd} +import ast.{Trees, tpd, untpd} import Trees._ import Decorators._ -import transform.SymUtils._ import dotty.tools.tasty.{TastyBuffer, TastyReader} import TastyBuffer._ @@ -39,11 +37,9 @@ import scala.annotation.{switch, tailrec} import scala.collection.mutable.ListBuffer import scala.collection.mutable import config.Printers.pickling -import quoted.PickledQuotes import dotty.tools.tasty.TastyFormat._ -import scala.quoted import scala.annotation.constructorOnly import scala.annotation.internal.sharable diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Erasure.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Erasure.scala index f43735d16630..f2d25d0f34b5 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Erasure.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Erasure.scala @@ -5,7 +5,6 @@ package unpickleScala2 import Symbols._, Types._, Contexts._, Flags._, Names._, StdNames._, Phases._ import Decorators._ -import backend.sjs.JSDefinitions import scala.collection.mutable.ListBuffer /** Erasure logic specific to Scala 2 symbols. */ diff --git a/compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala b/compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala index 55e6e54787a2..c66a16dbb7b5 100644 --- a/compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala +++ b/compiler/src/dotty/tools/dotc/decompiler/DecompilationPrinter.scala @@ -8,7 +8,6 @@ import scala.io.Codec import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Phases.Phase -import dotty.tools.dotc.core.tasty.TastyPrinter import dotty.tools.io.File import scala.quoted.runtime.impl.QuotesImpl diff --git a/compiler/src/dotty/tools/dotc/fromtasty/TASTYCompiler.scala b/compiler/src/dotty/tools/dotc/fromtasty/TASTYCompiler.scala index 59f8444eb06a..923892b62f13 100644 --- a/compiler/src/dotty/tools/dotc/fromtasty/TASTYCompiler.scala +++ b/compiler/src/dotty/tools/dotc/fromtasty/TASTYCompiler.scala @@ -5,7 +5,6 @@ package fromtasty import core._ import Contexts._ import Phases.Phase -import dotty.tools.dotc.transform._ class TASTYCompiler extends Compiler { diff --git a/compiler/src/dotty/tools/dotc/interactive/Completion.scala b/compiler/src/dotty/tools/dotc/interactive/Completion.scala index 1f26b50b6cce..1192bead245c 100644 --- a/compiler/src/dotty/tools/dotc/interactive/Completion.scala +++ b/compiler/src/dotty/tools/dotc/interactive/Completion.scala @@ -1,27 +1,21 @@ package dotty.tools.dotc.interactive -import java.nio.charset.Charset -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.untpd import dotty.tools.dotc.config.Printers.interactiv import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.CheckRealizable import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Denotations.SingleDenotation import dotty.tools.dotc.core.Flags._ import dotty.tools.dotc.core.Names.{Name, TermName} import dotty.tools.dotc.core.NameKinds.SimpleNameKind import dotty.tools.dotc.core.NameOps._ -import dotty.tools.dotc.core.Symbols.{NoSymbol, Symbol, TermSymbol, defn, newSymbol} -import dotty.tools.dotc.core.Scopes.Scope -import dotty.tools.dotc.core.StdNames.{nme, tpnme} +import dotty.tools.dotc.core.Symbols.{Symbol, defn} +import dotty.tools.dotc.core.StdNames.nme import dotty.tools.dotc.core.SymDenotations.SymDenotation -import dotty.tools.dotc.core.TypeComparer import dotty.tools.dotc.core.TypeError -import dotty.tools.dotc.core.Types.{ExprType, MethodOrPoly, NameFilter, NamedType, NoType, PolyType, TermRef, Type} -import dotty.tools.dotc.printing.Texts._ -import dotty.tools.dotc.util.{NameTransformer, NoSourcePosition, SourcePosition} +import dotty.tools.dotc.core.Types.{ExprType, MethodOrPoly, NameFilter, NoType, TermRef, Type} +import dotty.tools.dotc.util.SourcePosition import scala.collection.mutable import scala.util.control.NonFatal diff --git a/compiler/src/dotty/tools/dotc/interactive/Interactive.scala b/compiler/src/dotty/tools/dotc/interactive/Interactive.scala index cb41650c0b57..219d9f5384ba 100644 --- a/compiler/src/dotty/tools/dotc/interactive/Interactive.scala +++ b/compiler/src/dotty/tools/dotc/interactive/Interactive.scala @@ -2,7 +2,6 @@ package dotty.tools package dotc package interactive -import scala.annotation.tailrec import scala.collection._ import ast.{NavigateAST, Trees, tpd, untpd} @@ -11,10 +10,6 @@ import Decorators._, ContextOps._ import Contexts._, Flags._, Names._, NameOps._, Symbols._, Trees._, Types._ import transform.SymUtils._ import util.Spans._, util.SourceFile, util.SourcePosition -import core.Denotations.SingleDenotation -import NameKinds.SimpleNameKind -import config.Printers.interactiv -import StdNames.nme /** High-level API to get information out of typed trees, designed to be used by IDEs. * diff --git a/compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala b/compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala index c0584c51b842..e17866130e3d 100644 --- a/compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala +++ b/compiler/src/dotty/tools/dotc/interactive/InteractiveDriver.scala @@ -12,7 +12,7 @@ import java.util.zip._ import scala.collection._ import scala.io.Codec -import dotty.tools.io.{ AbstractFile, ClassPath, ClassRepresentation, PlainFile, VirtualFile } +import dotty.tools.io.{ AbstractFile, VirtualFile } import ast.{Trees, tpd} import core._, core.Decorators._ diff --git a/compiler/src/dotty/tools/dotc/interactive/SourceTree.scala b/compiler/src/dotty/tools/dotc/interactive/SourceTree.scala index e77a8aab36b6..60f01396e91e 100644 --- a/compiler/src/dotty/tools/dotc/interactive/SourceTree.scala +++ b/compiler/src/dotty/tools/dotc/interactive/SourceTree.scala @@ -2,7 +2,6 @@ package dotty.tools package dotc package interactive -import scala.io.Codec import ast.tpd import core._ diff --git a/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala b/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala index e5b0b24bdd2f..f5f016d740d2 100644 --- a/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala @@ -14,7 +14,6 @@ import core._ import Contexts._ import Names._ import Types._ -import Symbols._ import ast.Trees._ import Decorators._ import StdNames._ diff --git a/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala b/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala index d5918b5179ca..a67bca34cae2 100644 --- a/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala +++ b/compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala @@ -1,11 +1,8 @@ package dotty.tools.dotc.parsing -import dotty.tools.dotc.ast.Trees import dotty.tools.dotc.config.Config -import dotty.tools.dotc.config.Printers.{ default, typr } import dotty.tools.dotc.core.Contexts.{ Context, ctx } import dotty.tools.dotc.core.Phases.Phase -import dotty.tools.dotc.core.Symbols.defn import dotty.tools.dotc.typer.ImportInfo.withRootImports import dotty.tools.dotc.{ CompilationUnit, ast, report } import dotty.tools.dotc.util.{ NoSourcePosition, SourcePosition } diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 5543ebc0b798..0c3df1b1957a 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -17,15 +17,14 @@ import NameKinds.WildcardParamName import NameOps._ import ast.{Positioned, Trees} import ast.Trees._ -import typer.ImportInfo import StdNames._ import util.Spans._ import Constants._ -import Symbols.{defn, NoSymbol} +import Symbols.NoSymbol import ScriptParsers._ import Decorators._ import util.Chars -import scala.annotation.{tailrec, switch} +import scala.annotation.tailrec import rewrites.Rewrites.{patch, overlapsPatch} import reporting._ import config.Feature diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala index 72b05ad073c2..209092b5d1a7 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala @@ -5,22 +5,17 @@ package parsing import core.Names._, core.Contexts._, core.Decorators._, util.Spans._ import core.StdNames._, core.Comments._ import util.SourceFile -import java.lang.Character.isDigit import util.Chars._ import util.{SourcePosition, CharBuffer} import util.Spans.Span import config.Config -import config.Printers.lexical -import config.Settings.Setting import Tokens._ import scala.annotation.{switch, tailrec} import scala.collection.mutable -import scala.collection.immutable.{SortedMap, BitSet} +import scala.collection.immutable.SortedMap import rewrites.Rewrites.patch import config.Feature import config.Feature.migrateTo3 -import config.SourceVersion._ -import reporting.Message object Scanners { diff --git a/compiler/src/dotty/tools/dotc/plugins/Plugin.scala b/compiler/src/dotty/tools/dotc/plugins/Plugin.scala index 76cf60d5e3be..f7391a1b711b 100644 --- a/compiler/src/dotty/tools/dotc/plugins/Plugin.scala +++ b/compiler/src/dotty/tools/dotc/plugins/Plugin.scala @@ -10,7 +10,6 @@ import transform.MegaPhase.MiniPhase import java.io.InputStream import java.util.Properties -import scala.collection.mutable import scala.util.{ Try, Success, Failure } trait PluginPhase extends MiniPhase { diff --git a/compiler/src/dotty/tools/dotc/printing/DecompilerPrinter.scala b/compiler/src/dotty/tools/dotc/printing/DecompilerPrinter.scala index bd1cc574cf27..83dc32d6e7ac 100644 --- a/compiler/src/dotty/tools/dotc/printing/DecompilerPrinter.scala +++ b/compiler/src/dotty/tools/dotc/printing/DecompilerPrinter.scala @@ -9,7 +9,6 @@ import dotty.tools.dotc.core.StdNames.nme import dotty.tools.dotc.core.Flags._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.StdNames._ -import dotty.tools.dotc.core.Annotations.Annotation class DecompilerPrinter(_ctx: Context) extends RefinedPrinter(_ctx) { diff --git a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala index cf5942a178f0..544fdcad2ae0 100644 --- a/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala +++ b/compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala @@ -16,18 +16,16 @@ import Denotations._ import SymDenotations._ import StdNames.{nme, tpnme} import ast.{Trees, untpd} -import typer.{Implicits, Namer, Applications} +import typer.{Implicits, Namer} import typer.ProtoTypes._ import Trees._ import TypeApplications._ -import Decorators._ import NameKinds.{WildcardParamName, DefaultGetterName} import util.Chars.isOperatorPart import transform.TypeUtils._ import transform.SymUtils._ -import language.implicitConversions -import dotty.tools.dotc.util.{NameTransformer, SourcePosition} +import dotty.tools.dotc.util.SourcePosition import dotty.tools.dotc.ast.untpd.{MemberDef, Modifiers, PackageDef, RefTree, Template, TypeDef, ValOrDefDef} class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { @@ -845,7 +843,6 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) { paramss.foldLeft(leading)((txt, params) => txt ~ paramsText(params)) protected def valDefToText[T >: Untyped](tree: ValDef[T]): Text = { - import untpd._ dclTextOr(tree) { modText(tree.mods, tree.symbol, keywordStr(if (tree.mods.is(Mutable)) "var" else "val"), isType = false) ~~ valDefText(nameIdText(tree)) ~ optAscription(tree.tpt) ~ diff --git a/compiler/src/dotty/tools/dotc/printing/Texts.scala b/compiler/src/dotty/tools/dotc/printing/Texts.scala index 9a3aac39ed18..0cab82a76a6d 100644 --- a/compiler/src/dotty/tools/dotc/printing/Texts.scala +++ b/compiler/src/dotty/tools/dotc/printing/Texts.scala @@ -1,6 +1,5 @@ package dotty.tools.dotc package printing -import language.implicitConversions object Texts { diff --git a/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala b/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala index 628afe4504bd..141b349826b4 100644 --- a/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala +++ b/compiler/src/dotty/tools/dotc/quoted/MacroExpansion.scala @@ -1,10 +1,9 @@ package dotty.tools.dotc.quoted import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.core._ import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.typer.Typer -import dotty.tools.dotc.util.{Property, SourcePosition, Spans} +import dotty.tools.dotc.util.{Property, SourcePosition} object MacroExpansion { diff --git a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala index 8c72177a76d0..c76bb593875b 100644 --- a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala +++ b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala @@ -3,11 +3,8 @@ package dotty.tools.dotc.quoted import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.{TreeTypeMap, tpd} import dotty.tools.dotc.config.Printers._ -import dotty.tools.dotc.core.Constants.Constant import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Decorators._ -import dotty.tools.dotc.core.StdNames._ -import dotty.tools.dotc.core.NameKinds import dotty.tools.dotc.core.Mode import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Types._ @@ -16,7 +13,6 @@ import dotty.tools.dotc.core.tasty.DottyUnpickler import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode import dotty.tools.dotc.report -import scala.reflect.ClassTag import scala.quoted.Quotes import scala.quoted.runtime.impl._ diff --git a/compiler/src/dotty/tools/dotc/quoted/QuoteUtils.scala b/compiler/src/dotty/tools/dotc/quoted/QuoteUtils.scala index 56c8d3347205..604c8da3420a 100644 --- a/compiler/src/dotty/tools/dotc/quoted/QuoteUtils.scala +++ b/compiler/src/dotty/tools/dotc/quoted/QuoteUtils.scala @@ -1,9 +1,7 @@ package dotty.tools.dotc.quoted -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Symbols._ object QuoteUtils: diff --git a/compiler/src/dotty/tools/dotc/quoted/QuotesCache.scala b/compiler/src/dotty/tools/dotc/quoted/QuotesCache.scala index 996eb8a76fbb..c063e437cb19 100644 --- a/compiler/src/dotty/tools/dotc/quoted/QuotesCache.scala +++ b/compiler/src/dotty/tools/dotc/quoted/QuotesCache.scala @@ -2,10 +2,8 @@ package dotty.tools.dotc.quoted import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.util.Property -import dotty.tools.dotc.reporting.trace import dotty.tools.dotc.ast.tpd -import scala.collection.mutable object QuotesCache { import tpd._ diff --git a/compiler/src/dotty/tools/dotc/quoted/TastyString.scala b/compiler/src/dotty/tools/dotc/quoted/TastyString.scala index 677c742c41df..528414654969 100644 --- a/compiler/src/dotty/tools/dotc/quoted/TastyString.scala +++ b/compiler/src/dotty/tools/dotc/quoted/TastyString.scala @@ -1,6 +1,5 @@ package dotty.tools.dotc.quoted -import java.io._ import java.util.Base64 import java.nio.charset.StandardCharsets.UTF_8 diff --git a/compiler/src/dotty/tools/dotc/quoted/reflect/FromSymbol.scala b/compiler/src/dotty/tools/dotc/quoted/reflect/FromSymbol.scala index 30071ea374fa..87d0cbb7be08 100644 --- a/compiler/src/dotty/tools/dotc/quoted/reflect/FromSymbol.scala +++ b/compiler/src/dotty/tools/dotc/quoted/reflect/FromSymbol.scala @@ -8,7 +8,6 @@ import dotty.tools.dotc.core.Flags._ import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Types._ -import dotty.tools.dotc.core.Decorators._ object FromSymbol { diff --git a/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala b/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala index 0d2292318a71..a95af962c053 100644 --- a/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala +++ b/compiler/src/dotty/tools/dotc/reporting/ConsoleReporter.scala @@ -4,7 +4,7 @@ package reporting import core.Contexts._ import java.io.{ BufferedReader, PrintWriter } -import Diagnostic.{ Error, ConditionalWarning } +import Diagnostic.Error /** * This class implements a Reporter that displays messages on a text console diff --git a/compiler/src/dotty/tools/dotc/reporting/Message.scala b/compiler/src/dotty/tools/dotc/reporting/Message.scala index cd7456cafcc2..f309dc0f1477 100644 --- a/compiler/src/dotty/tools/dotc/reporting/Message.scala +++ b/compiler/src/dotty/tools/dotc/reporting/Message.scala @@ -2,7 +2,6 @@ package dotty.tools package dotc package reporting import scala.annotation.threadUnsafe -import util.SourcePosition object Message { val nonSensicalStartTag: String = "" diff --git a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala index 421d8f52b43a..39ece915ca83 100644 --- a/compiler/src/dotty/tools/dotc/reporting/Reporter.scala +++ b/compiler/src/dotty/tools/dotc/reporting/Reporter.scala @@ -2,9 +2,7 @@ package dotty.tools package dotc package reporting -import dotty.tools.dotc.ast.{Trees, tpd} import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Mode import dotty.tools.dotc.core.Symbols.{NoSymbol, Symbol} import dotty.tools.dotc.reporting.Diagnostic._ @@ -14,7 +12,6 @@ import dotty.tools.dotc.util.NoSourcePosition import java.io.{BufferedReader, PrintWriter} import scala.annotation.internal.sharable import scala.collection.mutable -import scala.util.chaining._ object Reporter { /** Convert a SimpleReporter into a real Reporter */ diff --git a/compiler/src/dotty/tools/dotc/reporting/WConf.scala b/compiler/src/dotty/tools/dotc/reporting/WConf.scala index 34a47fa3db9d..01c2e79389c6 100644 --- a/compiler/src/dotty/tools/dotc/reporting/WConf.scala +++ b/compiler/src/dotty/tools/dotc/reporting/WConf.scala @@ -7,7 +7,6 @@ import dotty.tools.dotc.util.SourcePosition import java.util.regex.PatternSyntaxException import scala.annotation.internal.sharable -import scala.collection.mutable.ListBuffer import scala.util.matching.Regex enum MessageFilter: diff --git a/compiler/src/dotty/tools/dotc/reporting/messages.scala b/compiler/src/dotty/tools/dotc/reporting/messages.scala index 4a1efab782a1..0262e0190677 100644 --- a/compiler/src/dotty/tools/dotc/reporting/messages.scala +++ b/compiler/src/dotty/tools/dotc/reporting/messages.scala @@ -8,7 +8,6 @@ import Decorators._, Symbols._, Names._, NameOps._, Types._, Flags._, Phases._ import Denotations.SingleDenotation import SymDenotations.SymDenotation import NameKinds.WildcardParamName -import util.SourcePosition import parsing.Scanners.Token import parsing.Tokens import printing.Highlighting._ diff --git a/compiler/src/dotty/tools/dotc/sbt/APIUtils.scala b/compiler/src/dotty/tools/dotc/sbt/APIUtils.scala index d61718799b20..9ddb8aa9116c 100644 --- a/compiler/src/dotty/tools/dotc/sbt/APIUtils.scala +++ b/compiler/src/dotty/tools/dotc/sbt/APIUtils.scala @@ -2,13 +2,8 @@ package dotty.tools.dotc package sbt import core._ -import Annotations._ import Contexts._ -import Decorators._ -import Denotations._ import Flags._ -import Phases._ -import Types._ import Symbols._ import NameOps._ diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala index 3e442aab5b68..feef706d3c15 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala @@ -2,7 +2,7 @@ package dotty.tools.dotc package sbt import ExtractDependencies.internalError -import ast.{Positioned, Trees, tpd, untpd} +import ast.{Positioned, Trees, tpd} import core._ import core.Decorators._ import Annotations._ @@ -14,14 +14,12 @@ import Types._ import Symbols._ import Names._ import NameOps._ -import NameKinds.DefaultGetterName import typer.Inliner import transform.ValueClasses import transform.SymUtils._ import dotty.tools.io.File import java.io.PrintWriter -import xsbti.api.DefinitionType import scala.collection.mutable import scala.util.hashing.MurmurHash3 diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala index 0dd30cd27ced..83fb4fd40215 100644 --- a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala +++ b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala @@ -4,7 +4,6 @@ package sbt import java.io.File import java.util.{Arrays, EnumSet} -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Decorators._ @@ -12,7 +11,6 @@ import dotty.tools.dotc.core.Flags._ import dotty.tools.dotc.core.NameOps._ import dotty.tools.dotc.core.Names._ import dotty.tools.dotc.core.Phases._ -import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Denotations.StaleSymbol import dotty.tools.dotc.core.Types._ diff --git a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala index e40607ef0d5a..140d2fe5b766 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala @@ -5,7 +5,6 @@ package semanticdb import core._ import Phases._ import ast.tpd._ -import ast.untpd.given import ast.Trees.{mods, WithEndMarker} import Contexts._ import Symbols._ @@ -15,10 +14,9 @@ import StdNames.nme import NameOps._ import Denotations.StaleSymbol import util.Spans.Span -import util.{SourceFile, SourcePosition} +import util.SourceFile import transform.SymUtils._ -import scala.jdk.CollectionConverters._ import scala.collection.mutable import scala.annotation.{ threadUnsafe => tu, tailrec } import scala.PartialFunction.condOpt @@ -32,7 +30,6 @@ import dotty.tools.dotc.{semanticdb => s} */ class ExtractSemanticDB extends Phase: import Scala3.{_, given} - import Symbols.given override val phaseName: String = ExtractSemanticDB.name @@ -458,7 +455,6 @@ class ExtractSemanticDB extends Phase: object ExtractSemanticDB: import java.nio.file.Path - import scala.collection.JavaConverters._ import java.nio.file.Files import java.nio.file.Paths diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Language.scala b/compiler/src/dotty/tools/dotc/semanticdb/Language.scala index 7007f29816db..54473f87a938 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/Language.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/Language.scala @@ -6,7 +6,6 @@ package dotty.tools.dotc.semanticdb import dotty.tools.dotc.semanticdb.internal._ -import scala.annotation.internal.sharable sealed abstract class Language(val value: _root_.scala.Int) extends SemanticdbGeneratedEnum derives CanEqual { type EnumType = Language diff --git a/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala b/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala index 4361db3e50d6..17c66ebcc49c 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala @@ -3,7 +3,7 @@ package dotty.tools.dotc.semanticdb import dotty.tools.dotc.{semanticdb => s} import scala.collection.mutable -import dotty.tools.dotc.semanticdb.Scala3.{_, given} +import dotty.tools.dotc.semanticdb.Scala3.given import SymbolInformation.Kind._ import dotty.tools.dotc.util.SourceFile class SymbolInformationPrinter (symtab: PrinterSymtab): diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala b/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala index 686dc20e481b..45af208b3e36 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala @@ -12,8 +12,6 @@ import core.StdNames.nme import SymbolInformation.{Kind => k} import dotty.tools.dotc.util.SourceFile import dotty.tools.dotc.util.Spans.Span -import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.{semanticdb => s} import java.lang.Character.{isJavaIdentifierPart, isJavaIdentifierStart} diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Schema.scala b/compiler/src/dotty/tools/dotc/semanticdb/Schema.scala index 492e1647de51..edebcc8c0412 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/Schema.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/Schema.scala @@ -6,7 +6,6 @@ package dotty.tools.dotc.semanticdb import dotty.tools.dotc.semanticdb.internal._ -import scala.annotation.internal.sharable sealed abstract class Schema(val value: _root_.scala.Int) extends SemanticdbGeneratedEnum derives CanEqual { type EnumType = Schema diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala b/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala index 8743fd04d651..c825032373f8 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala @@ -10,7 +10,6 @@ import Names.Name import scala.annotation.tailrec import scala.collection.mutable -import dotty.tools.dotc.core.Types.TypeParamRef class SemanticSymbolBuilder: import Scala3.{_, given} diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala b/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala index 0818b7cf1be1..c5bd6cc7863b 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala @@ -6,7 +6,6 @@ import dotty.tools.dotc.core.Flags._ import dotty.tools.dotc.core.StdNames.nme import dotty.tools.dotc.{semanticdb => s} -import scala.collection.mutable class SyntheticsExtractor: import Scala3.{_, given} diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Tools.scala b/compiler/src/dotty/tools/dotc/semanticdb/Tools.scala index 54b57f7c6a2f..d7d3324549b7 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/Tools.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/Tools.scala @@ -4,7 +4,7 @@ import java.nio.file._ import java.nio.charset.StandardCharsets import scala.collection.JavaConverters._ import dotty.tools.dotc.util.SourceFile -import dotty.tools.dotc.semanticdb.Scala3.{_, given} +import dotty.tools.dotc.semanticdb.Scala3.given object Tools: diff --git a/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala b/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala index 963a153388a3..8983a3c61634 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala @@ -9,7 +9,6 @@ import core.Annotations.Annotation import core.Flags import core.Names.Name import core.StdNames.tpnme -import ast.tpd._ import scala.util.chaining.scalaUtilChainingOps import collection.mutable diff --git a/compiler/src/dotty/tools/dotc/semanticdb/internal/LiteParser.scala b/compiler/src/dotty/tools/dotc/semanticdb/internal/LiteParser.scala index dea43c0ede19..1000fc6601da 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/internal/LiteParser.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/internal/LiteParser.scala @@ -1,6 +1,5 @@ package dotty.tools.dotc.semanticdb.internal -import java.io.InputStream object LiteParser { diff --git a/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbGeneratedMessageCompanion.scala b/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbGeneratedMessageCompanion.scala index 4974e3ea256c..bad0ff9b8fc8 100644 --- a/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbGeneratedMessageCompanion.scala +++ b/compiler/src/dotty/tools/dotc/semanticdb/internal/SemanticdbGeneratedMessageCompanion.scala @@ -1,6 +1,5 @@ package dotty.tools.dotc.semanticdb.internal -import java.io.InputStream // https://github.com/scalapb/ScalaPB/blob/194463272125b872b99d4902b7712355a53e96c4/scalapb-runtime/src/main/scala/scalapb/GeneratedMessageCompanion.scala#L61-L68 trait SemanticdbGeneratedOneof extends Any with Product with Serializable { diff --git a/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala b/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala index de25cb140da0..15c6d30c3b19 100644 --- a/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala +++ b/compiler/src/dotty/tools/dotc/transform/AccessProxies.scala @@ -11,8 +11,6 @@ import NameOps._ import Decorators._ import TypeUtils._ import Types._ -import NameKinds.ClassifiedNameKind -import ast.Trees._ import util.Spans.Span import config.Printers.transforms diff --git a/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala b/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala index cc39c5a3517b..872c7cc897de 100644 --- a/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala +++ b/compiler/src/dotty/tools/dotc/transform/ArrayApply.scala @@ -5,13 +5,10 @@ import core._ import MegaPhase._ import Contexts._ import Symbols._ -import Types._ import Flags._ import StdNames._ -import ast.Trees._ import dotty.tools.dotc.ast.tpd -import scala.reflect.ClassTag /** This phase rewrites calls to `Array.apply` to a direct instantiation of the array in the bytecode. diff --git a/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala b/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala index 1bcaa2626ee3..2b02e94e4f0f 100644 --- a/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala +++ b/compiler/src/dotty/tools/dotc/transform/ArrayConstructors.scala @@ -7,7 +7,6 @@ import Contexts._ import Symbols._ import Types._ import StdNames._ -import ast.Trees._ import dotty.tools.dotc.ast.tpd diff --git a/compiler/src/dotty/tools/dotc/transform/BeanProperties.scala b/compiler/src/dotty/tools/dotc/transform/BeanProperties.scala index 91ec94590284..0d464d319848 100644 --- a/compiler/src/dotty/tools/dotc/transform/BeanProperties.scala +++ b/compiler/src/dotty/tools/dotc/transform/BeanProperties.scala @@ -5,7 +5,6 @@ import core._ import ast.tpd._ import Annotations._ import Contexts._ -import SymDenotations._ import Symbols.newSymbol import Decorators._ import Flags._ diff --git a/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala b/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala index 79b68b331930..90c0207ebb6d 100644 --- a/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala +++ b/compiler/src/dotty/tools/dotc/transform/BetaReduce.scala @@ -7,7 +7,6 @@ import Flags._ import MegaPhase._ import Symbols._, Contexts._, Types._, Decorators._ import StdNames.nme -import ast.Trees._ import ast.TreeTypeMap /** Rewrite an application diff --git a/compiler/src/dotty/tools/dotc/transform/Bridges.scala b/compiler/src/dotty/tools/dotc/transform/Bridges.scala index f7c00ef74b94..912b8ca69131 100644 --- a/compiler/src/dotty/tools/dotc/transform/Bridges.scala +++ b/compiler/src/dotty/tools/dotc/transform/Bridges.scala @@ -7,7 +7,6 @@ import Symbols._, Types._, Contexts._, Decorators._, Flags._, Scopes._, Phases._ import DenotTransformers._ import ast.untpd import collection.{mutable, immutable} -import util.Spans.Span import util.SrcPos import ContextFunctionResults.{contextResultCount, contextFunctionResultTypeAfter} import StdNames.nme diff --git a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala index 2969b00c7dd2..d3efa6c60d5c 100644 --- a/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala +++ b/compiler/src/dotty/tools/dotc/transform/CapturedVars.scala @@ -11,9 +11,7 @@ import core.StdNames.nme import core.Names._ import core.NameKinds.TempResultName import core.Constants._ -import ast.Trees._ import util.Store -import collection.mutable /** This phase translates variables that are captured in closures to * heap-allocated refs. diff --git a/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala b/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala index 074f5a634821..70c8c0314658 100644 --- a/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala +++ b/compiler/src/dotty/tools/dotc/transform/CheckLoopingImplicits.scala @@ -5,10 +5,8 @@ import core.* import MegaPhase.MiniPhase import Contexts.*, Types.*, Symbols.*, SymDenotations.*, Flags.* import ast.* -import Trees.* import Decorators.* -import annotation.threadUnsafe object CheckLoopingImplicits: val name: String = "checkLoopingImplicits" diff --git a/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala b/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala index 5d11cbdf7bb5..f43d000bbf44 100644 --- a/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala +++ b/compiler/src/dotty/tools/dotc/transform/CheckNoSuperThis.scala @@ -5,10 +5,8 @@ import core.* import MegaPhase.MiniPhase import Contexts.*, Types.*, Symbols.*, SymDenotations.*, Flags.* import ast.* -import Trees.* import Decorators.* -import annotation.threadUnsafe object CheckNoSuperThis: val name: String = "checkNoSuperThis" diff --git a/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala b/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala index ddd42d615ad4..0d5154e212ee 100644 --- a/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala +++ b/compiler/src/dotty/tools/dotc/transform/CheckStatic.scala @@ -7,7 +7,6 @@ import Flags._ import Contexts._ import Symbols._ import dotty.tools.dotc.ast.tpd -import Decorators._ import reporting._ import dotty.tools.dotc.transform.SymUtils._ diff --git a/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala b/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala index de304f5d3077..b4544b2225dd 100644 --- a/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala +++ b/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala @@ -2,19 +2,13 @@ package dotty.tools.dotc.transform import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts.Context -import dotty.tools.dotc.core.Types import dotty.tools.dotc.transform.MegaPhase._ import java.io.{File => _} import dotty.tools.dotc.core._ -import SymDenotations._ import Contexts._ -import Types._ import Symbols._ import Phases._ -import dotty.tools.dotc.util.SourcePosition -import Decorators._ -import StdNames.nme import dotty.tools.io.JarArchive import dotty.tools.backend.jvm.GenBCode diff --git a/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala b/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala index 9f90ae43c751..be454281bcbb 100644 --- a/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala +++ b/compiler/src/dotty/tools/dotc/transform/CompleteJavaEnums.scala @@ -4,7 +4,7 @@ package transform import core._ import Names._ -import StdNames.{nme, tpnme} +import StdNames.nme import Types._ import dotty.tools.dotc.transform.MegaPhase._ import Flags._ @@ -13,10 +13,8 @@ import Symbols._ import Constants._ import Decorators._ import DenotTransformers._ -import dotty.tools.dotc.ast.Trees._ import SymUtils._ -import annotation.threadUnsafe object CompleteJavaEnums { val name: String = "completeJavaEnums" diff --git a/compiler/src/dotty/tools/dotc/transform/Constructors.scala b/compiler/src/dotty/tools/dotc/transform/Constructors.scala index be77103e2395..a897165ac671 100644 --- a/compiler/src/dotty/tools/dotc/transform/Constructors.scala +++ b/compiler/src/dotty/tools/dotc/transform/Constructors.scala @@ -3,11 +3,9 @@ package transform import core._ import MegaPhase._ -import dotty.tools.dotc.ast.tpd._ import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.StdNames._ import ast._ -import Trees._ import Flags._ import Names.Name import NameOps._ @@ -16,7 +14,6 @@ import SymUtils._ import Symbols._ import Decorators._ import DenotTransformers._ -import Constants.Constant import collection.mutable object Constructors { diff --git a/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala b/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala index 14134b4bb1fa..be58fb41f1da 100644 --- a/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala +++ b/compiler/src/dotty/tools/dotc/transform/ContextFunctionResults.scala @@ -8,7 +8,6 @@ import StdNames.nme import ast.untpd import ast.tpd._ import config.Config -import Decorators.* object ContextFunctionResults: diff --git a/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala b/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala index 54ac7478c332..91b5bc6a3de4 100644 --- a/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala +++ b/compiler/src/dotty/tools/dotc/transform/CountOuterAccesses.scala @@ -5,10 +5,8 @@ import core._ import MegaPhase.MiniPhase import dotty.tools.dotc.core.Contexts._ import ast._ -import Trees._ import Flags._ import Symbols._ -import Decorators._ import ExplicitOuter.isOuterParamAccessor import collection.mutable diff --git a/compiler/src/dotty/tools/dotc/transform/Dependencies.scala b/compiler/src/dotty/tools/dotc/transform/Dependencies.scala index c5c6c5baaa7b..6f781c85a027 100644 --- a/compiler/src/dotty/tools/dotc/transform/Dependencies.scala +++ b/compiler/src/dotty/tools/dotc/transform/Dependencies.scala @@ -3,7 +3,6 @@ package transform import core.* import Symbols.*, Contexts.*, Types.*, Flags.*, Decorators.* -import ast.Trees.* import SymUtils.* import collection.mutable.{LinkedHashMap, TreeSet} import annotation.constructorOnly diff --git a/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala b/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala index e9322a450cb9..ca6a056fd6d5 100644 --- a/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala +++ b/compiler/src/dotty/tools/dotc/transform/DropOuterAccessors.scala @@ -5,7 +5,6 @@ import core._ import MegaPhase.MiniPhase import dotty.tools.dotc.core.Contexts._ import ast._ -import Trees._ import Flags._ import Symbols._ import Contexts._ @@ -14,7 +13,6 @@ import DenotTransformers._ import ExplicitOuter.isOuterParamAccessor import CountOuterAccesses.mightBeDropped import collection.mutable -import annotation.threadUnsafe object DropOuterAccessors: val name: String = "dropOuterAccessors" diff --git a/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala b/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala index a6f9cbf7dbe9..2f55826ec2a3 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimOpaque.scala @@ -8,13 +8,10 @@ import Flags._ import Types._ import Contexts._ import Symbols._ -import Decorators._ import Denotations.{SingleDenotation, NonSymSingleDenotation} import SymDenotations.SymDenotation import DenotTransformers._ -import TypeUtils._ import Names._ -import ast.Trees._ object ElimOpaque { val name: String = "elimOpaque" diff --git a/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala index 1ca258420aa2..b91da4e9de88 100644 --- a/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala +++ b/compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala @@ -6,14 +6,11 @@ import core._ import StdNames.nme import Types._ import transform.MegaPhase._ -import ast.Trees._ import Flags._ import Contexts._ import Symbols._ -import Constants._ import Decorators._ import Denotations._, SymDenotations._ -import TypeErasure.erasure import DenotTransformers._ import NullOpsDecorator._ diff --git a/compiler/src/dotty/tools/dotc/transform/Erasure.scala b/compiler/src/dotty/tools/dotc/transform/Erasure.scala index d16cc2f66f51..739f7d6b06b4 100644 --- a/compiler/src/dotty/tools/dotc/transform/Erasure.scala +++ b/compiler/src/dotty/tools/dotc/transform/Erasure.scala @@ -18,7 +18,7 @@ import core.Decorators._ import core.Constants._ import core.Definitions._ import core.Annotations.BodyAnnotation -import typer.{NoChecking, LiftErased} +import typer.NoChecking import typer.Inliner import typer.ProtoTypes._ import typer.ErrorReporting.errorTree @@ -26,7 +26,6 @@ import typer.Checking.checkValue import core.TypeErasure._ import core.Decorators._ import dotty.tools.dotc.ast.{tpd, untpd} -import ast.Trees._ import ast.TreeTypeMap import dotty.tools.dotc.core.{Constants, Flags} import ValueClasses._ @@ -36,7 +35,6 @@ import ExplicitOuter._ import core.Mode import util.Property import reporting._ -import collection.mutable class Erasure extends Phase with DenotTransformer { diff --git a/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala b/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala index ab5190daf0e8..b2aab80e98b4 100644 --- a/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala +++ b/compiler/src/dotty/tools/dotc/transform/EtaReduce.scala @@ -6,7 +6,6 @@ import MegaPhase.MiniPhase import core.* import Symbols.*, Contexts.*, Types.*, Decorators.* import StdNames.nme -import ast.Trees.* /** Rewrite `(x1, ... xN) => f(x1, ... xN)` for N >= 0 to `f`, * provided `f` is a pure path of function type. diff --git a/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala b/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala index f02f6b61d588..41e5b76ca874 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExpandPrivate.scala @@ -9,7 +9,6 @@ import Flags._ import SymDenotations._ import Decorators._ -import ast.Trees._ import MegaPhase._ import java.io.File.separatorChar diff --git a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala index 250da980cfd0..6f2aa7d970ac 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExpandSAMs.scala @@ -8,10 +8,7 @@ import Contexts._, Symbols._, Types._, Flags._, Decorators._, StdNames._, Consta import MegaPhase._ import SymUtils._ import NullOpsDecorator._ -import ast.Trees._ import ast.untpd -import reporting._ -import dotty.tools.dotc.util.Spans.Span /** Expand SAM closures that cannot be represented by the JVM as lambdas to anonymous classes. * These fall into five categories diff --git a/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala index 1ae915a1fc10..a7f8421f51d0 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala @@ -13,7 +13,6 @@ import core.Decorators._ import core.StdNames.nme import core.Names._ import core.NameOps._ -import ast.Trees._ import SymUtils._ import dotty.tools.dotc.ast.tpd diff --git a/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala b/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala index 27aee2d445d9..9c580235a2e4 100644 --- a/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala +++ b/compiler/src/dotty/tools/dotc/transform/ExtensionMethods.scala @@ -13,7 +13,7 @@ import core._ import Types._, Contexts._, Names._, Flags._, DenotTransformers._, Phases._ import SymDenotations._, Symbols._, StdNames._, Denotations._ import TypeErasure.{ valueErasure, ErasedValueType } -import NameKinds.{ExtMethName, UniqueExtMethName} +import NameKinds.ExtMethName import Decorators._ import TypeUtils._ diff --git a/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala index b01fc0a992df..a3459e890487 100644 --- a/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala +++ b/compiler/src/dotty/tools/dotc/transform/FirstTransform.scala @@ -4,7 +4,6 @@ package transform import core._ import Names._ import dotty.tools.dotc.transform.MegaPhase._ -import ast.Trees._ import ast.untpd import Flags._ import Types._ @@ -17,7 +16,6 @@ import DenotTransformers._ import NameOps._ import NameKinds.OuterSelectName import StdNames._ -import NullOpsDecorator._ import TypeUtils.isErasedValueType object FirstTransform { diff --git a/compiler/src/dotty/tools/dotc/transform/FullParameterization.scala b/compiler/src/dotty/tools/dotc/transform/FullParameterization.scala index 93f72199617e..3869818fb129 100644 --- a/compiler/src/dotty/tools/dotc/transform/FullParameterization.scala +++ b/compiler/src/dotty/tools/dotc/transform/FullParameterization.scala @@ -8,9 +8,7 @@ import Symbols._ import Decorators._ import TypeUtils._ import StdNames.nme -import NameOps._ import ast._ -import ast.Trees._ /** Provides methods to produce fully parameterized versions of instance methods, * where the `this` of the enclosing class is abstracted out in an extra leading diff --git a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala index c18009784ba9..fae5f79d51b2 100644 --- a/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala +++ b/compiler/src/dotty/tools/dotc/transform/GenericSignatures.scala @@ -7,18 +7,16 @@ import core.Contexts._ import core.Phases._ import core.Definitions import core.Flags._ -import core.Names.{DerivedName, Name, SimpleName, TypeName} +import core.Names.Name import core.Symbols._ import core.TypeApplications.TypeParamInfo import core.TypeErasure.{erasedGlb, erasure, isGenericArrayElement} import core.Types._ import core.classfile.ClassfileConstants -import ast.Trees._ import SymUtils._ import TypeUtils._ import java.lang.StringBuilder -import scala.annotation.tailrec import scala.collection.mutable.ListBuffer /** Helper object to generate generic java signatures, as defined in diff --git a/compiler/src/dotty/tools/dotc/transform/Getters.scala b/compiler/src/dotty/tools/dotc/transform/Getters.scala index 2a46185a0512..ad06bfb0a504 100644 --- a/compiler/src/dotty/tools/dotc/transform/Getters.scala +++ b/compiler/src/dotty/tools/dotc/transform/Getters.scala @@ -12,7 +12,6 @@ import Flags._ import ValueClasses._ import SymUtils._ import NameOps._ -import collection.mutable /** Performs the following rewritings for fields of a class: diff --git a/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala b/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala index 80f7402dfc53..6edb60a77245 100644 --- a/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala +++ b/compiler/src/dotty/tools/dotc/transform/InlinePatterns.scala @@ -5,11 +5,8 @@ package transform import core._ import MegaPhase._ import Symbols._, Contexts._, Types._, Decorators._ -import StdNames.nme import NameOps._ import Names._ -import ast.Trees._ -import ast.TreeTypeMap /** Rewrite an application * diff --git a/compiler/src/dotty/tools/dotc/transform/Inlining.scala b/compiler/src/dotty/tools/dotc/transform/Inlining.scala index 32805ed0d596..f9aefdd95bfc 100644 --- a/compiler/src/dotty/tools/dotc/transform/Inlining.scala +++ b/compiler/src/dotty/tools/dotc/transform/Inlining.scala @@ -2,38 +2,20 @@ package dotty.tools.dotc package transform import core._ -import Decorators._ import Flags._ -import Types._ import Contexts._ import Symbols._ -import Constants._ -import ast.Trees._ -import ast.{TreeTypeMap, untpd} -import util.Spans._ import SymUtils._ -import NameKinds._ import dotty.tools.dotc.ast.tpd -import typer.Implicits.SearchFailureType -import typer.PrepareInlineable -import scala.collection.mutable -import dotty.tools.dotc.core.Annotations._ -import dotty.tools.dotc.core.Names._ -import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.core.StagingContext._ -import dotty.tools.dotc.quoted._ -import dotty.tools.dotc.transform.TreeMapWithStages._ import dotty.tools.dotc.typer.Inliner -import dotty.tools.dotc.typer.ImportInfo.withRootImports import dotty.tools.dotc.ast.TreeMapWithImplicits -import scala.annotation.constructorOnly /** Inlines all calls to inline methods that are not in an inline method or a quote */ class Inlining extends MacroTransform { import tpd._ - import Inlining._ override def phaseName: String = Inlining.name diff --git a/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala b/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala index 12d845ca9a68..046147f20d82 100644 --- a/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala +++ b/compiler/src/dotty/tools/dotc/transform/Instrumentation.scala @@ -6,12 +6,9 @@ import core._ import Contexts._ import Symbols._ import Flags._ -import SymDenotations._ import Decorators._ -import ast.Trees._ import MegaPhase._ -import StdNames.nme import Names._ import Constants.Constant diff --git a/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala b/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala index a2ec4da70c1c..a97d8884625a 100644 --- a/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala +++ b/compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala @@ -1,7 +1,6 @@ package dotty.tools.dotc package transform -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Constants.Constant import dotty.tools.dotc.core.Contexts._ diff --git a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala index ce392c636a76..464e0d59afed 100644 --- a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala +++ b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala @@ -13,7 +13,6 @@ import core.StdNames.nme import core.Names._ import core.NameOps._ import core.NameKinds.ExpandPrefixName -import ast.Trees._ import SymUtils._ import ExplicitOuter.outer import util.Store diff --git a/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala b/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala index c7ad2381c5f7..e7ff6d10c222 100644 --- a/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala +++ b/compiler/src/dotty/tools/dotc/transform/LetOverApply.scala @@ -5,7 +5,6 @@ package transform import core._ import Contexts._, Symbols._, Decorators._ import MegaPhase._ -import ast.Trees._ /** Rewrite `{ stats; expr}.f(args)` to `{ stats; expr.f(args) }` and * `{ stats; expr }(args)` to `{ stats; expr(args) }` before proceeding, diff --git a/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala b/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala index 0baf85c4e21d..27ccd622bc65 100644 --- a/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala +++ b/compiler/src/dotty/tools/dotc/transform/MacroTransform.scala @@ -5,9 +5,6 @@ import core._ import Phases._ import ast.Trees._ import Contexts._ -import Symbols._ -import Flags.PackageVal -import Decorators._ /** A base class for transforms. * A transform contains a compiler phase which applies a tree transformer. diff --git a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala index 8de60186b26c..c3fc28bb0157 100644 --- a/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala +++ b/compiler/src/dotty/tools/dotc/transform/MegaPhase.scala @@ -3,7 +3,6 @@ package dotc package transform import core._ -import ast.Trees._ import Contexts._, Phases._, Symbols._, Decorators._ import Flags.PackageVal diff --git a/compiler/src/dotty/tools/dotc/transform/Memoize.scala b/compiler/src/dotty/tools/dotc/transform/Memoize.scala index 8e9bea8384c2..0bbe0dc775a0 100644 --- a/compiler/src/dotty/tools/dotc/transform/Memoize.scala +++ b/compiler/src/dotty/tools/dotc/transform/Memoize.scala @@ -10,9 +10,7 @@ import Denotations._ import Symbols._ import SymUtils._ import Constants._ -import ast.Trees._ import MegaPhase._ -import NameKinds.TraitSetterName import NameOps._ import Flags._ import Decorators._ diff --git a/compiler/src/dotty/tools/dotc/transform/Mixin.scala b/compiler/src/dotty/tools/dotc/transform/Mixin.scala index c3828327385c..b5881d88f5f1 100644 --- a/compiler/src/dotty/tools/dotc/transform/Mixin.scala +++ b/compiler/src/dotty/tools/dotc/transform/Mixin.scala @@ -10,7 +10,6 @@ import SymUtils._ import Symbols._ import SymDenotations._ import Types._ -import Periods._ import Decorators._ import DenotTransformers._ import StdNames._ @@ -18,7 +17,6 @@ import Names._ import NameKinds._ import NameOps._ import ast.Trees._ -import collection.mutable object Mixin { val name: String = "mixin" diff --git a/compiler/src/dotty/tools/dotc/transform/MixinOps.scala b/compiler/src/dotty/tools/dotc/transform/MixinOps.scala index 1b25061a4020..787a0d5be1df 100644 --- a/compiler/src/dotty/tools/dotc/transform/MixinOps.scala +++ b/compiler/src/dotty/tools/dotc/transform/MixinOps.scala @@ -6,7 +6,6 @@ import Symbols._, Types._, Contexts._, DenotTransformers._, Flags._ import util.Spans._ import SymUtils._ import StdNames._, NameOps._ -import Decorators._ class MixinOps(cls: ClassSymbol, thisPhase: DenotTransformer)(using Context) { import ast.tpd._ diff --git a/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala b/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala index bf25bfe71569..99702686edf8 100644 --- a/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala +++ b/compiler/src/dotty/tools/dotc/transform/MoveStatics.scala @@ -5,7 +5,6 @@ import core._ import Flags._ import Contexts._ import Symbols._ -import Decorators._ import DenotTransformers.SymTransformer import Types.MethodType import Annotations.Annotation @@ -14,7 +13,6 @@ import Names.Name import StdNames.nme import NameOps._ -import reporting._ import ast._ import SymUtils._ diff --git a/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala b/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala index 4ab9663f6529..67e3294d2135 100644 --- a/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala +++ b/compiler/src/dotty/tools/dotc/transform/NonLocalReturns.scala @@ -5,7 +5,6 @@ import core._ import Contexts._, Symbols._, Types._, Flags._, StdNames._ import MegaPhase._ import NameKinds.NonLocalReturnKeyName -import config.Feature.sourceVersion import config.SourceVersion._ object NonLocalReturns { diff --git a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala index 7a0516c38991..d733359a5dcd 100644 --- a/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala +++ b/compiler/src/dotty/tools/dotc/transform/OverridingPairs.scala @@ -6,7 +6,6 @@ import core._ import Flags._, Symbols._, Contexts._, Scopes._, Decorators._, Types.Type import NameKinds.DefaultGetterName import NullOpsDecorator._ -import collection.mutable import collection.immutable.BitSet import scala.annotation.tailrec diff --git a/compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala b/compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala index 47e5ae96f5da..012cec761aff 100644 --- a/compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala +++ b/compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala @@ -1,10 +1,8 @@ package dotty.tools.dotc package transform -import dotty.tools.dotc.ast.Trees._ -import dotty.tools.dotc.ast.{TreeTypeMap, tpd, untpd} +import dotty.tools.dotc.ast.{tpd, untpd} import dotty.tools.dotc.core.Annotations.BodyAnnotation -import dotty.tools.dotc.core.Constants._ import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Flags._ @@ -13,17 +11,13 @@ import dotty.tools.dotc.core.StagingContext._ import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Types._ -import dotty.tools.dotc.quoted._ import dotty.tools.dotc.util.SrcPos import dotty.tools.dotc.util.Spans._ import dotty.tools.dotc.transform.SymUtils._ -import dotty.tools.dotc.transform.TreeMapWithStages._ import dotty.tools.dotc.typer.Checking import dotty.tools.dotc.typer.Implicits.SearchFailureType -import dotty.tools.dotc.typer.Inliner import dotty.tools.dotc.core.Annotations._ -import scala.collection.mutable import dotty.tools.dotc.util.Property import scala.annotation.constructorOnly diff --git a/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala b/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala index 6eb29f26edea..5d147755f22b 100644 --- a/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala +++ b/compiler/src/dotty/tools/dotc/transform/ParamForwarding.scala @@ -3,12 +3,10 @@ package dotc package transform import core._ -import ast.Trees._ import Contexts._, Types._, Symbols._, Flags._, TypeUtils._, DenotTransformers._, StdNames._ import Decorators._ import MegaPhase._ import NameKinds.ParamAccessorName -import config.Printers.typr /** For all private parameter accessors * diff --git a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala index 21aa331367ca..79ea4d4c2121 100644 --- a/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -6,7 +6,6 @@ import core._ import MegaPhase._ import collection.mutable import Symbols._, Contexts._, Types._, StdNames._, NameOps._ -import ast.Trees._ import util.Spans._ import typer.Applications.* import SymUtils._ diff --git a/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala b/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala index 96506d3c2b05..78640ed6163a 100644 --- a/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala +++ b/compiler/src/dotty/tools/dotc/transform/PickleQuotes.scala @@ -9,16 +9,13 @@ import Contexts._ import Symbols._ import Constants._ import ast.Trees._ -import ast.{TreeTypeMap, untpd} -import util.Spans._ +import ast.TreeTypeMap import SymUtils._ import NameKinds._ import dotty.tools.dotc.ast.tpd -import typer.Implicits.SearchFailureType import scala.collection.mutable import dotty.tools.dotc.core.Annotations._ -import dotty.tools.dotc.core.Names._ import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.quoted._ import dotty.tools.dotc.transform.TreeMapWithStages._ diff --git a/compiler/src/dotty/tools/dotc/transform/PostInlining.scala b/compiler/src/dotty/tools/dotc/transform/PostInlining.scala index e50a8b77ff0e..47b670c5598b 100644 --- a/compiler/src/dotty/tools/dotc/transform/PostInlining.scala +++ b/compiler/src/dotty/tools/dotc/transform/PostInlining.scala @@ -4,7 +4,6 @@ package transform import core._ import Contexts.* import DenotTransformers.IdentityDenotTransformer -import Decorators.* import SyntheticMembers.* import ast.tpd.* diff --git a/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala b/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala index fca0b6b34928..0ab852398049 100644 --- a/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala +++ b/compiler/src/dotty/tools/dotc/transform/PruneErasedDefs.scala @@ -7,10 +7,8 @@ import DenotTransformers.SymTransformer import Flags._ import SymDenotations._ import Symbols._ -import Types._ import typer.RefChecks import MegaPhase.MiniPhase -import StdNames.nme import ast.tpd import SymUtils._ import config.Feature diff --git a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala index 3c03fa012464..da439b0f4f84 100644 --- a/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala +++ b/compiler/src/dotty/tools/dotc/transform/ResolveSuper.scala @@ -10,7 +10,6 @@ import Symbols._ import Decorators._ import DenotTransformers._ import Names._ -import StdNames._ import NameOps._ import NameKinds._ import NullOpsDecorator._ diff --git a/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala b/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala index 4937b3ec80b1..d01be0419a4d 100644 --- a/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala +++ b/compiler/src/dotty/tools/dotc/transform/RestoreScopes.scala @@ -7,8 +7,6 @@ import Contexts._ import Symbols._ import Scopes._ import MegaPhase.MiniPhase -import ast.Trees._ -import StdNames._ /** The preceding lambda lift and flatten phases move symbols to different scopes * and rename them. This miniphase cleans up afterwards and makes sure that all diff --git a/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala b/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala index 1db210634ab6..1df9809c2f62 100644 --- a/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala +++ b/compiler/src/dotty/tools/dotc/transform/SelectStatic.scala @@ -1,7 +1,6 @@ package dotty.tools.dotc package transform -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.DenotTransformers.IdentityDenotTransformer diff --git a/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala b/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala index a2bd55a1035d..d17dbbecc555 100644 --- a/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala +++ b/compiler/src/dotty/tools/dotc/transform/SetRootTree.scala @@ -1,6 +1,5 @@ package dotty.tools.dotc.transform -import dotty.tools.dotc.CompilationUnit import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Phases.Phase diff --git a/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala b/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala index 97e8e37ae444..84145742ed90 100644 --- a/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala +++ b/compiler/src/dotty/tools/dotc/transform/SpecializeFunctions.scala @@ -6,7 +6,6 @@ import Contexts._, Types._, Decorators._, Symbols._, DenotTransformers._ import SymDenotations._, Scopes._, StdNames._, NameOps._, Names._ import MegaPhase.MiniPhase -import scala.collection.mutable /** Specializes classes that inherit from `FunctionN` where there exists a * specialized form. diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala index dcd5b8d8c4b5..8c34d5f3186d 100644 --- a/compiler/src/dotty/tools/dotc/transform/Splicer.scala +++ b/compiler/src/dotty/tools/dotc/transform/Splicer.scala @@ -5,17 +5,16 @@ import java.io.{PrintWriter, StringWriter} import java.lang.reflect.{InvocationTargetException, Method => JLRMethod} import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Flags._ import dotty.tools.dotc.core.NameKinds.FlatName -import dotty.tools.dotc.core.Names.{Name, TermName} +import dotty.tools.dotc.core.Names.Name import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.core.Types._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Denotations.staticRef -import dotty.tools.dotc.core.{NameKinds, TypeErasure} +import dotty.tools.dotc.core.TypeErasure import dotty.tools.dotc.core.Constants.Constant import scala.util.control.NonFatal diff --git a/compiler/src/dotty/tools/dotc/transform/Staging.scala b/compiler/src/dotty/tools/dotc/transform/Staging.scala index dbfeaf4728b1..a327cff83950 100644 --- a/compiler/src/dotty/tools/dotc/transform/Staging.scala +++ b/compiler/src/dotty/tools/dotc/transform/Staging.scala @@ -1,28 +1,19 @@ package dotty.tools.dotc package transform -import dotty.tools.dotc.ast.Trees._ -import dotty.tools.dotc.ast.{TreeTypeMap, tpd, untpd} -import dotty.tools.dotc.core.Constants._ +import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Phases._ import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Flags._ -import dotty.tools.dotc.core.NameKinds._ import dotty.tools.dotc.core.StagingContext._ -import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Types._ -import dotty.tools.dotc.quoted._ -import dotty.tools.dotc.util.{SourceFile, SrcPos} +import dotty.tools.dotc.util.SrcPos import dotty.tools.dotc.transform.SymUtils._ import dotty.tools.dotc.transform.TreeMapWithStages._ -import dotty.tools.dotc.typer.Implicits.SearchFailureType -import dotty.tools.dotc.typer.Inliner -import scala.collection.mutable -import scala.annotation.constructorOnly /** Checks that the Phase Consistency Principle (PCP) holds and heals types. * @@ -30,7 +21,6 @@ import scala.annotation.constructorOnly */ class Staging extends MacroTransform { import tpd._ - import Staging._ override def phaseName: String = Staging.name diff --git a/compiler/src/dotty/tools/dotc/transform/SuperAccessors.scala b/compiler/src/dotty/tools/dotc/transform/SuperAccessors.scala index aea1c49972ca..8d099d30f880 100644 --- a/compiler/src/dotty/tools/dotc/transform/SuperAccessors.scala +++ b/compiler/src/dotty/tools/dotc/transform/SuperAccessors.scala @@ -8,8 +8,6 @@ import ValueClasses.isMethodWithExtension import core._ import Contexts._, Flags._, Symbols._, Names._, StdNames._, NameOps._, Trees._ import TypeUtils._, SymUtils._ -import Constants.Constant -import Annotations.Annotation import DenotTransformers.DenotTransformer import Symbols._ import util.Spans._ diff --git a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala index 93268b71a477..891c3076d093 100644 --- a/compiler/src/dotty/tools/dotc/transform/SymUtils.scala +++ b/compiler/src/dotty/tools/dotc/transform/SymUtils.scala @@ -11,7 +11,6 @@ import NameOps._ import StdNames._ import NameKinds._ import Flags._ -import Annotations._ import ValueClasses.isDerivedValueClass import Decorators._ import Constants.Constant @@ -19,7 +18,6 @@ import Annotations.Annotation import Phases._ import ast.tpd.Literal -import language.implicitConversions import scala.annotation.tailrec object SymUtils: diff --git a/compiler/src/dotty/tools/dotc/transform/TailRec.scala b/compiler/src/dotty/tools/dotc/transform/TailRec.scala index 66dcd4a9dfbd..bde4fbfbdaca 100644 --- a/compiler/src/dotty/tools/dotc/transform/TailRec.scala +++ b/compiler/src/dotty/tools/dotc/transform/TailRec.scala @@ -1,12 +1,10 @@ package dotty.tools.dotc package transform -import ast.Trees._ import ast.{TreeTypeMap, tpd} import config.Printers.tailrec import core.Contexts._ import core.Constants.Constant -import core.Decorators._ import core.Flags._ import core.NameKinds.{TailLabelName, TailLocalName, TailTempName} import core.StdNames.nme @@ -15,7 +13,6 @@ import reporting._ import transform.MegaPhase.MiniPhase import util.LinearSet -import scala.collection.mutable /** A Tail Rec Transformer. * diff --git a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala index 29fd1adb6688..841c0fc15cc4 100644 --- a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala +++ b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala @@ -14,7 +14,6 @@ import core.Decorators._ import core.Phases._ import core.Mode import typer._ -import typer.ErrorReporting._ import reporting._ import ast.Trees._ import ast.{tpd, untpd} diff --git a/compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala b/compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala index c4a3ead114b0..9f142027864f 100644 --- a/compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala +++ b/compiler/src/dotty/tools/dotc/transform/TreeMapWithStages.scala @@ -1,23 +1,13 @@ package dotty.tools.dotc package transform -import dotty.tools.dotc.ast.Trees._ -import dotty.tools.dotc.ast.{TreeMapWithImplicits, TreeTypeMap, tpd, untpd} +import dotty.tools.dotc.ast.{TreeMapWithImplicits, tpd} import dotty.tools.dotc.config.Printers.staging -import dotty.tools.dotc.core.Constants._ import dotty.tools.dotc.core.Decorators._ -import dotty.tools.dotc.core.Flags._ -import dotty.tools.dotc.core.NameKinds._ -import dotty.tools.dotc.core.Types._ import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.StagingContext._ -import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.core.Symbols._ -import dotty.tools.dotc.quoted._ -import dotty.tools.dotc.util.Spans._ import dotty.tools.dotc.util.Property -import dotty.tools.dotc.transform.SymUtils._ -import dotty.tools.dotc.typer.Implicits.SearchFailureType import scala.collection.mutable import scala.annotation.constructorOnly @@ -158,7 +148,6 @@ abstract class TreeMapWithStages(@constructorOnly ictx: Context) extends TreeMap object TreeMapWithStages { - import tpd._ /** A key to be used in a context property that caches the `levelOf` mapping */ private val LevelOfKey = new Property.Key[mutable.HashMap[Symbol, Int]] diff --git a/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala b/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala index 34971911bc7d..91f63a033c76 100644 --- a/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala +++ b/compiler/src/dotty/tools/dotc/transform/TryCatchPatterns.scala @@ -3,7 +3,6 @@ package transform import core.Symbols._ import core.StdNames._ -import ast.Trees._ import core.Types._ import core.NameKinds.ExceptionBinderName import dotty.tools.dotc.core.Flags diff --git a/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala b/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala index d7705111444f..6370bb51afb9 100644 --- a/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala +++ b/compiler/src/dotty/tools/dotc/transform/TupleOptimizations.scala @@ -2,11 +2,8 @@ package dotty.tools.dotc package transform import core._ -import Constants.Constant import Contexts._ import Decorators._ -import Flags._ -import ast.Trees._ import Definitions._ import DenotTransformers._ import StdNames._ @@ -15,7 +12,6 @@ import MegaPhase._ import Types._ import dotty.tools.dotc.ast.tpd -import scala.annotation.tailrec /** Optimize generic operations on tuples */ class TupleOptimizations extends MiniPhase with IdentityDenotTransformer { diff --git a/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala b/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala index 8ffe2198c4d9..c467e2dbd8f3 100644 --- a/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala +++ b/compiler/src/dotty/tools/dotc/transform/TypeTestsCasts.scala @@ -4,7 +4,6 @@ package transform import core._ import Contexts._, Symbols._, Types._, Constants._, StdNames._, Decorators._ -import ast.Trees._ import ast.untpd import Erasure.Boxing._ import TypeErasure._ diff --git a/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala b/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala index 29f9e68aa7fa..56fd4f754d60 100644 --- a/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala +++ b/compiler/src/dotty/tools/dotc/transform/UncacheGivenAliases.scala @@ -7,10 +7,6 @@ import core.Symbols._ import core.Contexts._ import core.Types._ import core.Flags._ -import core.StdNames.nme -import core.Constants.Constant -import core.Decorators._ -import core.TypeErasure.erasure import ast.tpd object UncacheGivenAliases: diff --git a/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala b/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala index d63e2d453b44..9f796cc1abe7 100644 --- a/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala +++ b/compiler/src/dotty/tools/dotc/transform/UninitializedDefs.scala @@ -3,12 +3,8 @@ package transform import core._ import Contexts._ -import DenotTransformers.SymTransformer import Flags._ -import SymDenotations._ import Symbols._ -import Types._ -import typer.RefChecks import MegaPhase.MiniPhase import StdNames.nme import ast.tpd diff --git a/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala b/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala index fb0731198a98..b3634e7cc07a 100644 --- a/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala +++ b/compiler/src/dotty/tools/dotc/transform/YCheckPositions.scala @@ -1,7 +1,6 @@ package dotty.tools.dotc package transform -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.{tpd, untpd} import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Decorators._ diff --git a/compiler/src/dotty/tools/dotc/transform/init/Checker.scala b/compiler/src/dotty/tools/dotc/transform/init/Checker.scala index 9d95951cb36c..e77abbb99549 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Checker.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Checker.scala @@ -16,7 +16,6 @@ import StdNames._ import dotty.tools.dotc.transform._ import Phases._ -import scala.collection.mutable import Semantic._ diff --git a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala index c1e7d6ab9f2a..33fd9a5f2f1d 100644 --- a/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala +++ b/compiler/src/dotty/tools/dotc/transform/init/Semantic.scala @@ -18,7 +18,6 @@ import Errors._ import scala.collection.mutable import scala.annotation.tailrec -import scala.annotation.constructorOnly object Semantic { diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala index 0ba7bd14a9b6..bc5219a33883 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/FormatChecker.scala @@ -6,7 +6,6 @@ import scala.collection.mutable.ListBuffer import scala.util.chaining.* import scala.util.matching.Regex.Match -import java.util.{Calendar, Date, Formattable} import PartialFunction.cond diff --git a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala index b8e6300f4e04..79c09fdf6606 100644 --- a/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala +++ b/compiler/src/dotty/tools/dotc/transform/localopt/StringInterpolatorOpt.scala @@ -1,13 +1,11 @@ package dotty.tools.dotc package transform.localopt -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Constants.Constant import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.StdNames._ -import dotty.tools.dotc.core.NameKinds._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Types._ import dotty.tools.dotc.transform.MegaPhase.MiniPhase diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala index 7fbd6ba22178..ce1a5d9a10c2 100644 --- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala +++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala @@ -7,7 +7,6 @@ import Types._ import Contexts._ import Flags._ import ast._ -import Trees._ import Decorators._ import Symbols._ import StdNames._ @@ -21,7 +20,6 @@ import transform.SymUtils._ import reporting._ import config.Printers.{exhaustivity => debug} import util.{SrcPos, NoSourcePosition} -import NullOpsDecorator._ import collection.mutable /** Space logic for checking exhaustivity and unreachability of pattern matching @@ -321,7 +319,6 @@ object SpaceEngine { /** Scala implementation of space logic */ class SpaceEngine(using Context) extends SpaceLogic { import tpd._ - import SpaceEngine._ private val scalaSeqFactoryClass = defn.SeqFactoryClass private val scalaListType = defn.ListClass.typeRef diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala b/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala index da4c57afb3e6..9c575c9a9c3c 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/AddLocalJSFakeNews.scala @@ -8,11 +8,7 @@ import core.Constants import core.Contexts._ import core.Decorators._ import core.StdNames.nme -import core.Phases._ import core.Symbols._ -import core.Types._ -import ast.Trees._ -import dotty.tools.dotc.ast.tpd import dotty.tools.backend.sjs.JSDefinitions.jsdefn diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala b/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala index c2685ee3c431..9353f6d82a8b 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/ExplicitJSClasses.scala @@ -3,7 +3,6 @@ package dotc package transform package sjs -import scala.collection.mutable import MegaPhase._ import core.Annotations._ @@ -12,7 +11,6 @@ import core.Denotations._ import core.DenotTransformers._ import core.Symbols._ import core.Contexts._ -import core.Phases._ import core.Types._ import core.Flags._ import core.Decorators._ @@ -20,10 +18,7 @@ import core.StdNames.nme import core.SymDenotations.SymDenotation import core.Names._ import core.NameKinds._ -import core.NameOps._ -import ast.Trees._ import SymUtils._ -import dotty.tools.dotc.ast.tpd import util.Store diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala b/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala index 57e5fc636ddc..90e5d2dffbed 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/JSExportUtils.scala @@ -3,26 +3,9 @@ package transform package sjs import core._ -import util.SrcPos -import Annotations._ -import Constants._ -import Contexts._ -import Decorators._ -import DenotTransformers._ -import Flags._ import NameKinds.DefaultGetterName -import NameOps._ import Names._ -import Phases._ -import Scopes._ -import StdNames._ -import Symbols._ -import SymDenotations._ -import SymUtils._ -import ast.Trees._ -import Types._ -import dotty.tools.backend.sjs.JSDefinitions.jsdefn /** Utilities for JS exports handling. */ object JSExportUtils { diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala b/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala index a78adaff6522..30eed76b18ec 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/JSSymUtils.scala @@ -3,21 +3,14 @@ package transform package sjs import core._ -import util.SrcPos -import Annotations._ import Constants._ import Contexts._ -import Decorators._ -import DenotTransformers._ import Flags._ -import NameKinds.DefaultGetterName import NameOps._ import Names._ import Phases._ -import Scopes._ import StdNames._ import Symbols._ -import SymDenotations._ import SymUtils._ import ast.Trees._ import Types._ diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala b/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala index c6f1feba5e98..817a6c5afabc 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/JUnitBootstrappers.scala @@ -7,11 +7,8 @@ import scala.annotation.tailrec import dotty.tools.dotc.core._ import Constants._ import Contexts._ -import Decorators._ import Flags._ import Names._ -import NameOps._ -import Phases._ import Scopes._ import Symbols._ import StdNames._ diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSExports.scala b/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSExports.scala index 9efe57a5c982..b0de197635e9 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSExports.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSExports.scala @@ -2,27 +2,18 @@ package dotty.tools.dotc package transform package sjs -import dotty.tools.dotc.ast.{Trees, tpd, untpd} +import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core._ -import Annotations._ import Contexts._ import Decorators._ import Denotations._ -import DenotTransformers._ import Flags._ -import Names._ import NameKinds.DefaultGetterName -import NameOps._ -import Phases._ -import Scopes._ import StdNames._ import Symbols._ -import SymDenotations._ import SymUtils._ -import Trees._ import Types._ -import reporting._ import util.Spans.Span import util.SrcPos diff --git a/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala b/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala index c9cf71554bc6..e97585735eb7 100644 --- a/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala +++ b/compiler/src/dotty/tools/dotc/transform/sjs/PrepJSInterop.scala @@ -4,9 +4,8 @@ package sjs import scala.collection.mutable -import ast.{Trees, tpd, untpd} +import ast.tpd import core._ -import reporting._ import typer.Checking import util.SrcPos import Annotations._ @@ -16,22 +15,15 @@ import Decorators._ import DenotTransformers._ import Flags._ import NameKinds.DefaultGetterName -import NameOps._ -import Names._ -import Phases._ -import Scopes._ import StdNames._ import Symbols._ -import SymDenotations._ import SymUtils._ -import Trees._ import Types._ import JSSymUtils._ -import org.scalajs.ir.Trees.{JSGlobalRef, JSNativeLoadSpec} +import org.scalajs.ir.Trees.JSGlobalRef -import dotty.tools.dotc.config.SJSPlatform.sjsPlatform import dotty.tools.backend.sjs.JSDefinitions.jsdefn /** A macro transform that runs after typer and before pickler to perform @@ -508,7 +500,6 @@ class PrepJSInterop extends MacroTransform with IdentityDenotTransformer { thisP } private def checkJSNativeLoadSpecOf(pos: SrcPos, sym: Symbol)(using Context): Unit = { - import JSNativeLoadSpec._ def checkGlobalRefName(globalRef: String): Unit = { if (!JSGlobalRef.isValidJSGlobalRefName(globalRef)) @@ -998,7 +989,6 @@ object PrepJSInterop { val description: String = "additional checks and transformations for Scala.js" private final class OwnerKind private (private val baseKinds: Int) extends AnyVal { - import OwnerKind._ inline def isBaseKind: Boolean = Integer.lowestOneBit(baseKinds) == baseKinds && baseKinds != 0 // exactly 1 bit on diff --git a/compiler/src/dotty/tools/dotc/typer/Applications.scala b/compiler/src/dotty/tools/dotc/typer/Applications.scala index 1e324de33675..0681c8ee2481 100644 --- a/compiler/src/dotty/tools/dotc/typer/Applications.scala +++ b/compiler/src/dotty/tools/dotc/typer/Applications.scala @@ -4,12 +4,10 @@ package typer import core._ import ast.{Trees, tpd, untpd, desugar} -import util.Spans._ import util.Stats.record -import util.{SrcPos, NoSourcePosition, SourceFile} +import util.{SrcPos, NoSourcePosition} import Trees.Untyped import Contexts._ -import Phases._ import Flags._ import Symbols._ import Denotations.Denotation @@ -19,7 +17,6 @@ import ErrorReporting._ import Trees._ import Names._ import StdNames._ -import NameOps._ import ContextOps._ import NameKinds.DefaultGetterName import ProtoTypes._ @@ -28,15 +25,15 @@ import reporting._ import transform.TypeUtils._ import transform.SymUtils._ import Nullables._ -import config.{Feature, Config} +import config.Feature import collection.mutable import config.Printers.{overload, typr, unapp} import TypeApplications._ -import Constants.{Constant, IntTag, LongTag} +import Constants.{Constant, IntTag} import Denotations.SingleDenotation -import annotation.{constructorOnly, threadUnsafe} +import annotation.threadUnsafe import scala.util.control.NonFatal diff --git a/compiler/src/dotty/tools/dotc/typer/Checking.scala b/compiler/src/dotty/tools/dotc/typer/Checking.scala index be38221ef167..5c1e1757de52 100644 --- a/compiler/src/dotty/tools/dotc/typer/Checking.scala +++ b/compiler/src/dotty/tools/dotc/typer/Checking.scala @@ -11,11 +11,9 @@ import Names._ import StdNames._ import Symbols._ import Trees._ -import TreeInfo._ import ProtoTypes._ import Scopes._ import CheckRealizable._ -import NullOpsDecorator._ import ErrorReporting.errorTree import rewrites.Rewrites.patch import util.Spans.Span @@ -43,7 +41,6 @@ import transform.TypeUtils.* import collection.mutable import reporting._ -import util.Chars.isOperatorPart object Checking { import tpd._ diff --git a/compiler/src/dotty/tools/dotc/typer/ConstFold.scala b/compiler/src/dotty/tools/dotc/typer/ConstFold.scala index 3e09642d291d..1710d7ceff3c 100644 --- a/compiler/src/dotty/tools/dotc/typer/ConstFold.scala +++ b/compiler/src/dotty/tools/dotc/typer/ConstFold.scala @@ -4,7 +4,6 @@ package typer import java.lang.ArithmeticException import ast._ -import Trees._ import core._ import Symbols._ import Types._ diff --git a/compiler/src/dotty/tools/dotc/typer/Deriving.scala b/compiler/src/dotty/tools/dotc/typer/Deriving.scala index 39a775d61f8c..77137b46f707 100644 --- a/compiler/src/dotty/tools/dotc/typer/Deriving.scala +++ b/compiler/src/dotty/tools/dotc/typer/Deriving.scala @@ -11,11 +11,6 @@ import ProtoTypes._, ContextOps._ import util.Spans._ import util.SrcPos import collection.mutable -import Constants.Constant -import config.Printers.derive -import Inferencing._ -import transform.TypeUtils._ -import transform.SymUtils._ import ErrorReporting.errorTree /** A typer mixin that implements type class derivation functionality */ diff --git a/compiler/src/dotty/tools/dotc/typer/Dynamic.scala b/compiler/src/dotty/tools/dotc/typer/Dynamic.scala index 72a0cfe9dcbe..23e575c0c2bf 100644 --- a/compiler/src/dotty/tools/dotc/typer/Dynamic.scala +++ b/compiler/src/dotty/tools/dotc/typer/Dynamic.scala @@ -14,7 +14,6 @@ import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.TypeErasure import util.Spans._ import core.Symbols._ -import core.Definitions import ErrorReporting._ import reporting._ diff --git a/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala b/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala index 733977734329..b7a9a901f34c 100644 --- a/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala +++ b/compiler/src/dotty/tools/dotc/typer/ErrorReporting.scala @@ -8,7 +8,6 @@ import Types._, ProtoTypes._, Contexts._, Decorators._, Denotations._, Symbols._ import Implicits._, Flags._, Constants.Constant import Trees._ import NameOps._ -import util.Spans._ import util.SrcPos import config.Feature import java.util.regex.Matcher.quoteReplacement diff --git a/compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala b/compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala index c04b5f1d2d85..c0c6ede200ed 100644 --- a/compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala +++ b/compiler/src/dotty/tools/dotc/typer/EtaExpansion.scala @@ -9,12 +9,10 @@ import Types._ import Flags._ import Symbols._ import Names._ -import StdNames._ import NameKinds.UniqueName import util.Spans._ import collection.mutable import Trees._ -import Decorators._ /** A class that handles argument lifting. Argument lifting is needed in the following * scenarios: diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala index 90e0eae4afe8..d61728e53819 100644 --- a/compiler/src/dotty/tools/dotc/typer/Implicits.scala +++ b/compiler/src/dotty/tools/dotc/typer/Implicits.scala @@ -4,7 +4,7 @@ package typer import backend.sjs.JSDefinitions import core._ -import ast.{Trees, TreeTypeMap, untpd, tpd, DesugarEnums} +import ast.{TreeTypeMap, untpd, tpd} import util.Spans._ import util.Stats.{record, monitored} import printing.{Showable, Printer} @@ -13,24 +13,19 @@ import Contexts._ import Types._ import Flags._ import Mode.ImplicitsEnabled -import NameOps._ import NameKinds.{LazyImplicitName, EvidenceParamName} import Symbols._ -import Denotations._ import Types._ import Decorators._ import Names._ import StdNames._ -import Constants._ import ProtoTypes._ import ErrorReporting._ import Inferencing.{fullyDefinedType, isFullyDefined} import Scopes.newScope -import Trees._ -import transform.SymUtils._ import transform.TypeUtils._ import Hashable._ -import util.{SourceFile, NoSource, EqHashMap, Stats} +import util.{EqHashMap, Stats} import config.{Config, Feature} import Feature.migrateTo3 import config.Printers.{implicits, implicitsDetailed} diff --git a/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala b/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala index e8a923427b38..264ff78c8c8f 100644 --- a/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala +++ b/compiler/src/dotty/tools/dotc/typer/ImportInfo.scala @@ -3,17 +3,14 @@ package dotc package typer import ast.{tpd, untpd} -import ast.Trees._ import core._ import printing.{Printer, Showable} import util.SimpleIdentityMap import Symbols._, Names._, Types._, Contexts._, StdNames._, Flags._ import Implicits.RenamedImplicitRef -import config.SourceVersion import StdNames.nme import printing.Texts.Text import NameKinds.QualifiedName -import Decorators._ object ImportInfo { diff --git a/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala b/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala index bc82c9501c76..a1a33482877c 100644 --- a/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala +++ b/compiler/src/dotty/tools/dotc/typer/ImportSuggestions.scala @@ -7,10 +7,8 @@ import core._ import Contexts._, Types._, Symbols._, Names._, Decorators._, ProtoTypes._ import Flags._, SymDenotations._ import NameKinds.FlatName -import NameOps._ import StdNames._ import config.Printers.{implicits, implicitsDetailed} -import util.Spans.Span import ast.{untpd, tpd} import Implicits.{hasExtMethod, Candidate} import java.util.{Timer, TimerTask} diff --git a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala index 17df9c93f9a9..733b95995f05 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inferencing.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inferencing.scala @@ -5,19 +5,16 @@ package typer import core._ import ast._ import Contexts._, Types._, Flags._, Symbols._ -import Trees._ import ProtoTypes._ import NameKinds.{AvoidNameKind, UniqueName} import util.Spans._ import util.{Stats, SimpleIdentityMap} import Decorators._ -import config.Printers.{gadts, typr, debug} +import config.Printers.{gadts, typr} import annotation.tailrec -import reporting._ import collection.mutable import scala.annotation.internal.sharable -import scala.annotation.threadUnsafe import config.Printers.gadts diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala index eae58373fb07..f73f37c48e03 100644 --- a/compiler/src/dotty/tools/dotc/typer/Inliner.scala +++ b/compiler/src/dotty/tools/dotc/typer/Inliner.scala @@ -3,7 +3,6 @@ package dotc package typer import ast.{TreeInfo, tpd, _} -import Trees._ import core._ import Flags._ import Symbols._ @@ -17,14 +16,13 @@ import Contexts._ import Names.{Name, TermName} import NameKinds.{InlineAccessorName, InlineBinderName, InlineScrutineeName, BodyRetainerName} import ProtoTypes.shallowSelectionProto -import Annotations.Annotation import SymDenotations.SymDenotation import Inferencing.isFullyDefined import Scopes.newScope import config.Printers.inlining import config.Feature import ErrorReporting.errorTree -import dotty.tools.dotc.util.{SimpleIdentityMap, SimpleIdentitySet, EqHashMap, SourceFile, SourcePosition, SrcPos} +import dotty.tools.dotc.util.{SimpleIdentityMap, SimpleIdentitySet, SourceFile, SourcePosition, SrcPos} import dotty.tools.dotc.parsing.Parsers.Parser import Nullables._ import transform.{PostTyper, Inlining} @@ -32,7 +30,7 @@ import transform.{PostTyper, Inlining} import collection.mutable import reporting.trace import util.Spans.Span -import dotty.tools.dotc.transform.{Splicer, TreeMapWithStages} +import dotty.tools.dotc.transform.Splicer import quoted.QuoteUtils import scala.annotation.constructorOnly diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala index 4bca5c50cf77..ef3d844fb570 100644 --- a/compiler/src/dotty/tools/dotc/typer/Namer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Namer.scala @@ -8,7 +8,6 @@ import Trees._, StdNames._, Scopes._, Denotations._, NamerOps._, ContextOps._ import Contexts._, Symbols._, Types._, SymDenotations._, Names._, NameOps._, Flags._ import Decorators._, Comments.{_, given} import NameKinds.DefaultGetterName -import TypeApplications.TypeParamInfo import ast.desugar, ast.desugar._ import ProtoTypes._ import util.Spans._ @@ -29,7 +28,6 @@ import reporting._ import config.Feature.sourceVersion import config.SourceVersion._ -import scala.annotation.constructorOnly /** This class creates symbols from definitions and imports and gives them * lazy types. diff --git a/compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala b/compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala index 8fea810921e4..48fc1c70ded0 100644 --- a/compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala +++ b/compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala @@ -10,17 +10,15 @@ import Symbols._ import Flags._ import Types._ import Decorators._ -import NameKinds._ import StdNames.nme import Contexts._ import Names.{Name, TermName} import NameKinds.{InlineAccessorName, UniqueInlineName} import NameOps._ import Annotations._ -import transform.{AccessProxies, PCPCheckAndHeal, Splicer, TreeMapWithStages} +import transform.{AccessProxies, PCPCheckAndHeal, Splicer} import config.Printers.inlining import util.Property -import dotty.tools.dotc.core.StagingContext._ import dotty.tools.dotc.transform.TreeMapWithStages._ object PrepareInlineable { diff --git a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala index fcbcf179d97e..9bfc66a70be6 100644 --- a/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala +++ b/compiler/src/dotty/tools/dotc/typer/ProtoTypes.scala @@ -13,7 +13,6 @@ import Decorators._ import Uniques._ import config.Printers.typr import util.SourceFile -import util.Property import TypeComparer.necessarySubType import scala.annotation.internal.sharable diff --git a/compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala b/compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala index 86cd7e5f24f3..f8422ed20e21 100644 --- a/compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala +++ b/compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala @@ -2,34 +2,27 @@ package dotty.tools.dotc package typer import dotty.tools.dotc.ast._ -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.config.Feature._ import dotty.tools.dotc.config.SourceVersion._ import dotty.tools.dotc.core._ import dotty.tools.dotc.core.Annotations._ -import dotty.tools.dotc.core.Constants._ import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Flags._ -import dotty.tools.dotc.core.NameKinds.{UniqueName, PatMatGivenVarName} +import dotty.tools.dotc.core.NameKinds.PatMatGivenVarName import dotty.tools.dotc.core.Names._ import dotty.tools.dotc.core.StagingContext._ import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Types._ -import dotty.tools.dotc.reporting._ import dotty.tools.dotc.transform.SymUtils._ import dotty.tools.dotc.typer.Implicits._ import dotty.tools.dotc.typer.Inferencing._ -import dotty.tools.dotc.typer.ProtoTypes._ import dotty.tools.dotc.util.Spans._ import dotty.tools.dotc.util.Stats.record import scala.collection.mutable -import scala.annotation.tailrec -import scala.annotation.internal.sharable -import scala.annotation.threadUnsafe /** Type quotes `'{ ... }` and splices `${ ... }` */ trait QuotesAndSplices { diff --git a/compiler/src/dotty/tools/dotc/typer/ReTyper.scala b/compiler/src/dotty/tools/dotc/typer/ReTyper.scala index 85be8c32227a..0a2172ddf7bf 100644 --- a/compiler/src/dotty/tools/dotc/typer/ReTyper.scala +++ b/compiler/src/dotty/tools/dotc/typer/ReTyper.scala @@ -8,8 +8,7 @@ import Symbols._ import StdNames._ import Decorators._ import typer.ProtoTypes._ -import ast.{tpd, untpd, Trees} -import Trees._ +import ast.{tpd, untpd} import scala.util.control.NonFatal import util.Spans.Span import Nullables._ diff --git a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala index 520c5d03e32e..e9d94fc47ff4 100644 --- a/compiler/src/dotty/tools/dotc/typer/RefChecks.scala +++ b/compiler/src/dotty/tools/dotc/typer/RefChecks.scala @@ -7,10 +7,8 @@ import core._ import Symbols._, Types._, Contexts._, Flags._, Names._, NameOps._, NameKinds._ import StdNames._, Denotations._, SymUtils._, Phases._, SymDenotations._ import NameKinds.DefaultGetterName -import Annotations._ import util.Spans._ -import util.SrcPos -import scala.collection.{ mutable, immutable } +import scala.collection.mutable import ast._ import MegaPhase._ import config.Printers.{checks, noPrinter} @@ -20,9 +18,7 @@ import typer.ErrorReporting._ import config.Feature.{warnOnMigration, migrateTo3} import config.Printers.refcheck import reporting._ -import scala.util.matching.Regex._ import Constants.Constant -import NullOpsDecorator._ object RefChecks { import tpd._ diff --git a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala index fe4feecd6100..b39fc4a01698 100644 --- a/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Synthesizer.scala @@ -9,7 +9,7 @@ import Types._, Flags._, Symbols._, Types._, Names._, StdNames._, Constants._ import TypeErasure.{erasure, hasStableErasure} import Decorators._ import ProtoTypes._ -import Inferencing.{fullyDefinedType, isFullyDefined} +import Inferencing.fullyDefinedType import ast.untpd import transform.SymUtils._ import transform.TypeUtils._ diff --git a/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala b/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala index 3dcec413540f..2b5e7dd6f17c 100644 --- a/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala +++ b/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala @@ -6,15 +6,11 @@ import core._ import ast._ import Contexts._, ContextOps._, Constants._, Types._, Symbols._, Names._, Flags._, Decorators._ import ErrorReporting._, Annotations._, Denotations._, SymDenotations._, StdNames._ -import util.Spans._ import util.SrcPos -import config.Printers.typr -import ast.Trees._ import NameOps._ -import ProtoTypes._ import collection.mutable import reporting._ -import Checking.{checkNoPrivateLeaks, checkNoWildcard} +import Checking.checkNoPrivateLeaks trait TypeAssigner { import tpd._ diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala index 09acde2ac845..e4e5dbcc85df 100644 --- a/compiler/src/dotty/tools/dotc/typer/Typer.scala +++ b/compiler/src/dotty/tools/dotc/typer/Typer.scala @@ -38,18 +38,16 @@ import collection.mutable import annotation.tailrec import Implicits._ import util.Stats.record -import config.Printers.{gadts, typr, debug} +import config.Printers.{gadts, typr} import config.Feature import config.Feature.{sourceVersion, migrateTo3} import config.SourceVersion._ import rewrites.Rewrites.patch -import NavigateAST._ import transform.SymUtils._ import transform.TypeUtils._ import reporting._ import Nullables._ import NullOpsDecorator._ -import config.Config import scala.annotation.constructorOnly diff --git a/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala b/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala index 070bf9fff12f..cf2a1c1d1379 100644 --- a/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala +++ b/compiler/src/dotty/tools/dotc/typer/TyperPhase.scala @@ -6,17 +6,10 @@ import core._ import Phases._ import Contexts._ import Symbols._ -import Decorators._ import ImportInfo.withRootImports -import parsing.JavaParsers.JavaParser -import parsing.Parsers.Parser import parsing.{Parser => ParserPhase} -import config.Config -import config.Printers.{typr, default} +import config.Printers.typr import util.Stats._ -import util.{ SourcePosition, NoSourcePosition } -import scala.util.control.NonFatal -import ast.Trees._ /** * @@ -31,7 +24,6 @@ class TyperPhase(addRootImports: Boolean = true) extends Phase { override def isTyper: Boolean = true - import ast.tpd override def allowsImplicitSearch: Boolean = true diff --git a/compiler/src/dotty/tools/dotc/typer/VarianceChecker.scala b/compiler/src/dotty/tools/dotc/typer/VarianceChecker.scala index 8c796cfb6fa9..88212c3bb96c 100644 --- a/compiler/src/dotty/tools/dotc/typer/VarianceChecker.scala +++ b/compiler/src/dotty/tools/dotc/typer/VarianceChecker.scala @@ -7,7 +7,6 @@ import Types._, Contexts._, Flags._, Symbols._, Trees._ import Decorators._ import Variances._ import NameKinds._ -import util.Spans._ import util.SrcPos import config.Printers.variances import config.Feature.migrateTo3 diff --git a/compiler/src/dotty/tools/dotc/util/EqHashMap.scala b/compiler/src/dotty/tools/dotc/util/EqHashMap.scala index df7b16d48927..39027e2d716d 100644 --- a/compiler/src/dotty/tools/dotc/util/EqHashMap.scala +++ b/compiler/src/dotty/tools/dotc/util/EqHashMap.scala @@ -6,7 +6,6 @@ package dotty.tools.dotc.util class EqHashMap[Key, Value] (initialCapacity: Int = 8, capacityMultiple: Int = 2) extends GenericHashMap[Key, Value](initialCapacity, capacityMultiple): - import GenericHashMap.DenseLimit /** Hashcode is identityHashCode left-shifted by 1, so lowest bit is not lost * when taking the index. diff --git a/compiler/src/dotty/tools/dotc/util/HashMap.scala b/compiler/src/dotty/tools/dotc/util/HashMap.scala index dd13d9c9a0e5..75d84301122f 100644 --- a/compiler/src/dotty/tools/dotc/util/HashMap.scala +++ b/compiler/src/dotty/tools/dotc/util/HashMap.scala @@ -6,7 +6,6 @@ package dotty.tools.dotc.util class HashMap[Key, Value] (initialCapacity: Int = 8, capacityMultiple: Int = 2) extends GenericHashMap[Key, Value](initialCapacity, capacityMultiple): - import GenericHashMap.DenseLimit /** Hashcode is left-shifted by 1, so lowest bit is not lost * when taking the index. diff --git a/compiler/src/dotty/tools/dotc/util/NameTransformer.scala b/compiler/src/dotty/tools/dotc/util/NameTransformer.scala index 5ea0d4bfe290..8b68836c068b 100644 --- a/compiler/src/dotty/tools/dotc/util/NameTransformer.scala +++ b/compiler/src/dotty/tools/dotc/util/NameTransformer.scala @@ -3,8 +3,6 @@ package dotc package util import core.Names._ -import collection.mutable -import util.Chars import scala.annotation.internal.sharable diff --git a/compiler/src/dotty/tools/dotc/util/ParsedComment.scala b/compiler/src/dotty/tools/dotc/util/ParsedComment.scala index e02aae1e8dbb..b7afe1aec2a4 100644 --- a/compiler/src/dotty/tools/dotc/util/ParsedComment.scala +++ b/compiler/src/dotty/tools/dotc/util/ParsedComment.scala @@ -6,9 +6,8 @@ import dotty.tools.dotc.core.Names.TermName import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.printing.SyntaxHighlighting -import scala.Console.{BOLD, RESET, UNDERLINED} +import scala.Console.{BOLD, RESET} import scala.collection.immutable.ListMap -import scala.util.matching.Regex /** * A parsed doc comment. diff --git a/compiler/src/dotty/tools/dotc/util/Signatures.scala b/compiler/src/dotty/tools/dotc/util/Signatures.scala index 414d4ce7bd8e..1d8c5d9b0c84 100644 --- a/compiler/src/dotty/tools/dotc/util/Signatures.scala +++ b/compiler/src/dotty/tools/dotc/util/Signatures.scala @@ -6,13 +6,10 @@ import ast.tpd import core.Constants.Constant import core.Contexts._ import core.Denotations.SingleDenotation -import core.Flags.Implicit -import core.Names.TermName import util.Spans.Span import core.Types.{ErrorType, MethodType, PolyType} import reporting._ -import scala.collection.JavaConverters._ object Signatures { diff --git a/compiler/src/dotty/tools/dotc/util/WeakHashSet.scala b/compiler/src/dotty/tools/dotc/util/WeakHashSet.scala index 3dc5761c0244..37931463ec32 100644 --- a/compiler/src/dotty/tools/dotc/util/WeakHashSet.scala +++ b/compiler/src/dotty/tools/dotc/util/WeakHashSet.scala @@ -5,7 +5,6 @@ package dotty.tools.dotc.util import java.lang.ref.{ReferenceQueue, WeakReference} import scala.annotation.{ constructorOnly, tailrec } -import scala.collection.mutable /** * A HashSet where the elements are stored weakly. Elements in this set are eligible for GC if no other diff --git a/compiler/src/dotty/tools/io/Jar.scala b/compiler/src/dotty/tools/io/Jar.scala index 6baaec175b14..99997ef2de67 100644 --- a/compiler/src/dotty/tools/io/Jar.scala +++ b/compiler/src/dotty/tools/io/Jar.scala @@ -12,7 +12,6 @@ import java.util.jar._ import scala.jdk.CollectionConverters._ import scala.collection.mutable import Attributes.Name -import scala.language.postfixOps import scala.annotation.tailrec // Attributes.Name instances: diff --git a/compiler/src/dotty/tools/repl/CollectTopLevelImports.scala b/compiler/src/dotty/tools/repl/CollectTopLevelImports.scala index f46b5feed76a..f78729d81533 100644 --- a/compiler/src/dotty/tools/repl/CollectTopLevelImports.scala +++ b/compiler/src/dotty/tools/repl/CollectTopLevelImports.scala @@ -1,6 +1,5 @@ package dotty.tools.repl -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Phases.Phase diff --git a/compiler/src/dotty/tools/repl/Rendering.scala b/compiler/src/dotty/tools/repl/Rendering.scala index bb5496f0cc8b..53198678dd80 100644 --- a/compiler/src/dotty/tools/repl/Rendering.scala +++ b/compiler/src/dotty/tools/repl/Rendering.scala @@ -1,21 +1,17 @@ package dotty.tools package repl -import java.io.{ StringWriter, PrintWriter } import java.lang.{ ClassLoader, ExceptionInInitializerError } import java.lang.reflect.InvocationTargetException -import dotc.ast.tpd import dotc.core.Contexts._ import dotc.core.Denotations.Denotation import dotc.core.Flags import dotc.core.Flags._ import dotc.core.Symbols.{Symbol, defn} import dotc.core.StdNames.{nme, str} -import dotc.core.NameOps._ import dotc.printing.ReplPrinter -import dotc.reporting.{MessageRendering, Message, Diagnostic} -import dotc.util.SourcePosition +import dotc.reporting.Diagnostic /** This rendering object uses `ClassLoader`s to accomplish crossing the 4th * wall (i.e. fetching back values from the compiled class files put into a diff --git a/compiler/src/dotty/tools/repl/ReplCompiler.scala b/compiler/src/dotty/tools/repl/ReplCompiler.scala index 9249172b5d4d..ed097ac1277a 100644 --- a/compiler/src/dotty/tools/repl/ReplCompiler.scala +++ b/compiler/src/dotty/tools/repl/ReplCompiler.scala @@ -3,7 +3,6 @@ package dotty.tools.repl import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.ast.{tpd, untpd} import dotty.tools.dotc.ast.tpd.TreeOps -import dotty.tools.dotc.core.Comments.CommentsContext import dotty.tools.dotc.core.Contexts._ import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Flags._ @@ -12,8 +11,8 @@ import dotty.tools.dotc.core.Phases.Phase import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.reporting.Diagnostic -import dotty.tools.dotc.transform.{PostTyper, Staging} -import dotty.tools.dotc.typer.ImportInfo._ +import dotty.tools.dotc.transform.PostTyper +import dotty.tools.dotc.typer.ImportInfo.{withRootImports, RootRef} import dotty.tools.dotc.typer.TyperPhase import dotty.tools.dotc.util.Spans._ import dotty.tools.dotc.util.{ParsedComment, SourceFile} diff --git a/compiler/src/dotty/tools/repl/ReplDriver.scala b/compiler/src/dotty/tools/repl/ReplDriver.scala index f69a7ca142fb..72983ff18260 100644 --- a/compiler/src/dotty/tools/repl/ReplDriver.scala +++ b/compiler/src/dotty/tools/repl/ReplDriver.scala @@ -22,8 +22,8 @@ import dotty.tools.dotc.core.Symbols.{Symbol, defn} import dotty.tools.dotc.interfaces import dotty.tools.dotc.interactive.Completion import dotty.tools.dotc.printing.SyntaxHighlighting -import dotty.tools.dotc.reporting.{ConsoleReporter, MessageRendering, StoreReporter} -import dotty.tools.dotc.reporting.{Message, Diagnostic} +import dotty.tools.dotc.reporting.{ConsoleReporter, StoreReporter} +import dotty.tools.dotc.reporting.Diagnostic import dotty.tools.dotc.util.Spans.Span import dotty.tools.dotc.util.{SourceFile, SourcePosition} import dotty.tools.dotc.{CompilationUnit, Driver} diff --git a/compiler/src/dotty/tools/repl/ScriptEngine.scala b/compiler/src/dotty/tools/repl/ScriptEngine.scala index 501dbd0263d7..27369a94b516 100644 --- a/compiler/src/dotty/tools/repl/ScriptEngine.scala +++ b/compiler/src/dotty/tools/repl/ScriptEngine.scala @@ -3,7 +3,7 @@ package repl import java.io.{Reader, StringWriter} import javax.script.{AbstractScriptEngine, Bindings, ScriptContext, ScriptEngine => JScriptEngine, ScriptEngineFactory, ScriptException, SimpleBindings} -import dotc.core.StdNames.{nme, str} +import dotc.core.StdNames.str /** A JSR 223 (Scripting API) compatible wrapper around the REPL for improved * interoperability with software that supports it. diff --git a/compiler/src/dotty/tools/runner/ScalaClassLoader.scala b/compiler/src/dotty/tools/runner/ScalaClassLoader.scala index af9e54f3506d..c7d58de05dfd 100644 --- a/compiler/src/dotty/tools/runner/ScalaClassLoader.scala +++ b/compiler/src/dotty/tools/runner/ScalaClassLoader.scala @@ -1,7 +1,6 @@ package dotty.tools package runner -import scala.language.implicitConversions import java.lang.ClassLoader import java.lang.invoke.{MethodHandles, MethodType} diff --git a/compiler/src/dotty/tools/scripting/ScriptingDriver.scala b/compiler/src/dotty/tools/scripting/ScriptingDriver.scala index bce54183807b..9abe5f81c4cd 100755 --- a/compiler/src/dotty/tools/scripting/ScriptingDriver.scala +++ b/compiler/src/dotty/tools/scripting/ScriptingDriver.scala @@ -2,7 +2,6 @@ package dotty.tools.scripting import java.nio.file.{ Files, Paths, Path } import java.io.File -import java.net.{ URLClassLoader } import dotty.tools.dotc.Driver import dotty.tools.dotc.core.Contexts, Contexts.{ Context, ctx } diff --git a/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala b/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala index 6d9ff6ca68a8..76bf3ec48728 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala @@ -1,10 +1,7 @@ package scala.quoted package runtime.impl -import scala.annotation.internal.sharable -import scala.annotation.{Annotation, compileTimeOnly} -import dotty.tools.dotc import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts.* import dotty.tools.dotc.core.Flags.* diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala index 000f84199c27..e97aa061c3f5 100644 --- a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala +++ b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala @@ -11,10 +11,9 @@ import dotty.tools.dotc.core.Flags._ import dotty.tools.dotc.core.NameKinds import dotty.tools.dotc.core.StdNames._ import dotty.tools.dotc.quoted.reflect._ -import dotty.tools.dotc.quoted.QuoteUtils._ import dotty.tools.dotc.core.Decorators._ -import dotty.tools.dotc.quoted.{MacroExpansion, PickledQuotes, QuoteUtils} +import dotty.tools.dotc.quoted.{MacroExpansion, PickledQuotes} import scala.quoted.runtime.{QuoteUnpickler, QuoteMatching} import scala.quoted.runtime.impl.printers._ diff --git a/compiler/test/dotty/tools/CheckTypesTests.scala b/compiler/test/dotty/tools/CheckTypesTests.scala index 7a59bc3e5f20..df4bc1636d82 100644 --- a/compiler/test/dotty/tools/CheckTypesTests.scala +++ b/compiler/test/dotty/tools/CheckTypesTests.scala @@ -3,9 +3,7 @@ package dotty.tools import org.junit.Test import org.junit.Assert.{ assertFalse, assertTrue, fail } -import dotc.ast.Trees._ -import dotc.core.Decorators._ -import dotc.core.Contexts.{Context, ctx} +import dotc.core.Contexts.Context class CheckTypeTest extends DottyTest { @Test diff --git a/compiler/test/dotty/tools/DottyTest.scala b/compiler/test/dotty/tools/DottyTest.scala index 43e387623d13..b138b446d67f 100644 --- a/compiler/test/dotty/tools/DottyTest.scala +++ b/compiler/test/dotty/tools/DottyTest.scala @@ -7,10 +7,7 @@ import dotc.core._ import dotc.core.Comments.{ContextDoc, ContextDocstrings} import dotc.core.Contexts._ import dotc.core.Symbols._ -import dotc.core.Flags._ import Types._, Symbols._, Decorators._ -import dotc.printing.Texts._ -import dotc.reporting.ConsoleReporter import dotc.core.Decorators._ import dotc.ast.tpd import dotc.Compiler @@ -25,7 +22,6 @@ trait DottyTest extends ContextEscapeDetection { protected def initialCtx: FreshContext = { val base = new ContextBase {} - import base.settings._ val ctx = base.initialCtx.fresh initializeCtx(ctx) // when classpath is changed in ctx, we need to re-initialize to get the diff --git a/compiler/test/dotty/tools/DottyTypeStealer.scala b/compiler/test/dotty/tools/DottyTypeStealer.scala index 52bf7a7e221a..6477396679c2 100644 --- a/compiler/test/dotty/tools/DottyTypeStealer.scala +++ b/compiler/test/dotty/tools/DottyTypeStealer.scala @@ -1,7 +1,6 @@ package dotty.tools import dotc.ast.tpd -import dotc.core.Names._ import dotc.ast.tpd._ import dotc.core.Contexts.{Context, atPhase} import dotty.tools.dotc.core.Phases.{typerPhase, erasurePhase} diff --git a/compiler/test/dotty/tools/dotc/ast/AttachmentsTest.scala b/compiler/test/dotty/tools/dotc/ast/AttachmentsTest.scala index eda68829daaf..6a69de281bb3 100644 --- a/compiler/test/dotty/tools/dotc/ast/AttachmentsTest.scala +++ b/compiler/test/dotty/tools/dotc/ast/AttachmentsTest.scala @@ -3,7 +3,6 @@ package dotty.tools.dotc.ast import dotty.tools.DottyTest import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.util.Property -import dotty.tools.dotc.transform.PostTyper import org.junit.Test import org.junit.Assert.{assertEquals, assertTrue, fail} diff --git a/compiler/test/dotty/tools/dotc/ast/DesugarTests.scala b/compiler/test/dotty/tools/dotc/ast/DesugarTests.scala index 0242e730913d..dc736596ed9b 100644 --- a/compiler/test/dotty/tools/dotc/ast/DesugarTests.scala +++ b/compiler/test/dotty/tools/dotc/ast/DesugarTests.scala @@ -6,7 +6,6 @@ import core._ import Names._, Types._ , Symbols._, StdNames._, Flags._, Contexts._ import org.junit.Test -import org.junit.Assert._ class DesugarTests extends DottyTest { import tpd._ diff --git a/compiler/test/dotty/tools/dotc/ast/TreeInfoTest.scala b/compiler/test/dotty/tools/dotc/ast/TreeInfoTest.scala index b8e011c8c8dd..0c67eeead86a 100644 --- a/compiler/test/dotty/tools/dotc/ast/TreeInfoTest.scala +++ b/compiler/test/dotty/tools/dotc/ast/TreeInfoTest.scala @@ -5,10 +5,9 @@ package ast import org.junit.Test import core.Names._ import core.StdNames.nme -import core.Types._ import core.Symbols._ import org.junit.Assert._ -import core.Contexts.{Context, ctx} +import core.Contexts.Context class TreeInfoTest extends DottyTest { diff --git a/compiler/test/dotty/tools/dotc/config/CommandLineParserTest.scala b/compiler/test/dotty/tools/dotc/config/CommandLineParserTest.scala index a6bd651c6365..431fb37b8a07 100644 --- a/compiler/test/dotty/tools/dotc/config/CommandLineParserTest.scala +++ b/compiler/test/dotty/tools/dotc/config/CommandLineParserTest.scala @@ -5,7 +5,7 @@ import org.junit.Assert.{assertEquals, assertTrue} import org.junit.Test class CommandLineParserTest: - import CommandLineParser.{tokenize, ParseException} + import CommandLineParser.tokenize private def check(tokens: String*)(input: String): Unit = assertEquals(tokens, tokenize(input)) diff --git a/compiler/test/dotty/tools/dotc/core/SealedDescendantsTest.scala b/compiler/test/dotty/tools/dotc/core/SealedDescendantsTest.scala index 7d90d0ed8870..0ae9069c03d1 100644 --- a/compiler/test/dotty/tools/dotc/core/SealedDescendantsTest.scala +++ b/compiler/test/dotty/tools/dotc/core/SealedDescendantsTest.scala @@ -1,6 +1,6 @@ package dotty.tools.dotc.core -import dotty.tools.dotc.core.Contexts.{Context, ctx} +import dotty.tools.dotc.core.Contexts.Context import dotty.tools.dotc.core.Symbols.* import org.junit.Assert._ diff --git a/compiler/test/dotty/tools/dotc/interactive/CustomCompletionTests.scala b/compiler/test/dotty/tools/dotc/interactive/CustomCompletionTests.scala index ccf211136d51..7e247b51dff6 100644 --- a/compiler/test/dotty/tools/dotc/interactive/CustomCompletionTests.scala +++ b/compiler/test/dotty/tools/dotc/interactive/CustomCompletionTests.scala @@ -9,7 +9,6 @@ import dotc.reporting.StoreReporter import dotc.util.{SourceFile, SourcePosition} import dotc.util.Spans.Span -import org.junit.Assert._ import org.junit.Test class CustomCompletionTests extends DottyTest: diff --git a/compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala b/compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala index 51327e99dd01..a54880326704 100644 --- a/compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala +++ b/compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala @@ -3,16 +3,12 @@ package dotc package parsing import Tokens._, Parsers._ -import dotty.tools.io._ -import util._ import core._ import ast.Trees._ import ast.desugar -import ast.desugar._ import core.Mode import Contexts.Context -import scala.collection.mutable.ListBuffer class DeSugarTest extends ParserTest { diff --git a/compiler/test/dotty/tools/dotc/parsing/DocstringTests.scala b/compiler/test/dotty/tools/dotc/parsing/DocstringTests.scala index fcd02954d9e0..448b3bfbb489 100644 --- a/compiler/test/dotty/tools/dotc/parsing/DocstringTests.scala +++ b/compiler/test/dotty/tools/dotc/parsing/DocstringTests.scala @@ -2,7 +2,6 @@ package dotty.tools package dotc package parsing -import dotty.tools.dotc.core.Contexts.Context import dotty.tools.dotc.ast.Trees._ import org.junit.Assert._ diff --git a/compiler/test/dotty/tools/dotc/parsing/ParserTest.scala b/compiler/test/dotty/tools/dotc/parsing/ParserTest.scala index b247ba1a525d..92327068410e 100644 --- a/compiler/test/dotty/tools/dotc/parsing/ParserTest.scala +++ b/compiler/test/dotty/tools/dotc/parsing/ParserTest.scala @@ -4,11 +4,9 @@ package parsing import dotty.tools.io._ import util._ -import core._ import scala.io.Codec import Tokens._, Parsers._ import ast.untpd._ -import org.junit.Test import scala.collection.mutable.ListBuffer class ParserTest extends DottyTest { diff --git a/compiler/test/dotty/tools/dotc/parsing/desugarPackage.scala b/compiler/test/dotty/tools/dotc/parsing/desugarPackage.scala index 8016a74d4052..7a728f89b61c 100644 --- a/compiler/test/dotty/tools/dotc/parsing/desugarPackage.scala +++ b/compiler/test/dotty/tools/dotc/parsing/desugarPackage.scala @@ -3,7 +3,6 @@ package dotc package parsing import core._, ast._ -import Trees._ object desugarPackage extends DeSugarTest { diff --git a/compiler/test/dotty/tools/dotc/parsing/showTree.scala b/compiler/test/dotty/tools/dotc/parsing/showTree.scala index 18b2203d51ed..d574bb3a0208 100644 --- a/compiler/test/dotty/tools/dotc/parsing/showTree.scala +++ b/compiler/test/dotty/tools/dotc/parsing/showTree.scala @@ -2,16 +2,11 @@ package dotty.tools package dotc package parsing -import ast.Trees._ -import ast.desugar -import ast.desugar._ -import core.Mode object showTree extends DeSugarTest { import dotty.tools.dotc.ast.untpd._ - import Mode._ def test(arg: String) = { val tree: Tree = parse(arg) diff --git a/compiler/test/dotty/tools/dotc/printing/PrinterTests.scala b/compiler/test/dotty/tools/dotc/printing/PrinterTests.scala index 8ce53e28b93d..e6b17fade86f 100644 --- a/compiler/test/dotty/tools/dotc/printing/PrinterTests.scala +++ b/compiler/test/dotty/tools/dotc/printing/PrinterTests.scala @@ -4,8 +4,7 @@ import dotty.tools.DottyTest import dotty.tools.dotc.ast.{Trees,tpd} import dotty.tools.dotc.core.Names._ import dotty.tools.dotc.core.Symbols._ -import dotty.tools.dotc.core.Decorators._ -import dotty.tools.dotc.core.Contexts.{Context, ctx} +import dotty.tools.dotc.core.Contexts.Context import org.junit.Assert.assertEquals import org.junit.Test diff --git a/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala b/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala index 76f06802c79c..fff29edfa670 100644 --- a/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala +++ b/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala @@ -3,7 +3,6 @@ package dotc package reporting import core.Contexts.Context -import scala.collection.mutable import org.junit.Assert._ trait ErrorMessagesTest extends DottyTest { diff --git a/compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala b/compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala index ea5c1b3af5f5..12efc32ff1c5 100644 --- a/compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala +++ b/compiler/test/dotty/tools/dotc/reporting/TestMessageLaziness.scala @@ -2,7 +2,6 @@ package dotty.tools package dotc package reporting -import org.junit.Assert._ import org.junit.Test import core.Contexts._ diff --git a/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala index da9b2498d528..ed25f7f8d6c6 100644 --- a/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala +++ b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala @@ -11,13 +11,11 @@ import scala.collection.mutable import util.SourcePosition import core.Contexts._ -import Reporter._ import Diagnostic._ -import interfaces.Diagnostic.{ ERROR, WARNING, INFO } +import interfaces.Diagnostic.{ ERROR, WARNING } class TestReporter protected (outWriter: PrintWriter, filePrintln: String => Unit, logLevel: Int) extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with MessageRendering { - import Diagnostic._ protected final val _errorBuf = mutable.ArrayBuffer.empty[Diagnostic] final def errors: Iterator[Diagnostic] = _errorBuf.iterator diff --git a/compiler/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala b/compiler/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala index fa811ccbb9c7..f80094a0bb4c 100644 --- a/compiler/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala +++ b/compiler/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala @@ -2,17 +2,8 @@ package dotty.tools package dotc package transform -import org.junit.{Assert, Test} import core._ -import ast.{tpd, Trees} -import Contexts._ -import Flags._ -import Denotations._ -import NameOps._ -import Symbols._ -import Types._ -import Decorators._ -import Trees._ +import ast.Trees class CreateCompanionObjectsTest extends DottyTest { diff --git a/compiler/test/dotty/tools/dotc/transform/LazyValsTest.scala b/compiler/test/dotty/tools/dotc/transform/LazyValsTest.scala index 96298c571749..b8f96a3c5090 100644 --- a/compiler/test/dotty/tools/dotc/transform/LazyValsTest.scala +++ b/compiler/test/dotty/tools/dotc/transform/LazyValsTest.scala @@ -2,8 +2,6 @@ package dotty.tools package dotc package transform -import org.junit.Test -import org.junit.Assert class LazyValsTest extends DottyTest { /* FIXME: re-enable after adapting to new scheme diff --git a/compiler/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala b/compiler/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala index 1e6687617083..d75332b94c1b 100644 --- a/compiler/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala +++ b/compiler/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala @@ -2,17 +2,8 @@ package dotty.tools package dotc package transform -import org.junit.{Assert, Test} import core._ import ast.Trees -import Contexts._ -import Flags._ -import Denotations._ -import NameOps._ -import Symbols._ -import Types._ -import Decorators._ -import Trees._ class PostTyperTransformerTest extends DottyTest { /* FIXME: re-enable after adapting to new scheme diff --git a/compiler/test/dotty/tools/dotc/transform/SpecializeFunctionsTests.scala b/compiler/test/dotty/tools/dotc/transform/SpecializeFunctionsTests.scala index 5d159622f5ea..b74e6c0012dc 100644 --- a/compiler/test/dotty/tools/dotc/transform/SpecializeFunctionsTests.scala +++ b/compiler/test/dotty/tools/dotc/transform/SpecializeFunctionsTests.scala @@ -2,17 +2,13 @@ package dotty.tools package dotc package transform -import org.junit.Assert._ import org.junit.Test import dotty.tools.backend.jvm.DottyBytecodeTest class SpecializeFunctionsTests extends DottyBytecodeTest { - import dotty.tools.backend.jvm.ASMConverters._ - import dotty.tools.backend.jvm.AsmNode._ import scala.collection.JavaConverters._ - import scala.tools.asm.tree.MethodNode @Test def specializeParentIntToInt = { val source = """ diff --git a/compiler/test/dotty/tools/dotc/typer/DivergenceChecker.scala b/compiler/test/dotty/tools/dotc/typer/DivergenceChecker.scala index 228d24dd1df0..520b3d2de57e 100644 --- a/compiler/test/dotty/tools/dotc/typer/DivergenceChecker.scala +++ b/compiler/test/dotty/tools/dotc/typer/DivergenceChecker.scala @@ -1,14 +1,10 @@ package dotty.tools.dotc.typer import dotty.tools.DottyTest -import dotty.tools.dotc.ast.Trees._ import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.Decorators._ -import dotty.tools.dotc.core.Symbols._ -import dotty.tools.dotc.core.Types._ import org.junit.Test -import org.junit.Assert.{ assertFalse, assertTrue, fail } +import org.junit.Assert.{ assertTrue, fail } class DivergenceCheckerTests extends DottyTest { @Test diff --git a/compiler/test/dotty/tools/repl/ScriptedTests.scala b/compiler/test/dotty/tools/repl/ScriptedTests.scala index 70f2a44ceea8..5c3a32cd40f8 100644 --- a/compiler/test/dotty/tools/repl/ScriptedTests.scala +++ b/compiler/test/dotty/tools/repl/ScriptedTests.scala @@ -6,7 +6,6 @@ import org.junit.Test /** Runs all tests contained in `compiler/test-resources/repl/` */ class ScriptedTests extends ReplTest { - import ScriptedTests._ @Test def replTests = scripts("/repl").foreach(testFile) diff --git a/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala b/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala index bcfe1c3251a7..e891f0eff696 100644 --- a/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala +++ b/compiler/test/dotty/tools/repl/ShadowingBatchTests.scala @@ -4,12 +4,11 @@ package repl import java.io.File import java.nio.file.Files -import org.junit.{ After, AfterClass, BeforeClass, Ignore, Test } +import org.junit.{ After, AfterClass, BeforeClass, Test } import org.junit.Assert._ import io.{ Directory, PlainDirectory } import dotc.core.Contexts._ import dotc.reporting.{ ErrorMessagesTest, StoreReporter } -import vulpix.TestConfiguration object ShadowingBatchTests: val dir = Directory(Files.createTempDirectory("batch-shadow")) From d0bd3ba2c83302c69620dfacaea03b0debc29fa3 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 22 Feb 2022 13:22:03 +0100 Subject: [PATCH 1239/1244] Remove unused definitions --- compiler/src/dotty/tools/dotc/core/Definitions.scala | 3 --- 1 file changed, 3 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala index 76e6918f214d..6fbced1bd377 100644 --- a/compiler/src/dotty/tools/dotc/core/Definitions.scala +++ b/compiler/src/dotty/tools/dotc/core/Definitions.scala @@ -783,7 +783,6 @@ class Definitions { @tu lazy val TypeTestModule_identity: Symbol = TypeTestClass.companionModule.requiredMethod(nme.identity) @tu lazy val QuotedExprClass: ClassSymbol = requiredClass("scala.quoted.Expr") - @tu lazy val QuotedExprModule: Symbol = QuotedExprClass.companionModule @tu lazy val QuotesClass: ClassSymbol = requiredClass("scala.quoted.Quotes") @@ -826,8 +825,6 @@ class Definitions { @tu lazy val QuotedTypeModule: Symbol = QuotedTypeClass.companionModule @tu lazy val QuotedTypeModule_of: Symbol = QuotedTypeModule.requiredMethod("of") - @tu lazy val TastyReflectionClass: ClassSymbol = requiredClass("scala.tasty.Reflection") - @tu lazy val CanEqualClass: ClassSymbol = getClassIfDefined("scala.Eql").orElse(requiredClass("scala.CanEqual")).asClass def CanEqual_canEqualAny(using Context): TermSymbol = val methodName = if CanEqualClass.name == tpnme.Eql then nme.eqlAny else nme.canEqualAny From 76a149520b76973b805dd05bc635b838bf542623 Mon Sep 17 00:00:00 2001 From: olsdavis Date: Wed, 23 Feb 2022 09:55:03 +0000 Subject: [PATCH 1240/1244] Implementing lazy vals - Implements a propotype of the new lazy vals scheme Fix/Fixing/Fixes/Close/Closing/Refs #7140 --- .../dotty/tools/dotc/transform/LazyVals.scala | 363 +++-- library/src/scala/runtime/LazyVals.scala | 65 +- vscode-dotty/package-lock.json | 1417 ++++++++++++++++- vscode-dotty/package.json | 2 +- 4 files changed, 1663 insertions(+), 184 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala index aabf8cf9a680..6126bc9b3e0b 100644 --- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala @@ -23,9 +23,10 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { import LazyVals._ import tpd._ - /** this map contains mutable state of transformation: OffsetDefs to be appended to companion object definitions, - * and number of bits currently used */ - class OffsetInfo(var defs: List[Tree], var ord:Int) + /** + * The map contains the list of the offset trees. + */ + class OffsetInfo(var defs: List[Tree]) private val appendOffsetDefs = mutable.Map.empty[Symbol, OffsetInfo] override def phaseName: String = LazyVals.name @@ -52,6 +53,16 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { else nullables.toList } + private def initBlock(stats: List[Tree])(using Context): Block = stats match + case Nil => throw new IllegalArgumentException("trying to create an empty Block") + case x :: Nil => Block(List(x), EmptyTree) + case x :: xs => Block(stats.init, stats.last) + + private def needsBoxing(tp: Type)(using Context): Boolean = tp != NoType && tp != defn.UnitType && tp.classSymbol.isPrimitiveValueClass + + private def boxIfCan(tp: Type)(using Context): Type = + assert(needsBoxing(tp)) + defn.boxedType(tp) override def prepareForUnit(tree: Tree)(using Context): Context = { if (lazyValNullables == null) @@ -62,7 +73,6 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { override def transformDefDef(tree: DefDef)(using Context): Tree = transformLazyVal(tree) - override def transformValDef(tree: ValDef)(using Context): Tree = transformLazyVal(tree) @@ -101,7 +111,6 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { } } - /** Append offset fields to companion objects */ override def transformTemplate(template: Template)(using Context): Tree = { @@ -115,16 +124,15 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { } } - private def addInFront(prefix: List[Tree], stats: List[Tree]) = stats match { case first :: rest if isSuperConstrCall(first) => first :: prefix ::: rest case _ => prefix ::: stats } - /** Make an eager val that would implement synthetic module. - * Eager val ensures thread safety and has less code generated. - * - */ + /** + * Make an eager val that would implement synthetic module. + * Eager val ensures thread safety and has less code generated. + */ def transformSyntheticModule(tree: ValOrDefDef)(using Context): Thicket = { val sym = tree.symbol val holderSymbol = newSymbol(sym.owner, LazyLocalName.fresh(sym.asTerm.name), @@ -134,7 +142,8 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { Thicket(field, getter) } - /** Desugar a local `lazy val x: Int = ` into: + /** + * Desugar a local `lazy val x: Int = ` into: * * ``` * val x$lzy = new scala.runtime.LazyInt() @@ -186,7 +195,6 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { Thicket(holderTree, initTree, accessor) } - override def transformStats(trees: List[tpd.Tree])(using Context): List[Tree] = { // backend requires field usage to be after field definition // need to bring containers to start of method @@ -274,168 +282,212 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { } } - /** Create a threadsafe lazy accessor equivalent to such code - * ``` - * def methodSymbol(): Int = { - * while (true) { - * val flag = LazyVals.get(this, bitmap_offset) - * val state = LazyVals.STATE(flag, ) - * - * if (state == ) { - * return value_0 - * } else if (state == ) { - * if (LazyVals.CAS(this, bitmap_offset, flag, , )) { - * try { - * val result = - * value_0 = result - * nullable = null - * LazyVals.setFlag(this, bitmap_offset, , ) - * return result - * } - * catch { - * case ex => - * LazyVals.setFlag(this, bitmap_offset, , ) - * throw ex - * } - * } - * } else /* if (state == || state == ) */ { - * LazyVals.wait4Notification(this, bitmap_offset, flag, ) - * } - * } - * } - * ``` - */ + /** + * Create a threadsafe lazy accessor equivalent to the following code: + * ``` + * private @volatile var _x: AnyRef = null + * @tailrec def x: A = + * _x match + * case current: A => + * current + * case null => + * if CAS(_x, null, Evaluating) then + * var result: AnyRef = null // here, we need `AnyRef` to possibly assign `NULL` + * try + * result = rhs + * nullable = null // if the field is nullable; see `CollectNullableFields` + * if result == null then result = NULL // drop if A is non-nullable + * finally + * if !CAS(_x, Evaluating, result) then + * val lock = _x.asInstanceOf[Waiting] + * CAS(_x, lock, result) + * lock.release() + * x + * case Evaluating => + * CAS(_x, Evaluating, new Waiting) + * x + * case current: Waiting => + * current.awaitRelease() + * x + * case NULL => null + * ``` + * Where `Evaluating` and `NULL` are represented by `object`s and `Waiting` by a class that + * allows awaiting the completion of the evaluation. Note that since tail-recursive + * functions are transformed *before* lazy-vals, this implementation directly implements + * the resulting loop. `PatternMatcher` coming before `LazyVals`, the pattern matching block + * is implemented using if-s. That is: + * + * ``` + * private @volatile var _x: AnyRef = null + * def x: A = + * while true do + * val current: AnyRef = _x + * if current == null then + * if CAS(_x, null, Evaluating) then + * var result: AnyRef = null + * try + * result = rhs + * nullable = null + * if result == null then result = NULL + * finally + * if !CAS(_x, Evaluating, result) then + * val lock = _x.asInstanceOf[Waiting] + * CAS(_x, lock, result) + * lock.release() + * else + * if current.isInstanceOf[A] then + * current.asInstanceOf[A] + * else if current.isInstanceOf[NULL] then + * null + * else if current.isInstanceOf[Waiting] then + * current.asInstanceOf[Waiting].awaitRelease() + * else // `current` is Evaluating + * CAS(current, Evaluating, new Waiting) + * end while + * ``` + * + * @param methodSymbol the symbol of the new method + * @param claz the class containing this lazy val field + * @param target the target synthetic field + * @param rhs the right-hand side expression of the lazy val + * @param tp the type of the lazy val + * @param offset the offset of the field in the bitmap + * @param getFlag a flag for the volatile get function + * @param objCasFlag a flag for the CAS function operating on objects + * @param waiting a reference to the `Waiting` runtime class + * @param evaluating a reference to the `Evaluating` runtime object + * @param nullValued a reference to the `NULL` runtime object + */ def mkThreadSafeDef(methodSymbol: TermSymbol, claz: ClassSymbol, - ord: Int, target: Symbol, rhs: Tree, tp: Type, offset: Tree, - getFlag: Tree, - stateMask: Tree, - casFlag: Tree, - setFlagState: Tree, - waitOnLock: Tree)(using Context): DefDef = { - val initState = Literal(Constant(0)) - val computeState = Literal(Constant(1)) - val computedState = Literal(Constant(3)) - - val thiz = This(claz) - val fieldId = Literal(Constant(ord)) - - val flagSymbol = newSymbol(methodSymbol, lazyNme.flag, Synthetic, defn.LongType) - val flagDef = ValDef(flagSymbol, getFlag.appliedTo(thiz, offset)) - val flagRef = ref(flagSymbol) - - val stateSymbol = newSymbol(methodSymbol, lazyNme.state, Synthetic, defn.LongType) - val stateDef = ValDef(stateSymbol, stateMask.appliedTo(ref(flagSymbol), Literal(Constant(ord)))) - val stateRef = ref(stateSymbol) - - val compute = { - val resultSymbol = newSymbol(methodSymbol, lazyNme.result, Synthetic, tp) - val resultRef = ref(resultSymbol) - val stats = ( - ValDef(resultSymbol, rhs) :: - ref(target).becomes(resultRef) :: - (nullOut(nullableFor(methodSymbol)) :+ - setFlagState.appliedTo(thiz, offset, computedState, fieldId)) - ) - Block(stats, Return(resultRef, methodSymbol)) - } - - val retryCase = { - val caseSymbol = newSymbol(methodSymbol, nme.DEFAULT_EXCEPTION_NAME, Synthetic | Case, defn.ThrowableType) - val triggerRetry = setFlagState.appliedTo(thiz, offset, initState, fieldId) - CaseDef( - Bind(caseSymbol, ref(caseSymbol)), - EmptyTree, - Block(List(triggerRetry), Throw(ref(caseSymbol))) + objCasFlag: Tree, + waiting: Tree, + evaluating: Tree, + nullValued: Tree, + thiz: Tree)(using Context): DefDef = { + val discardSymb = newSymbol(methodSymbol, lazyNme.discard, Method | Synthetic, MethodType(Nil)(_ => Nil, _ => defn.UnitType)) + val discardDef = DefDef(discardSymb, initBlock( + objCasFlag.appliedTo(thiz, offset, evaluating, Select(New(waiting), StdNames.nme.CONSTRUCTOR).ensureApplied) + :: Return(unitLiteral, discardSymb) :: Nil)) + // if observed a null value + val unevaluated = { + // var res: AnyRef + val resSymb = newSymbol(methodSymbol, lazyNme.result, Synthetic | Mutable, defn.ObjectType) + // releasing block in finally + val lockRel = { + val lockSymb = newSymbol(methodSymbol, lazyNme.lock, Synthetic, waiting.typeOpt) + initBlock(ValDef(lockSymb, ref(target).cast(waiting.typeOpt)) + :: objCasFlag.appliedTo(thiz, offset, ref(lockSymb), ref(resSymb)) + :: ref(lockSymb).select(lazyNme.RLazyVals.waitingRelease).ensureApplied :: Nil) + } + // finally block + val fin = If( + objCasFlag.appliedTo(thiz, offset, evaluating, ref(resSymb)).equal(Literal(Constant(false))), + lockRel, + EmptyTree + ).withType(defn.UnitType) + // entire try block + val evaluate = Try( + initBlock( + Assign(ref(resSymb), if needsBoxing(tp) && rhs != EmptyTree then rhs.ensureConforms(boxIfCan(tp)) else rhs) // try result = rhs + :: nullOut(nullableFor(methodSymbol)) + ::: If(ref(resSymb).equal(nullLiteral), Assign(ref(resSymb), nullValued), EmptyTree).withType(defn.UnitType) // if result == null then result = NULL + :: Nil + ), + Nil, + fin ) + // if CAS(...) + If( + objCasFlag.appliedTo(thiz, offset, nullLiteral, evaluating), + initBlock(ValDef(resSymb, nullLiteral) // var result: AnyRef = null + :: evaluate // try ... finally ... + :: Nil), + EmptyTree + ).withType(defn.UnitType) } - - val initialize = If( - casFlag.appliedTo(thiz, offset, flagRef, computeState, fieldId), - Try(compute, List(retryCase), EmptyTree), - unitLiteral - ) - - val condition = If( - stateRef.equal(computedState), - Return(ref(target), methodSymbol), + val current = newSymbol(methodSymbol, lazyNme.current, Synthetic, defn.ObjectType) + val ifNotNull = If( - stateRef.equal(initState), - initialize, - waitOnLock.appliedTo(thiz, offset, flagRef, fieldId) + ref(current).select(defn.Any_isInstanceOf).appliedToType(if needsBoxing(tp) then boxIfCan(tp) else tp), + Return(ref(current).ensureConforms(tp), methodSymbol), + // not an A + If( + ref(current).select(defn.Any_isInstanceOf).appliedToTypeTree(nullValued), + Return(defaultValue(tp), methodSymbol), + // not a NULL + If( + ref(current).select(defn.Any_isInstanceOf).appliedToTypeTree(waiting), + ref(current).select(defn.Any_asInstanceOf).appliedToTypeTree(waiting).select(lazyNme.RLazyVals.waitingAwaitRelease).ensureApplied, + // not a Waiting, then is an Evaluating + ref(discardSymb).ensureApplied + ) + ) ) - ) - - val loop = WhileDo(EmptyTree, Block(List(flagDef, stateDef), condition)) - DefDef(methodSymbol, loop) + val body = initBlock(ValDef(current, ref(target)) :: If(ref(current).equal(nullLiteral), unevaluated, ifNotNull) :: Nil) + val mainLoop = WhileDo(EmptyTree, body) // becomes: while (true) do { body } + val ret = DefDef(methodSymbol, initBlock(discardDef :: mainLoop :: Nil)) + ret } def transformMemberDefThreadSafe(x: ValOrDefDef)(using Context): Thicket = { assert(!(x.symbol is Mutable)) - + import dotty.tools.dotc.core.Types._ + import dotty.tools.dotc.core.Flags._ + + val runtimeModule = "scala.runtime.LazyVals" val tpe = x.tpe.widen.resultType.widen val claz = x.symbol.owner.asClass val thizClass = Literal(Constant(claz.info)) - val helperModule = requiredModule("scala.runtime.LazyVals") + val helperModule = requiredModule(runtimeModule) val getOffset = Select(ref(helperModule), lazyNme.RLazyVals.getOffset) var offsetSymbol: TermSymbol = null - var flag: Tree = EmptyTree - var ord = 0 def offsetName(id: Int) = s"${StdNames.nme.LAZY_FIELD_OFFSET}${if (x.symbol.owner.is(Module)) "_m_" else ""}$id".toTermName - // compute or create appropriate offsetSymbol, bitmap and bits used by current ValDef - appendOffsetDefs.get(claz) match { + val containerName = LazyLocalName.fresh(x.name.asTermName) + val containerSymbol = newSymbol(claz, containerName, containerFlags, defn.ObjectType).enteredAfter(this) + containerSymbol.addAnnotation(Annotation(defn.VolatileAnnot)) // private @volatile var _x: AnyRef + val stat = x.symbol.isStatic + if stat then + containerSymbol.setFlag(JavaStatic) + val containerTree = ValDef(containerSymbol, nullLiteral) + def staticOrFieldOff: Tree = getOffset.appliedTo(thizClass, Literal(Constant(containerName.toString))) + + // create an offset for this lazy val + appendOffsetDefs.get(claz) match case Some(info) => - val flagsPerLong = (64 / scala.runtime.LazyVals.BITS_PER_LAZY_VAL).toInt - info.ord += 1 - ord = info.ord % flagsPerLong - val id = info.ord / flagsPerLong - val offsetById = offsetName(id) - if (ord != 0) // there are unused bits in already existing flag - offsetSymbol = claz.info.decl(offsetById) - .suchThat(sym => sym.is(Synthetic) && sym.isTerm) - .symbol.asTerm - else { // need to create a new flag - offsetSymbol = newSymbol(claz, offsetById, Synthetic, defn.LongType).enteredAfter(this) - offsetSymbol.addAnnotation(Annotation(defn.ScalaStaticAnnot)) - val flagName = LazyBitMapName.fresh(id.toString.toTermName) - val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType).enteredAfter(this) - flag = ValDef(flagSymbol, Literal(Constant(0L))) - val offsetTree = ValDef(offsetSymbol, getOffset.appliedTo(thizClass, Literal(Constant(flagName.toString)))) - info.defs = offsetTree :: info.defs - } - + offsetSymbol = newSymbol(claz, offsetName(info.defs.size), Synthetic, defn.LongType).enteredAfter(this) + offsetSymbol.addAnnotation(Annotation(defn.ScalaStaticAnnot)) + val offsetTree = ValDef(offsetSymbol, staticOrFieldOff) + info.defs = offsetTree :: info.defs case None => offsetSymbol = newSymbol(claz, offsetName(0), Synthetic, defn.LongType).enteredAfter(this) offsetSymbol.addAnnotation(Annotation(defn.ScalaStaticAnnot)) - val flagName = LazyBitMapName.fresh("0".toTermName) - val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType).enteredAfter(this) - flag = ValDef(flagSymbol, Literal(Constant(0L))) - val offsetTree = ValDef(offsetSymbol, getOffset.appliedTo(thizClass, Literal(Constant(flagName.toString)))) - appendOffsetDefs += (claz -> new OffsetInfo(List(offsetTree), ord)) - } - - val containerName = LazyLocalName.fresh(x.name.asTermName) - val containerSymbol = newSymbol(claz, containerName, x.symbol.flags &~ containerFlagsMask | containerFlags, tpe, coord = x.symbol.coord).enteredAfter(this) - - val containerTree = ValDef(containerSymbol, defaultValue(tpe)) - - val offset = ref(offsetSymbol) - val getFlag = Select(ref(helperModule), lazyNme.RLazyVals.get) - val setFlag = Select(ref(helperModule), lazyNme.RLazyVals.setFlag) - val wait = Select(ref(helperModule), lazyNme.RLazyVals.wait4Notification) - val state = Select(ref(helperModule), lazyNme.RLazyVals.state) - val cas = Select(ref(helperModule), lazyNme.RLazyVals.cas) - - val accessor = mkThreadSafeDef(x.symbol.asTerm, claz, ord, containerSymbol, x.rhs, tpe, offset, getFlag, state, cas, setFlag, wait) - if (flag eq EmptyTree) - Thicket(containerTree, accessor) - else Thicket(containerTree, flag, accessor) + val offsetTree = ValDef(offsetSymbol, staticOrFieldOff) + appendOffsetDefs += (claz -> new OffsetInfo(List(offsetTree))) + + val waiting = requiredClass(s"$runtimeModule.${lazyNme.RLazyVals.waiting}") + val evaluating = Select(ref(helperModule), lazyNme.RLazyVals.evaluating) + val nullValued = Select(ref(helperModule), lazyNme.RLazyVals.nullValued) + val objCas = Select(ref(helperModule), lazyNme.RLazyVals.objCas) + + val offset = ref(offsetSymbol) + + val swapOver = + if stat then + tpd.clsOf(x.symbol.owner.typeRef) + else + This(claz) + + val methodSymbol = x.symbol.asTerm + val accessor = mkThreadSafeDef(methodSymbol, claz, containerSymbol, x.rhs, tpe, offset, objCas, + ref(waiting), evaluating, nullValued, swapOver) + Thicket(containerTree, accessor) } } @@ -447,12 +499,14 @@ object LazyVals { import Names.TermName object RLazyVals { import scala.runtime.LazyVals.{Names => N} - val get: TermName = N.get.toTermName - val setFlag: TermName = N.setFlag.toTermName - val wait4Notification: TermName = N.wait4Notification.toTermName - val state: TermName = N.state.toTermName - val cas: TermName = N.cas.toTermName + val waiting: TermName = N.waiting.toTermName + val waitingAwaitRelease: TermName = N.waitingAwaitRelease.toTermName + val waitingRelease: TermName = N.waitingRelease.toTermName + val evaluating: TermName = N.evaluating.toTermName + val nullValued: TermName = N.nullValued.toTermName + val objCas: TermName = N.objCas.toTermName val getOffset: TermName = N.getOffset.toTermName + val getStaticOffset: TermName = N.getStaticOffset.toTermName } val flag: TermName = "flag".toTermName val state: TermName = "state".toTermName @@ -461,5 +515,8 @@ object LazyVals { val initialized: TermName = "initialized".toTermName val initialize: TermName = "initialize".toTermName val retry: TermName = "retry".toTermName + val current: TermName = "current".toTermName + val lock: TermName = "lock".toTermName + val discard: TermName = "discard".toTermName } } diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala index 85ca4f5cb3a0..0c1a6dd421e6 100644 --- a/library/src/scala/runtime/LazyVals.scala +++ b/library/src/scala/runtime/LazyVals.scala @@ -1,5 +1,7 @@ package scala.runtime +import java.lang.reflect.Modifier + /** * Helper methods used in thread-safe lazy vals. */ @@ -22,6 +24,7 @@ object LazyVals { val processors = java.lang.Runtime.getRuntime.nn.availableProcessors() 8 * processors * processors } + private[this] val monitors: Array[Object] = Array.tabulate(base)(_ => new Object) @@ -37,6 +40,41 @@ object LazyVals { /* ------------- Start of public API ------------- */ + /** + * Used to indicate the state of a lazy val that is being + * evaluated and of which other threads await the result. + */ + final class Waiting: + private var done = false + + /** + * Wakes up waiting threads. Called on completion of the evaluation + * of lazy val's right-hand side. + */ + def release(): Unit = synchronized { + done = true + notifyAll() + } + + /** + * Awaits the completion of the evaluation of lazy val's right-hand side. + */ + def awaitRelease(): Unit = synchronized { + while !done do wait() + } + + /** + * Used to indicate the state of a lazy val that is currently being + * evaluated with no other thread awaiting its result. + */ + object Evaluating + + /** + * Used to indicate the state of a lazy val that has been evaluated to + * `null`. + */ + object NULL + final val BITS_PER_LAZY_VAL = 2L def STATE(cur: Long, ord: Int): Long = { @@ -54,6 +92,12 @@ object LazyVals { unsafe.compareAndSwapLong(t, offset, e, n) } + def objCAS(t: Object, offset: Long, exp: Object, n: Object): Boolean = { + if (debug) + println(s"objCAS($t, $exp, $n)") + unsafe.compareAndSwapObject(t, offset, exp, n) + } + def setFlag(t: Object, offset: Long, v: Int, ord: Int): Unit = { if (debug) println(s"setFlag($t, $offset, $v, $ord)") @@ -100,18 +144,35 @@ object LazyVals { } def getOffset(clz: Class[_], name: String): Long = { - val r = unsafe.objectFieldOffset(clz.getDeclaredField(name)) if (debug) - println(s"getOffset($clz, $name) = $r") + clz.getDeclaredFields.foreach(println(_)) + val field = clz.getDeclaredField(name) + if java.lang.reflect.Modifier.isStatic(field.getModifiers()) then + unsafe.staticFieldOffset(field) + else + unsafe.objectFieldOffset(field) + } + + def getStaticOffset(clz: Class[_], name: String): Long = { + val r = unsafe.staticFieldOffset(clz.getDeclaredField(name)) + if (debug) + println(s"getStaticOffset($clz, $name) = $r") r } object Names { + final val waiting = "Waiting" + final val evaluating = "Evaluating" + final val nullValued = "NULL" + final val waitingAwaitRelease = "awaitRelease" + final val waitingRelease = "release" final val state = "STATE" final val cas = "CAS" + final val objCas = "objCAS" final val setFlag = "setFlag" final val wait4Notification = "wait4Notification" final val get = "get" final val getOffset = "getOffset" + final val getStaticOffset = "getStaticOffset" } } diff --git a/vscode-dotty/package-lock.json b/vscode-dotty/package-lock.json index 22e232900f01..e1c1e9906ad7 100644 --- a/vscode-dotty/package-lock.json +++ b/vscode-dotty/package-lock.json @@ -1,9 +1,1345 @@ { "name": "dotty", "version": "0.1.17-snapshot", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "dotty", + "version": "0.1.17-snapshot", + "hasInstallScript": true, + "license": "Apache-2.0", + "dependencies": { + "archiver": "^3.1.1", + "compare-versions": "^3.5.1", + "promisify-child-process": "^2.1.2", + "request": "^2.88.0", + "vscode-jsonrpc": "4.0.0", + "vscode-languageclient": "^5.2.1", + "vscode-languageserver": "^5.2.1", + "ws": "^6.2.1" + }, + "devDependencies": { + "@types/archiver": "^2.1.3", + "@types/compare-versions": "^3.0.0", + "@types/mocha": "^5.2.7", + "@types/node": "^10.14.18", + "@types/request": "^2.48.3", + "@types/ws": "^6.0.3", + "typescript": "^3.6.3", + "vscode": "^1.1.37" + }, + "engines": { + "vscode": "^1.30.0" + } + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@types/archiver": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-2.1.3.tgz", + "integrity": "sha512-x37dj6VvV8jArjvqvZP+qz5+24qOwgFesLMvn98uNz8qebjCg+uteqquRf9mqaxxhcM7S1vPl4YFhBs2/abcFQ==", + "dev": true, + "dependencies": { + "@types/glob": "*" + } + }, + "node_modules/@types/caseless": { + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz", + "integrity": "sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==", + "dev": true + }, + "node_modules/@types/compare-versions": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/compare-versions/-/compare-versions-3.0.0.tgz", + "integrity": "sha512-HNXtUQQuW3ThO9DVfTNbdvClVr+8AZlNNa2pxk5qtEvObnT27qh0DdQXTN4h5PuTTGinxwXkRKXsllJxuAzGPw==", + "dev": true + }, + "node_modules/@types/events": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", + "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", + "dev": true + }, + "node_modules/@types/glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "dev": true, + "dependencies": { + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "node_modules/@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "dev": true + }, + "node_modules/@types/mocha": { + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", + "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", + "dev": true + }, + "node_modules/@types/node": { + "version": "10.14.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.18.tgz", + "integrity": "sha512-ryO3Q3++yZC/+b8j8BdKd/dn9JlzlHBPdm80656xwYUdmPkpTGTjkAdt6BByiNupGPE8w0FhBgvYy/fX9hRNGQ==", + "dev": true + }, + "node_modules/@types/request": { + "version": "2.48.3", + "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.3.tgz", + "integrity": "sha512-3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==", + "dev": true, + "dependencies": { + "@types/caseless": "*", + "@types/node": "*", + "@types/tough-cookie": "*", + "form-data": "^2.5.0" + } + }, + "node_modules/@types/request/node_modules/form-data": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", + "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/@types/tough-cookie": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz", + "integrity": "sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==", + "dev": true + }, + "node_modules/@types/ws": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz", + "integrity": "sha512-yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/agent-base": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "dev": true, + "dependencies": { + "es6-promisify": "^5.0.0" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dependencies": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, + "node_modules/archiver": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-3.1.1.tgz", + "integrity": "sha512-5Hxxcig7gw5Jod/8Gq0OneVgLYET+oNHcxgWItq4TbhOzRLKNAFUb9edAftiMKXvXfCB0vbGrJdZDNq0dWMsxg==", + "dependencies": { + "archiver-utils": "^2.1.0", + "async": "^2.6.3", + "buffer-crc32": "^0.2.1", + "glob": "^7.1.4", + "readable-stream": "^3.4.0", + "tar-stream": "^2.1.0", + "zip-stream": "^2.1.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/archiver-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", + "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", + "dependencies": { + "glob": "^7.1.4", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^2.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/archiver-utils/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dependencies": { + "lodash": "^4.17.14" + } + }, + "node_modules/async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", + "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" + }, + "node_modules/balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "node_modules/base64-js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + }, + "node_modules/bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "node_modules/bl": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz", + "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==", + "dependencies": { + "readable-stream": "^3.0.1" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/buffer": { + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz", + "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==", + "dependencies": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, + "node_modules/buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "engines": { + "node": "*" + } + }, + "node_modules/buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/combined-stream": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", + "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "dev": true + }, + "node_modules/compare-versions": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz", + "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==" + }, + "node_modules/compress-commons": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz", + "integrity": "sha512-eVw6n7CnEMFzc3duyFVrQEuY1BlHR3rYsSztyG32ibGMW722i3C6IizEGMFmfMU+A+fALvBIwxN3czffTcdA+Q==", + "dependencies": { + "buffer-crc32": "^0.2.13", + "crc32-stream": "^3.0.1", + "normalize-path": "^3.0.0", + "readable-stream": "^2.3.6" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/compress-commons/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "node_modules/crc": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", + "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", + "dependencies": { + "buffer": "^5.1.0" + } + }, + "node_modules/crc32-stream": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz", + "integrity": "sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==", + "dependencies": { + "crc": "^3.4.4", + "readable-stream": "^3.4.0" + }, + "engines": { + "node": ">= 6.9.0" + } + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/end-of-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", + "dev": true + }, + "node_modules/es6-promisify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "dev": true, + "dependencies": { + "es6-promise": "^4.0.3" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "engines": [ + "node >=0.6.0" + ] + }, + "node_modules/fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "engines": { + "node": "*" + } + }, + "node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==" + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true, + "engines": { + "node": ">=4.x" + } + }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz", + "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==", + "dependencies": { + "ajv": "^5.3.0", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/http-proxy-agent": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", + "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", + "dev": true, + "dependencies": { + "agent-base": "4", + "debug": "3.1.0" + }, + "engines": { + "node": ">= 4.5.0" + } + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/https-proxy-agent": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz", + "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==", + "dev": true, + "dependencies": { + "agent-base": "^4.3.0", + "debug": "^3.1.0" + }, + "engines": { + "node": ">= 4.5.0" + } + }, + "node_modules/ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + }, + "node_modules/json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "node_modules/json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "node_modules/jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "node_modules/lazystream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "dependencies": { + "readable-stream": "^2.0.5" + }, + "engines": { + "node": ">= 0.6.3" + } + }, + "node_modules/lazystream/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/lodash": { + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" + }, + "node_modules/lodash.difference": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=" + }, + "node_modules/lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "node_modules/lodash.union": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", + "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=" + }, + "node_modules/mime-db": { + "version": "1.37.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", + "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.21", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", + "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", + "dependencies": { + "mime-db": "~1.37.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "node_modules/mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "dependencies": { + "minimist": "0.0.8" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mocha": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", + "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", + "dev": true, + "dependencies": { + "browser-stdout": "1.3.1", + "commander": "2.15.1", + "debug": "3.1.0", + "diff": "3.5.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.2", + "growl": "1.10.5", + "he": "1.1.1", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "supports-color": "5.4.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/mocha/node_modules/glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "engines": { + "node": "*" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "node_modules/promisify-child-process": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-2.1.2.tgz", + "integrity": "sha512-j2BRwNaM7fUwrd67avtqSTRevQXZiqS+T4Ky3VVaQdvzkPpsTByBAv+ZyBxuXgV/eUrCe2qYrOZvPvd+sMryeg==", + "dependencies": { + "@types/node": "^10.11.3" + } + }, + "node_modules/promisify-child-process/node_modules/@types/node": { + "version": "10.12.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.0.tgz", + "integrity": "sha512-3TUHC3jsBAB7qVRGxT6lWyYo2v96BMmD2PTcl47H25Lu7UXtFH/2qqmKiVrnel6Ne//0TFYf6uvNX+HW2FRkLQ==" + }, + "node_modules/psl": { + "version": "1.1.29", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz", + "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==" + }, + "node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "node_modules/qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/readable-stream": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", + "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/request": { + "version": "2.88.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/semver": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/sshpk": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz", + "integrity": "sha512-mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==", + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/tar-stream": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz", + "integrity": "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==", + "dependencies": { + "bl": "^3.0.0", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + } + }, + "node_modules/tough-cookie": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "dependencies": { + "psl": "^1.1.24", + "punycode": "^1.4.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" + }, + "node_modules/typescript": { + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz", + "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "node_modules/uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "bin": { + "uuid": "bin/uuid" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/vscode": { + "version": "1.1.37", + "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.37.tgz", + "integrity": "sha512-vJNj6IlN7IJPdMavlQa1KoFB3Ihn06q1AiN3ZFI/HfzPNzbKZWPPuiU+XkpNOfGU5k15m4r80nxNPlM7wcc0wg==", + "deprecated": "This package is deprecated in favor of @types/vscode and vscode-test. For more information please read: https://code.visualstudio.com/updates/v1_36#_splitting-vscode-package-into-typesvscode-and-vscodetest", + "dev": true, + "license": "MIT", + "dependencies": { + "glob": "^7.1.2", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "mocha": "^5.2.0", + "semver": "^5.4.1", + "source-map-support": "^0.5.0", + "vscode-test": "^0.4.1" + }, + "bin": { + "vscode-install": "bin/install" + }, + "engines": { + "node": ">=8.9.3" + } + }, + "node_modules/vscode-jsonrpc": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz", + "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==", + "engines": { + "node": ">=8.0.0 || >=10.0.0" + } + }, + "node_modules/vscode-languageclient": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.2.1.tgz", + "integrity": "sha512-7jrS/9WnV0ruqPamN1nE7qCxn0phkH5LjSgSp9h6qoJGoeAKzwKz/PF6M+iGA/aklx4GLZg1prddhEPQtuXI1Q==", + "dependencies": { + "semver": "^5.5.0", + "vscode-languageserver-protocol": "3.14.1" + }, + "engines": { + "vscode": "^1.30" + } + }, + "node_modules/vscode-languageserver": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz", + "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==", + "dependencies": { + "vscode-languageserver-protocol": "3.14.1", + "vscode-uri": "^1.0.6" + }, + "bin": { + "installServerIntoExtension": "bin/installServerIntoExtension" + } + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz", + "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==", + "dependencies": { + "vscode-jsonrpc": "^4.0.0", + "vscode-languageserver-types": "3.14.0" + } + }, + "node_modules/vscode-languageserver-types": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz", + "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==" + }, + "node_modules/vscode-test": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-0.4.3.tgz", + "integrity": "sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w==", + "dev": true, + "dependencies": { + "http-proxy-agent": "^2.1.0", + "https-proxy-agent": "^2.2.1" + }, + "engines": { + "node": ">=8.9.3" + } + }, + "node_modules/vscode-uri": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.6.tgz", + "integrity": "sha512-sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww==" + }, + "node_modules/vscode/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/vscode/node_modules/debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/vscode/node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/vscode/node_modules/https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dev": true, + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/vscode/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "node_modules/ws": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "dependencies": { + "async-limiter": "~1.0.0" + } + }, + "node_modules/zip-stream": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-2.1.2.tgz", + "integrity": "sha512-ykebHGa2+uzth/R4HZLkZh3XFJzivhVsjJt8bN3GvBzLaqqrUdRacu+c4QtnUgjkkQfsOuNE1JgLKMCPNmkKgg==", + "dependencies": { + "archiver-utils": "^2.1.0", + "compress-commons": "^2.1.1", + "readable-stream": "^3.4.0" + }, + "engines": { + "node": ">= 6" + } + } + }, "dependencies": { + "@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true + }, "@types/archiver": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-2.1.3.tgz", @@ -810,12 +2146,6 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, - "querystringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz", - "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==", - "dev": true - }, "readable-stream": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", @@ -853,12 +2183,6 @@ "uuid": "^3.3.2" } }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", - "dev": true - }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -963,16 +2287,6 @@ "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==", "dev": true }, - "url-parse": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", - "dev": true, - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -994,18 +2308,65 @@ } }, "vscode": { - "version": "1.1.36", - "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.36.tgz", - "integrity": "sha512-cGFh9jmGLcTapCpPCKvn8aG/j9zVQ+0x5hzYJq5h5YyUXVGa1iamOaB2M2PZXoumQPES4qeAP1FwkI0b6tL4bQ==", + "version": "1.1.37", + "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.37.tgz", + "integrity": "sha512-vJNj6IlN7IJPdMavlQa1KoFB3Ihn06q1AiN3ZFI/HfzPNzbKZWPPuiU+XkpNOfGU5k15m4r80nxNPlM7wcc0wg==", "dev": true, "requires": { "glob": "^7.1.2", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", "mocha": "^5.2.0", - "request": "^2.88.0", "semver": "^5.4.1", "source-map-support": "^0.5.0", - "url-parse": "^1.4.4", "vscode-test": "^0.4.1" + }, + "dependencies": { + "agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "requires": { + "debug": "4" + } + }, + "debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "requires": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + } + }, + "https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dev": true, + "requires": { + "agent-base": "6", + "debug": "4" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "vscode-jsonrpc": { diff --git a/vscode-dotty/package.json b/vscode-dotty/package.json index 6cfe08d6f685..af7b08fed4f6 100644 --- a/vscode-dotty/package.json +++ b/vscode-dotty/package.json @@ -133,6 +133,6 @@ "@types/request": "^2.48.3", "@types/ws": "^6.0.3", "typescript": "^3.6.3", - "vscode": "^1.1.36" + "vscode": "^1.1.37" } } From 20b5f0f7082494d3c220256595e7225085cbfa40 Mon Sep 17 00:00:00 2001 From: olsdavis Date: Sat, 12 Mar 2022 11:46:28 +0000 Subject: [PATCH 1241/1244] Reorder to avoid type erasure to Object issue + fix test --- .../dotty/tools/dotc/transform/LazyVals.scala | 18 +++++++++--------- .../tools/backend/jvm/DottyBytecodeTests.scala | 2 +- library/src/scala/runtime/LazyVals.scala | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala index 6126bc9b3e0b..f737098469f4 100644 --- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala @@ -335,14 +335,14 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { * CAS(_x, lock, result) * lock.release() * else - * if current.isInstanceOf[A] then - * current.asInstanceOf[A] + * if current.isInstanceOf[Evaluating] then + * CAS(current, Evaluating, new Waiting) * else if current.isInstanceOf[NULL] then * null * else if current.isInstanceOf[Waiting] then * current.asInstanceOf[Waiting].awaitRelease() - * else // `current` is Evaluating - * CAS(current, Evaluating, new Waiting) + * else + * current.asInstanceOf[A] * end while * ``` * @@ -413,9 +413,9 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { val current = newSymbol(methodSymbol, lazyNme.current, Synthetic, defn.ObjectType) val ifNotNull = If( - ref(current).select(defn.Any_isInstanceOf).appliedToType(if needsBoxing(tp) then boxIfCan(tp) else tp), - Return(ref(current).ensureConforms(tp), methodSymbol), - // not an A + ref(current).select(defn.Any_isInstanceOf).appliedToTypeTree(evaluating), + ref(discardSymb).ensureApplied, + // not an Evaluating If( ref(current).select(defn.Any_isInstanceOf).appliedToTypeTree(nullValued), Return(defaultValue(tp), methodSymbol), @@ -423,8 +423,8 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { If( ref(current).select(defn.Any_isInstanceOf).appliedToTypeTree(waiting), ref(current).select(defn.Any_asInstanceOf).appliedToTypeTree(waiting).select(lazyNme.RLazyVals.waitingAwaitRelease).ensureApplied, - // not a Waiting, then is an Evaluating - ref(discardSymb).ensureApplied + // not a Waiting, then is an A + Return(ref(current).ensureConforms(tp), methodSymbol) ) ) ) diff --git a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala index 9d6ff413f8a2..83b84496f1f5 100644 --- a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala +++ b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala @@ -595,7 +595,7 @@ class TestBCode extends DottyBytecodeTest { val clsIn = dir.lookupName("Test.class", directory = false).input val clsNode = loadClassNode(clsIn) val method = getMethod(clsNode, "test") - assertEquals(94, instructionsFromMethod(method).size) + assertEquals(122, instructionsFromMethod(method).size) } } diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala index 0c1a6dd421e6..59c05029a11e 100644 --- a/library/src/scala/runtime/LazyVals.scala +++ b/library/src/scala/runtime/LazyVals.scala @@ -145,9 +145,9 @@ object LazyVals { def getOffset(clz: Class[_], name: String): Long = { if (debug) - clz.getDeclaredFields.foreach(println(_)) + clz.getDeclaredFields.nn.foreach(println(_)) val field = clz.getDeclaredField(name) - if java.lang.reflect.Modifier.isStatic(field.getModifiers()) then + if java.lang.reflect.Modifier.isStatic(field.nn.getModifiers()) then unsafe.staticFieldOffset(field) else unsafe.objectFieldOffset(field) From 6f1a43e09fed14776a2070c0a428aedb8d7f5f83 Mon Sep 17 00:00:00 2001 From: olsdavis Date: Mon, 4 Apr 2022 19:48:02 +0100 Subject: [PATCH 1242/1244] Keeping code for old release compatibility --- .../dotty/tools/dotc/transform/LazyVals.scala | 209 +++++++++++++++++- library/src/scala/runtime/LazyVals.scala | 9 +- project/MiMaFilters.scala | 19 +- tests/run/lazyVals_c3.0.0.check | 4 + tests/run/lazyVals_c3.0.0.scala | 13 ++ tests/run/lazyVals_c3.1.0.check | 4 + tests/run/lazyVals_c3.1.0.scala | 13 ++ 7 files changed, 255 insertions(+), 16 deletions(-) create mode 100644 tests/run/lazyVals_c3.0.0.check create mode 100644 tests/run/lazyVals_c3.0.0.scala create mode 100644 tests/run/lazyVals_c3.1.0.check create mode 100644 tests/run/lazyVals_c3.1.0.scala diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala index f737098469f4..061789fd3865 100644 --- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala @@ -27,7 +27,13 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { * The map contains the list of the offset trees. */ class OffsetInfo(var defs: List[Tree]) + /** + * This map contains mutable state of transformation: OffsetDefs to be appended + * to companion object definitions, and number of bits currently used. + */ + class OldOffsetInfo(defs: List[Tree], var ord: Int) extends OffsetInfo(defs) private val appendOffsetDefs = mutable.Map.empty[Symbol, OffsetInfo] + private val oldAppendOffsetDefs = mutable.Map.empty[Symbol, OldOffsetInfo] override def phaseName: String = LazyVals.name @@ -53,6 +59,10 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { else nullables.toList } + private inline def isOldLazyVals(using ctx: Context): Boolean = + import dotty.tools.dotc.config.ScalaRelease._ + ctx.scalaRelease <= Release3_1 + private def initBlock(stats: List[Tree])(using Context): Block = stats match case Nil => throw new IllegalArgumentException("trying to create an empty Block") case x :: Nil => Block(List(x), EmptyTree) @@ -111,12 +121,13 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { } } - /** Append offset fields to companion objects - */ + /** + * Append offset fields to companion objects. + */ override def transformTemplate(template: Template)(using Context): Tree = { val cls = ctx.owner.asClass - - appendOffsetDefs.get(cls) match { + + (if isOldLazyVals then oldAppendOffsetDefs else appendOffsetDefs).get(cls) match { case None => template case Some(data) => data.defs.foreach(_.symbol.addAnnotation(Annotation(defn.ScalaStaticAnnot))) @@ -282,6 +293,16 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { } } + def transformMemberDefThreadSafe(x: ValOrDefDef)(using Context): Thicket = { + assert(!(x.symbol is Mutable)) + // generate old code for compatibility + // TODO find more meaningful names than old/new + if isOldLazyVals then + transformMemberDefThreadSafeOld(x) + else + transformMemberDefThreadSafeNew(x) + } + /** * Create a threadsafe lazy accessor equivalent to the following code: * ``` @@ -358,7 +379,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { * @param evaluating a reference to the `Evaluating` runtime object * @param nullValued a reference to the `NULL` runtime object */ - def mkThreadSafeDef(methodSymbol: TermSymbol, + def mkThreadSafeDefNew(methodSymbol: TermSymbol, claz: ClassSymbol, target: Symbol, rhs: Tree, @@ -434,8 +455,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { ret } - def transformMemberDefThreadSafe(x: ValOrDefDef)(using Context): Thicket = { - assert(!(x.symbol is Mutable)) + def transformMemberDefThreadSafeNew(x: ValOrDefDef)(using Context): Thicket = { import dotty.tools.dotc.core.Types._ import dotty.tools.dotc.core.Flags._ @@ -444,7 +464,6 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { val claz = x.symbol.owner.asClass val thizClass = Literal(Constant(claz.info)) val helperModule = requiredModule(runtimeModule) - val getOffset = Select(ref(helperModule), lazyNme.RLazyVals.getOffset) var offsetSymbol: TermSymbol = null def offsetName(id: Int) = s"${StdNames.nme.LAZY_FIELD_OFFSET}${if (x.symbol.owner.is(Module)) "_m_" else ""}$id".toTermName @@ -455,6 +474,11 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { val stat = x.symbol.isStatic if stat then containerSymbol.setFlag(JavaStatic) + val getOffset = + if stat then + Select(ref(helperModule), lazyNme.RLazyVals.getStaticOffset) + else + Select(ref(helperModule), lazyNme.RLazyVals.getOffset) val containerTree = ValDef(containerSymbol, nullLiteral) def staticOrFieldOff: Tree = getOffset.appliedTo(thizClass, Literal(Constant(containerName.toString))) @@ -485,10 +509,172 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { This(claz) val methodSymbol = x.symbol.asTerm - val accessor = mkThreadSafeDef(methodSymbol, claz, containerSymbol, x.rhs, tpe, offset, objCas, + val accessor = mkThreadSafeDefNew(methodSymbol, claz, containerSymbol, x.rhs, tpe, offset, objCas, ref(waiting), evaluating, nullValued, swapOver) Thicket(containerTree, accessor) } + + /** Create a threadsafe lazy accessor equivalent to such code + * ``` + * def methodSymbol(): Int = { + * while (true) { + * val flag = LazyVals.get(this, bitmap_offset) + * val state = LazyVals.STATE(flag, ) + * + * if (state == ) { + * return value_0 + * } else if (state == ) { + * if (LazyVals.CAS(this, bitmap_offset, flag, , )) { + * try { + * val result = + * value_0 = result + * nullable = null + * LazyVals.setFlag(this, bitmap_offset, , ) + * return result + * } + * catch { + * case ex => + * LazyVals.setFlag(this, bitmap_offset, , ) + * throw ex + * } + * } + * } else /* if (state == || state == ) */ { + * LazyVals.wait4Notification(this, bitmap_offset, flag, ) + * } + * } + * } + * ``` + */ + def mkThreadSafeDefOld(methodSymbol: TermSymbol, + claz: ClassSymbol, + ord: Int, + target: Symbol, + rhs: Tree, + tp: Type, + offset: Tree, + getFlag: Tree, + stateMask: Tree, + casFlag: Tree, + setFlagState: Tree, + waitOnLock: Tree)(using Context): DefDef = { + val initState = Literal(Constant(0)) + val computeState = Literal(Constant(1)) + val computedState = Literal(Constant(3)) + + val thiz = This(claz) + val fieldId = Literal(Constant(ord)) + + val flagSymbol = newSymbol(methodSymbol, lazyNme.flag, Synthetic, defn.LongType) + val flagDef = ValDef(flagSymbol, getFlag.appliedTo(thiz, offset)) + val flagRef = ref(flagSymbol) + + val stateSymbol = newSymbol(methodSymbol, lazyNme.state, Synthetic, defn.LongType) + val stateDef = ValDef(stateSymbol, stateMask.appliedTo(ref(flagSymbol), Literal(Constant(ord)))) + val stateRef = ref(stateSymbol) + + val compute = { + val resultSymbol = newSymbol(methodSymbol, lazyNme.result, Synthetic, tp) + val resultRef = ref(resultSymbol) + val stats = ( + ValDef(resultSymbol, rhs) :: + ref(target).becomes(resultRef) :: + (nullOut(nullableFor(methodSymbol)) :+ + setFlagState.appliedTo(thiz, offset, computedState, fieldId)) + ) + Block(stats, Return(resultRef, methodSymbol)) + } + + val retryCase = { + val caseSymbol = newSymbol(methodSymbol, nme.DEFAULT_EXCEPTION_NAME, Synthetic | Case, defn.ThrowableType) + val triggerRetry = setFlagState.appliedTo(thiz, offset, initState, fieldId) + CaseDef( + Bind(caseSymbol, ref(caseSymbol)), + EmptyTree, + Block(List(triggerRetry), Throw(ref(caseSymbol))) + ) + } + + val initialize = If( + casFlag.appliedTo(thiz, offset, flagRef, computeState, fieldId), + Try(compute, List(retryCase), EmptyTree), + unitLiteral + ) + + val condition = If( + stateRef.equal(computedState), + Return(ref(target), methodSymbol), + If( + stateRef.equal(initState), + initialize, + waitOnLock.appliedTo(thiz, offset, flagRef, fieldId) + ) + ) + + val loop = WhileDo(EmptyTree, Block(List(flagDef, stateDef), condition)) + DefDef(methodSymbol, loop) + } + + def transformMemberDefThreadSafeOld(x: ValOrDefDef)(using Context): Thicket = { + val tpe = x.tpe.widen.resultType.widen + val claz = x.symbol.owner.asClass + val thizClass = Literal(Constant(claz.info)) + val helperModule = requiredModule("scala.runtime.LazyVals") + val getOffset = Select(ref(helperModule), lazyNme.RLazyVals.getOffset) + var offsetSymbol: TermSymbol | Null = null + var flag: Tree = EmptyTree + var ord = 0 + + def offsetName(id: Int) = s"${StdNames.nme.LAZY_FIELD_OFFSET}${if (x.symbol.owner.is(Module)) "_m_" else ""}$id".toTermName + + // compute or create appropriate offsetSymbol, bitmap and bits used by current ValDef + oldAppendOffsetDefs.get(claz) match { + case Some(info) => + val flagsPerLong = (64 / scala.runtime.LazyVals.BITS_PER_LAZY_VAL).toInt + info.ord += 1 + ord = info.ord % flagsPerLong + val id = info.ord / flagsPerLong + val offsetById = offsetName(id) + if (ord != 0) // there are unused bits in already existing flag + offsetSymbol = claz.info.decl(offsetById) + .suchThat(sym => sym.is(Synthetic) && sym.isTerm) + .symbol.asTerm + else { // need to create a new flag + offsetSymbol = newSymbol(claz, offsetById, Synthetic, defn.LongType).enteredAfter(this) + offsetSymbol.nn.addAnnotation(Annotation(defn.ScalaStaticAnnot)) + val flagName = LazyBitMapName.fresh(id.toString.toTermName) + val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType).enteredAfter(this) + flag = ValDef(flagSymbol, Literal(Constant(0L))) + val offsetTree = ValDef(offsetSymbol.nn, getOffset.appliedTo(thizClass, Literal(Constant(flagName.toString)))) + info.defs = offsetTree :: info.defs + } + + case None => + offsetSymbol = newSymbol(claz, offsetName(0), Synthetic, defn.LongType).enteredAfter(this) + offsetSymbol.nn.addAnnotation(Annotation(defn.ScalaStaticAnnot)) + val flagName = LazyBitMapName.fresh("0".toTermName) + val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType).enteredAfter(this) + flag = ValDef(flagSymbol, Literal(Constant(0L))) + val offsetTree = ValDef(offsetSymbol.nn, getOffset.appliedTo(thizClass, Literal(Constant(flagName.toString)))) + oldAppendOffsetDefs += (claz -> new OldOffsetInfo(List(offsetTree), ord)) + } + + val containerName = LazyLocalName.fresh(x.name.asTermName) + val containerSymbol = newSymbol(claz, containerName, x.symbol.flags &~ containerFlagsMask | containerFlags, tpe, coord = x.symbol.coord).enteredAfter(this) + + val containerTree = ValDef(containerSymbol, defaultValue(tpe)) + + val offset = ref(offsetSymbol.nn) + val getFlag = Select(ref(helperModule), lazyNme.RLazyVals.get) + val setFlag = Select(ref(helperModule), lazyNme.RLazyVals.setFlag) + val wait = Select(ref(helperModule), lazyNme.RLazyVals.wait4Notification) + val state = Select(ref(helperModule), lazyNme.RLazyVals.state) + val cas = Select(ref(helperModule), lazyNme.RLazyVals.cas) + + val accessor = mkThreadSafeDefOld(x.symbol.asTerm, claz, ord, containerSymbol, x.rhs, tpe, offset, getFlag, state, cas, setFlag, wait) + if (flag eq EmptyTree) + Thicket(containerTree, accessor) + else Thicket(containerTree, flag, accessor) + } } object LazyVals { @@ -507,6 +693,11 @@ object LazyVals { val objCas: TermName = N.objCas.toTermName val getOffset: TermName = N.getOffset.toTermName val getStaticOffset: TermName = N.getStaticOffset.toTermName + val get: TermName = N.get.toTermName + val setFlag: TermName = N.setFlag.toTermName + val wait4Notification: TermName = N.wait4Notification.toTermName + val state: TermName = N.state.toTermName + val cas: TermName = N.cas.toTermName } val flag: TermName = "flag".toTermName val state: TermName = "state".toTermName diff --git a/library/src/scala/runtime/LazyVals.scala b/library/src/scala/runtime/LazyVals.scala index 59c05029a11e..1713fbe141ff 100644 --- a/library/src/scala/runtime/LazyVals.scala +++ b/library/src/scala/runtime/LazyVals.scala @@ -144,13 +144,10 @@ object LazyVals { } def getOffset(clz: Class[_], name: String): Long = { + val r = unsafe.objectFieldOffset(clz.getDeclaredField(name)) if (debug) - clz.getDeclaredFields.nn.foreach(println(_)) - val field = clz.getDeclaredField(name) - if java.lang.reflect.Modifier.isStatic(field.nn.getModifiers()) then - unsafe.staticFieldOffset(field) - else - unsafe.objectFieldOffset(field) + println(s"getOffset($clz, $name) = $r") + r } def getStaticOffset(clz: Class[_], name: String): Long = { diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index cac81eecc141..c6bf9cdd6471 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -19,6 +19,23 @@ object MiMaFilters { ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#CompilationInfoModule.XmacroSettings"), // Private to the compiler - needed for forward binary compatibility - ProblemFilters.exclude[MissingClassProblem]("scala.annotation.since") + ProblemFilters.exclude[MissingClassProblem]("scala.annotation.since"), + + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.getStaticOffset"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.objCAS"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals.objCAS"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.evaluating"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.getStaticOffset"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.nullValued"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.objCas"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waiting"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waitingAwaitRelease"), + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.LazyVals#Names.waitingRelease"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Evaluating$"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$NULL$"), + ProblemFilters.exclude[MissingClassProblem]("scala.runtime.LazyVals$Waiting"), + ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.LazyVals.Evaluating"), + ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.LazyVals.NULL") ) } diff --git a/tests/run/lazyVals_c3.0.0.check b/tests/run/lazyVals_c3.0.0.check new file mode 100644 index 000000000000..a0aad90603ed --- /dev/null +++ b/tests/run/lazyVals_c3.0.0.check @@ -0,0 +1,4 @@ +computing x +x +computing y +y \ No newline at end of file diff --git a/tests/run/lazyVals_c3.0.0.scala b/tests/run/lazyVals_c3.0.0.scala new file mode 100644 index 000000000000..5df4069bc94c --- /dev/null +++ b/tests/run/lazyVals_c3.0.0.scala @@ -0,0 +1,13 @@ +// Compiled with 3.0.0 and run with current compiler +class Foo: + lazy val x = + println("computing x") + "x" + lazy val y = + println("computing y") + "y" + +@main def Test = + val foo = new Foo + println(foo.x) + println(foo.y) diff --git a/tests/run/lazyVals_c3.1.0.check b/tests/run/lazyVals_c3.1.0.check new file mode 100644 index 000000000000..a0aad90603ed --- /dev/null +++ b/tests/run/lazyVals_c3.1.0.check @@ -0,0 +1,4 @@ +computing x +x +computing y +y \ No newline at end of file diff --git a/tests/run/lazyVals_c3.1.0.scala b/tests/run/lazyVals_c3.1.0.scala new file mode 100644 index 000000000000..45e796ab46d3 --- /dev/null +++ b/tests/run/lazyVals_c3.1.0.scala @@ -0,0 +1,13 @@ +// Compiled with 3.1.0 and run with current compiler +class Foo: + lazy val x = + println("computing x") + "x" + lazy val y = + println("computing y") + "y" + +@main def Test = + val foo = new Foo + println(foo.x) + println(foo.y) \ No newline at end of file From 633742131d008b83d4a6dc42c7863ba1eb75bdac Mon Sep 17 00:00:00 2001 From: olsdavis Date: Mon, 18 Apr 2022 17:56:45 +0100 Subject: [PATCH 1243/1244] fix null type --- compiler/src/dotty/tools/dotc/transform/LazyVals.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala index 061789fd3865..98b52dc6e8ef 100644 --- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala @@ -464,7 +464,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { val claz = x.symbol.owner.asClass val thizClass = Literal(Constant(claz.info)) val helperModule = requiredModule(runtimeModule) - var offsetSymbol: TermSymbol = null + var offsetSymbol: TermSymbol | Null = null def offsetName(id: Int) = s"${StdNames.nme.LAZY_FIELD_OFFSET}${if (x.symbol.owner.is(Module)) "_m_" else ""}$id".toTermName From ceb27ff3cbf7c115829122d4d1b71d7568fa51da Mon Sep 17 00:00:00 2001 From: olsdavis Date: Mon, 18 Apr 2022 18:16:09 +0100 Subject: [PATCH 1244/1244] fix nn for union type --- compiler/src/dotty/tools/dotc/transform/LazyVals.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala index ba25eeac65e1..fc9e6c3977d5 100644 --- a/compiler/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/compiler/src/dotty/tools/dotc/transform/LazyVals.scala @@ -486,13 +486,13 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { appendOffsetDefs.get(claz) match case Some(info) => offsetSymbol = newSymbol(claz, offsetName(info.defs.size), Synthetic, defn.LongType).enteredAfter(this) - offsetSymbol.addAnnotation(Annotation(defn.ScalaStaticAnnot)) - val offsetTree = ValDef(offsetSymbol, staticOrFieldOff) + offsetSymbol.nn.addAnnotation(Annotation(defn.ScalaStaticAnnot)) + val offsetTree = ValDef(offsetSymbol.nn, staticOrFieldOff) info.defs = offsetTree :: info.defs case None => offsetSymbol = newSymbol(claz, offsetName(0), Synthetic, defn.LongType).enteredAfter(this) - offsetSymbol.addAnnotation(Annotation(defn.ScalaStaticAnnot)) - val offsetTree = ValDef(offsetSymbol, staticOrFieldOff) + offsetSymbol.nn.addAnnotation(Annotation(defn.ScalaStaticAnnot)) + val offsetTree = ValDef(offsetSymbol.nn, staticOrFieldOff) appendOffsetDefs += (claz -> new OffsetInfo(List(offsetTree))) val waiting = requiredClass(s"$runtimeModule.${lazyNme.RLazyVals.waiting}") @@ -500,7 +500,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { val nullValued = Select(ref(helperModule), lazyNme.RLazyVals.nullValued) val objCas = Select(ref(helperModule), lazyNme.RLazyVals.objCas) - val offset = ref(offsetSymbol) + val offset = ref(offsetSymbol.nn) val swapOver = if stat then

?(cq?2rREj4!SOm4EVIWLdN?v?rF* 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%0DtWfynMafXbhR1_D$9)$*)QeKztr1qf_^Ki~zV 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≧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