diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-06-29 17:34:29 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-07-11 13:35:06 +0200 |
| commit | 6abde38668acd76cb8b4ef15b62d6015938f483c (patch) | |
| tree | fe59050f7d01c4743d9d67c928baa85e416b97f3 /src/dotty/tools/dotc/core/tasty | |
| parent | ae360e93ad7f657992fc305e1b0755ef3ff0f166 (diff) | |
| download | dotty-6abde38668acd76cb8b4ef15b62d6015938f483c.tar.gz dotty-6abde38668acd76cb8b4ef15b62d6015938f483c.tar.bz2 dotty-6abde38668acd76cb8b4ef15b62d6015938f483c.zip | |
Get rid of BindingKind
Under direct hk encoding this is no longer needed.
Also, drop now redundant pieces of widenForMatchSelector.
Diffstat (limited to 'src/dotty/tools/dotc/core/tasty')
| -rw-r--r-- | src/dotty/tools/dotc/core/tasty/TastyFormat.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/tasty/TreePickler.scala | 1 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala | 5 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/core/tasty/TastyFormat.scala b/src/dotty/tools/dotc/core/tasty/TastyFormat.scala index b23ee5aba..d9006eda9 100644 --- a/src/dotty/tools/dotc/core/tasty/TastyFormat.scala +++ b/src/dotty/tools/dotc/core/tasty/TastyFormat.scala @@ -130,7 +130,7 @@ Standard-Section: "ASTs" TopLevelStat* SUPERtype Length this_Type underlying_Type REFINEDtype Length underlying_Type refinement_NameRef info_Type APPLIEDtype Length tycon_Type arg_Type* - TYPEBOUNDS Length low_Type high_Type bindingKind_Nat? + TYPEBOUNDS Length low_Type high_Type TYPEALIAS Length alias_Type (COVARIANT | CONTRAVARIANT)? ANNOTATED Length underlying_Type fullAnnotation_Term ANDtype Length left_Type right_Type diff --git a/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/src/dotty/tools/dotc/core/tasty/TreePickler.scala index 6a51b9642..a4fdb2751 100644 --- a/src/dotty/tools/dotc/core/tasty/TreePickler.scala +++ b/src/dotty/tools/dotc/core/tasty/TreePickler.scala @@ -243,7 +243,6 @@ class TreePickler(pickler: TastyPickler) { withLength { pickleType(tpe.lo, richTypes) pickleType(tpe.hi, richTypes) - if (tpe.isBinding) writeNat(tpe.bindingKind.n) } case tpe: AnnotatedType => writeByte(ANNOTATED) diff --git a/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala index 2d9b82c97..31247c005 100644 --- a/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala +++ b/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala @@ -266,10 +266,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) { case APPLIEDtype => readType().appliedTo(until(end)(readType())) case TYPEBOUNDS => - val lo = readType() - val hi = readType() - val bk = ifBefore(end)(new BindingKind(readNat().toByte), NoBinding) - TypeBounds(lo, hi, bk) + TypeBounds(readType(), readType()) case TYPEALIAS => val alias = readType() val variance = |