Skip to content

Commit 4cc224b

Browse files
authored
Merge pull request #8699 from dotty-staging/tasty/remove-Scala2x
remove SCALA2X tag in TASTy
2 parents b87fff4 + 34b05d2 commit 4cc224b

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,7 @@ class TreePickler(pickler: TastyPickler) {
657657
assert(isModifierTag(tag))
658658
writeByte(tag)
659659
}
660+
assert(!flags.is(Scala2x))
660661
if (flags.is(Private)) writeModTag(PRIVATE)
661662
if (flags.is(Protected)) writeModTag(PROTECTED)
662663
if (flags.is(Final, butNot = Module)) writeModTag(FINAL)
@@ -671,7 +672,6 @@ class TreePickler(pickler: TastyPickler) {
671672
if (flags.is(Local)) writeModTag(LOCAL)
672673
if (flags.is(Synthetic)) writeModTag(SYNTHETIC)
673674
if (flags.is(Artifact)) writeModTag(ARTIFACT)
674-
if (flags.is(Scala2x)) writeModTag(SCALA2X)
675675
if (isTerm) {
676676
if (flags.is(Implicit)) writeModTag(IMPLICIT)
677677
if (flags.is(Given)) writeModTag(GIVEN)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,6 @@ class TreeUnpickler(reader: TastyReader,
647647
case CASEaccessor => addFlag(CaseAccessor)
648648
case COVARIANT => addFlag(Covariant)
649649
case CONTRAVARIANT => addFlag(Contravariant)
650-
case SCALA2X => addFlag(Scala2x)
651650
case HASDEFAULT => addFlag(HasDefault)
652651
case STABLE => addFlag(StableRealizable)
653652
case EXTENSION => addFlag(Extension)

tasty/src/dotty/tools/tasty/TastyFormat.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ Standard-Section: "ASTs" TopLevelStat*
197197
CASEaccessor -- A getter for a case class parameter
198198
COVARIANT -- A type parameter marked “+”
199199
CONTRAVARIANT -- A type parameter marked “-”
200-
SCALA2X -- Imported from Scala2.x
201200
HASDEFAULT -- Parameter with default arg; method with default parameters (default arguments are separate methods with DEFAULTGETTER names)
202201
STABLE -- Method that is assumed to be stable, i.e. its applications are legal paths
203202
EXTENSION -- An extension method
@@ -343,7 +342,6 @@ object TastyFormat {
343342
final val CASEaccessor = 27
344343
final val COVARIANT = 28
345344
final val CONTRAVARIANT = 29
346-
final val SCALA2X = 30
347345
final val HASDEFAULT = 31
348346
final val STABLE = 32
349347
final val MACRO = 33
@@ -507,7 +505,6 @@ object TastyFormat {
507505
| CASEaccessor
508506
| COVARIANT
509507
| CONTRAVARIANT
510-
| SCALA2X
511508
| HASDEFAULT
512509
| STABLE
513510
| EXTENSION
@@ -568,7 +565,6 @@ object TastyFormat {
568565
case CASEaccessor => "CASEaccessor"
569566
case COVARIANT => "COVARIANT"
570567
case CONTRAVARIANT => "CONTRAVARIANT"
571-
case SCALA2X => "SCALA2X"
572568
case HASDEFAULT => "HASDEFAULT"
573569
case STABLE => "STABLE"
574570
case EXTENSION => "EXTENSION"

0 commit comments

Comments
 (0)