Skip to content

Commit 0cd23ac

Browse files
authored
Merge pull request #12363 from dotty-staging/tasty/remove-internal
remove TASTy INTERNAL tag
2 parents e8099d7 + 1ad8a0b commit 0cd23ac

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,6 @@ class TreeUnpickler(reader: TastyReader,
634634
}
635635
nextByte match {
636636
case PRIVATE => addFlag(Private)
637-
case INTERNAL => ??? // addFlag(Internal)
638637
case PROTECTED => addFlag(Protected)
639638
case ABSTRACT =>
640639
readByte()

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ Standard-Section: "ASTs" TopLevelStat*
176176
TypeName = typeOrBounds_ASTRef paramName_NameRef -- (`termName`: `type`) or (`typeName` `bounds`)
177177
178178
Modifier = PRIVATE -- private
179-
INTERNAL -- package private (not yet used)
180179
PROTECTED -- protected
181180
PRIVATEqualified qualifier_Type -- private[qualifier] (to be dropped(?)
182181
PROTECTEDqualified qualifier_Type -- protecred[qualifier] (to be dropped(?)
@@ -433,12 +432,13 @@ object TastyFormat {
433432
// Cat. 1: tag
434433

435434
final val firstSimpleTreeTag = UNITconst
435+
// final val ??? = 1
436436
final val UNITconst = 2
437437
final val FALSEconst = 3
438438
final val TRUEconst = 4
439439
final val NULLconst = 5
440440
final val PRIVATE = 6
441-
final val INTERNAL = 7
441+
// final val ??? = 7
442442
final val PROTECTED = 8
443443
final val ABSTRACT = 9
444444
final val FINAL = 10
@@ -461,6 +461,7 @@ object TastyFormat {
461461
final val CASEaccessor = 27
462462
final val COVARIANT = 28
463463
final val CONTRAVARIANT = 29
464+
// final val ??? = 30
464465
final val HASDEFAULT = 31
465466
final val STABLE = 32
466467
final val MACRO = 33
@@ -536,6 +537,7 @@ object TastyFormat {
536537
final val IMPORT = 132
537538
final val TYPEPARAM = 133
538539
final val PARAM = 134
540+
// final val ??? = 135
539541
final val APPLY = 136
540542
final val TYPEAPPLY = 137
541543
final val TYPED = 138
@@ -566,7 +568,9 @@ object TastyFormat {
566568
final val TYPEBOUNDS = 163
567569
final val TYPEBOUNDStpt = 164
568570
final val ANDtype = 165
571+
// final val ??? = 166
569572
final val ORtype = 167
573+
// final val ??? = 168
570574
final val POLYtype = 169
571575
final val TYPELAMBDAtype = 170
572576
final val LAMBDAtpt = 171
@@ -576,7 +580,8 @@ object TastyFormat {
576580
final val TYPEREFin = 175
577581
final val SELECTin = 176
578582
final val EXPORT = 177
579-
583+
// final val ??? = 178
584+
// final val ??? = 179
580585
final val METHODtype = 180
581586

582587
final val MATCHtype = 190
@@ -603,7 +608,6 @@ object TastyFormat {
603608

604609
def isModifierTag(tag: Int): Boolean = tag match {
605610
case PRIVATE
606-
| INTERNAL
607611
| PROTECTED
608612
| ABSTRACT
609613
| FINAL
@@ -667,7 +671,6 @@ object TastyFormat {
667671
case TRUEconst => "TRUEconst"
668672
case NULLconst => "NULLconst"
669673
case PRIVATE => "PRIVATE"
670-
case INTERNAL => "INTERNAL"
671674
case PROTECTED => "PROTECTED"
672675
case ABSTRACT => "ABSTRACT"
673676
case FINAL => "FINAL"

tests/run/singleton-ops-flags.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ package example {
77

88
final val EmptyFlags = baseFlags
99
final val Erased = EmptyFlags.next
10-
final val Internal = Erased.next
11-
final val Inline = Internal.next
10+
final val Inline = Erased.next
1211
final val InlineProxy = Inline.next
1312
final val Opaque = InlineProxy.next
1413
final val Scala2x = Opaque.next
@@ -26,7 +25,6 @@ package example {
2625
if s == EmptyFlags then "EmptyFlags"
2726
else s.toSingletonSets[LastFlag].map ( [n <: Int] => (flag: SingletonFlagSet[n]) => flag match {
2827
case Erased => "Erased"
29-
case Internal => "Internal"
3028
case Inline => "Inline"
3129
case InlineProxy => "InlineProxy"
3230
case Opaque => "Opaque"

0 commit comments

Comments
 (0)