Skip to content

Commit 89ce608

Browse files
committed
Fix formatting, commments & revert redundant changes
1 parent fd8ae41 commit 89ce608

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -809,8 +809,7 @@ object desugar {
809809
Nil
810810
}
811811
}
812-
val classMods =
813-
if mods.is(Given) then mods | Synthetic else mods
812+
val classMods = if mods.is(Given) then mods | Synthetic else mods
814813
cpy.TypeDef(cdef: TypeDef)(
815814
name = className,
816815
rhs = cpy.Template(impl)(constr, parents1, clsDerived, self1,

compiler/src/dotty/tools/dotc/core/Flags.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ object Flags {
233233
val (Param @ _, TermParam @ _, TypeParam @ _) = newFlags(8, "<param>")
234234

235235
/** Labeled with `implicit` modifier (implicit value) */
236-
val (Implicit @ _, ImplicitTerm @ _, _) = newFlags(9, "implicit")
236+
val (Implicit @ _, ImplicitVal @ _, _) = newFlags(9, "implicit")
237237

238238
/** Labeled with `lazy` (a lazy val) / a trait */
239239
val (LazyOrTrait @ _, Lazy @ _, Trait @ _) = newFlags(10, "lazy", "<trait>")
@@ -314,14 +314,14 @@ object Flags {
314314
/** A Scala 2x super accessor / an unpickled Scala 2.x class */
315315
val (SuperParamAliasOrScala2x @ _, SuperParamAlias @ _, Scala2x @ _) = newFlags(26, "<super-param-alias>", "<scala-2.x>")
316316

317-
/** A parameter with a default value / A structural given class or an implicit class */
317+
/** A parameter with a default value */
318318
val (_, HasDefault @ _, _) = newFlags(27, "<hasdefault>")
319319

320320
/** An extension method, or a collective extension instance */
321321
val (Extension @ _, ExtensionMethod @ _, _) = newFlags(28, "<extension>")
322322

323323
/** An inferable (`given`) parameter */
324-
val (Given @ _, GivenVal @ _, GivenType @ _) = newFlags(29, "given")
324+
val (Given @ _, GivenVal @ _, _) = newFlags(29, "given")
325325

326326
/** Symbol is defined by a Java class */
327327
val (JavaDefined @ _, JavaDefinedVal @ _, _) = newFlags(30, "<java>")

compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,8 +733,8 @@ class TreePickler(pickler: TastyPickler) {
733733
if (flags.is(Erased)) writeModTag(ERASED)
734734
if (flags.is(Exported)) writeModTag(EXPORTED)
735735
if (flags.is(Given)) writeModTag(GIVEN)
736+
if (flags.is(Implicit)) writeModTag(IMPLICIT)
736737
if (isTerm) {
737-
if (flags.is(Implicit)) writeModTag(IMPLICIT)
738738
if (flags.is(Lazy, butNot = Module)) writeModTag(LAZY)
739739
if (flags.is(AbsOverride)) { writeModTag(ABSTRACT); writeModTag(OVERRIDE) }
740740
if (flags.is(Mutable)) writeModTag(MUTABLE)

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ class TreeUnpickler(reader: TastyReader,
563563
val rhsStart = currentAddr
564564
val rhsIsEmpty = nothingButMods(end)
565565
if (!rhsIsEmpty) skipTree()
566-
val (givenFlags, annotFns, privateWithin) = readModifiers(end, name.isTypeName)
566+
val (givenFlags, annotFns, privateWithin) = readModifiers(end)
567567
pickling.println(i"creating symbol $name at $start with flags $givenFlags")
568568
val flags = normalizeFlags(tag, givenFlags, name, isAbsType, rhsIsEmpty)
569569
def adjustIfModule(completer: LazyType) =
@@ -623,7 +623,7 @@ class TreeUnpickler(reader: TastyReader,
623623
/** Read modifier list into triplet of flags, annotations and a privateWithin
624624
* boundary symbol.
625625
*/
626-
def readModifiers(end: Addr, isType: Boolean)(using Context): (FlagSet, List[Symbol => Annotation], Symbol) = {
626+
def readModifiers(end: Addr)(using Context): (FlagSet, List[Symbol => Annotation], Symbol) = {
627627
var flags: FlagSet = EmptyFlags
628628
var annotFns: List[Symbol => Annotation] = Nil
629629
var privateWithin: Symbol = NoSymbol
@@ -1226,7 +1226,7 @@ class TreeUnpickler(reader: TastyReader,
12261226
readName()
12271227
readType()
12281228
val body = readTerm()
1229-
val (givenFlags, _, _) = readModifiers(end, sym.isType)
1229+
val (givenFlags, _, _) = readModifiers(end)
12301230
sym.setFlag(givenFlags)
12311231
Bind(sym, body)
12321232
case ALTERNATIVE =>

compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ trait QuotesAndSplices {
323323
tdef.symbol.addAnnotation(Annotation(New(ref(defn.QuotedRuntimePatterns_fromAboveAnnot.typeRef)).withSpan(tdef.span)))
324324
val bindingType = getBinding(tdef.symbol).symbol.typeRef
325325
val bindingTypeTpe = AppliedType(defn.QuotedTypeClass.typeRef, bindingType :: Nil)
326-
val sym = newPatternBoundSymbol(nameOfSyntheticGiven, bindingTypeTpe, tdef.span, flags = ImplicitTerm)(using ctx0)
326+
val sym = newPatternBoundSymbol(nameOfSyntheticGiven, bindingTypeTpe, tdef.span, flags = ImplicitVal)(using ctx0)
327327
buff += Bind(sym, untpd.Ident(nme.WILDCARD).withType(bindingTypeTpe)).withSpan(tdef.span)
328328
super.transform(tdef)
329329
}

0 commit comments

Comments
 (0)