Skip to content

remove SCALA2X tag in TASTy #8699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2020
Merged

remove SCALA2X tag in TASTy #8699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,7 @@ class TreePickler(pickler: TastyPickler) {
assert(isModifierTag(tag))
writeByte(tag)
}
assert(!flags.is(Scala2x))
if (flags.is(Private)) writeModTag(PRIVATE)
if (flags.is(Protected)) writeModTag(PROTECTED)
if (flags.is(Final, butNot = Module)) writeModTag(FINAL)
Expand All @@ -671,7 +672,6 @@ class TreePickler(pickler: TastyPickler) {
if (flags.is(Local)) writeModTag(LOCAL)
if (flags.is(Synthetic)) writeModTag(SYNTHETIC)
if (flags.is(Artifact)) writeModTag(ARTIFACT)
if (flags.is(Scala2x)) writeModTag(SCALA2X)
if (isTerm) {
if (flags.is(Implicit)) writeModTag(IMPLICIT)
if (flags.is(Given)) writeModTag(GIVEN)
Expand Down
1 change: 0 additions & 1 deletion compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,6 @@ class TreeUnpickler(reader: TastyReader,
case CASEaccessor => addFlag(CaseAccessor)
case COVARIANT => addFlag(Covariant)
case CONTRAVARIANT => addFlag(Contravariant)
case SCALA2X => addFlag(Scala2x)
case HASDEFAULT => addFlag(HasDefault)
case STABLE => addFlag(StableRealizable)
case EXTENSION => addFlag(Extension)
Expand Down
4 changes: 0 additions & 4 deletions tasty/src/dotty/tools/tasty/TastyFormat.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ Standard-Section: "ASTs" TopLevelStat*
CASEaccessor -- A getter for a case class parameter
COVARIANT -- A type parameter marked “+”
CONTRAVARIANT -- A type parameter marked “-”
SCALA2X -- Imported from Scala2.x
HASDEFAULT -- Parameter with default arg; method with default parameters (default arguments are separate methods with DEFAULTGETTER names)
STABLE -- Method that is assumed to be stable, i.e. its applications are legal paths
EXTENSION -- An extension method
Expand Down Expand Up @@ -343,7 +342,6 @@ object TastyFormat {
final val CASEaccessor = 27
final val COVARIANT = 28
final val CONTRAVARIANT = 29
final val SCALA2X = 30
final val HASDEFAULT = 31
final val STABLE = 32
final val MACRO = 33
Expand Down Expand Up @@ -507,7 +505,6 @@ object TastyFormat {
| CASEaccessor
| COVARIANT
| CONTRAVARIANT
| SCALA2X
| HASDEFAULT
| STABLE
| EXTENSION
Expand Down Expand Up @@ -568,7 +565,6 @@ object TastyFormat {
case CASEaccessor => "CASEaccessor"
case COVARIANT => "COVARIANT"
case CONTRAVARIANT => "CONTRAVARIANT"
case SCALA2X => "SCALA2X"
case HASDEFAULT => "HASDEFAULT"
case STABLE => "STABLE"
case EXTENSION => "EXTENSION"
Expand Down