Skip to content

Commit cb5b61a

Browse files
committed
wip 10
1 parent 54bdb67 commit cb5b61a

File tree

4 files changed

+3
-27
lines changed

4 files changed

+3
-27
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ class TastyPrinter(bytes: Array[Byte]) {
9090
printName(); printName()
9191
case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM | NAMEDARG | BIND =>
9292
printName(); printTrees()
93-
case SELECTin =>
94-
printName(); printName(); printTree(); printTrees()
95-
case REFINEDtype | TERMREFin | TYPEREFin =>
93+
case REFINEDtype | TERMREFin | TYPEREFin | SELECTin =>
9694
printName(); printTree(); printTrees()
9795
case RETURN | HOLE =>
9896
printNat(); printTrees()

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ class TreePickler(pickler: TastyPickler) {
417417
writeByte(SELECTin)
418418
withLength {
419419
pickleNameAndSig(name, tree.symbol.signature, ename)
420-
pickleNameAndSig(name, sig, ename)
421420
pickleTree(qual)
422421
if tree.symbol.exists then // TODO: `1.unary_+` has no symbol
423422
pickleType(tree.symbol.owner.typeRef)

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,20 +1179,7 @@ class TreeUnpickler(reader: TastyReader,
11791179
val levels = readNat()
11801180
readTerm().outerSelect(levels, SkolemType(readType()))
11811181
case SELECTin =>
1182-
// ================================================================================
1183-
// Test Report
1184-
// ================================================================================
1185-
1186-
// 3 suites passed, 1 failed, 4 total
1187-
// ] failed
1188-
// tests/pos/i5418.scala failed
1189-
// tests/pos/i5980.scala failed
1190-
val srcnmes = Nil//List("i5980", "i5418")
1191-
val doinspect = srcnmes.exists(ctx.source.name.startsWith)
11921182
var symname = readName()
1193-
var precisesig = readName() match
1194-
case SignedName(_, sig, _) => sig
1195-
case _ => Signature.NotAMethod
11961183
val qual = readTerm()
11971184
val qualType = qual.tpe.widenIfUnstable
11981185
val space = if currentAddr == end then qualType else readType()
@@ -1213,23 +1200,15 @@ class TreeUnpickler(reader: TastyReader,
12131200
val res = symname match
12141201
case SignedName(name, sig, target) =>
12151202
val pre = ctx.typeAssigner.maybeSkolemizePrefix(qualType, name)
1216-
assert(precisesig != Signature.NotAMethod)
12171203
val isAmbiguous = pre.nonPrivateMember(name).match
12181204
case d: MultiDenotation =>
12191205
d.atSignature(sig, target).isInstanceOf[MultiDenotation]
12201206
case _ => false
12211207
if isAmbiguous then
1222-
if doinspect then
1223-
val diff = if sig != precisesig then i"$sig => $precisesig" else i"$sig"
1224-
report.error(i"$qual . $name differs ambiguously: [$diff]")
12251208
makeSelect(qual, name, space.decl(name).atSignature(sig, target).asSeenFrom(pre))
12261209
else
1227-
if doinspect && sig != precisesig then
1228-
report.error(i"$qual . $name differs: [$sig => $precisesig]")
12291210
select(name, sig, target)
12301211
case name =>
1231-
if doinspect then
1232-
report.error(i"$qual . $name nosig")
12331212
makeSelect(qual, name, accessibleDenot(qualType, name, Signature.NotAMethod, EmptyTermName))
12341213
// select(name, Signature.NotAMethod, EmptyTermName)
12351214
res

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,8 +806,8 @@ object TastyFormat {
806806
*/
807807
def numRefs(tag: Int): Int = tag match {
808808
case VALDEF | DEFDEF | TYPEDEF | TYPEPARAM | PARAM | NAMEDARG | RETURN | BIND |
809-
SELFDEF | REFINEDtype | TERMREFin | TYPEREFin | HOLE => 1
810-
case RENAMED | PARAMtype | SELECTin => 2
809+
SELFDEF | REFINEDtype | TERMREFin | TYPEREFin | HOLE | SELECTin => 1
810+
case RENAMED | PARAMtype => 2
811811
case POLYtype | TYPELAMBDAtype | METHODtype => -1
812812
case _ => 0
813813
}

0 commit comments

Comments
 (0)