Skip to content

Commit 6086d78

Browse files
committed
Reclassify NAMEDARG Tasty tag
Needs to be classified as a Num + AST node. Was misclassified before which lead to a crash in scanTrees. This needs a bump of the major version of Tasty.
1 parent 09fad43 commit 6086d78

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Standard Section: "Positions" Assoc*
226226
object TastyFormat {
227227

228228
final val header = Array(0x5C, 0xA1, 0xAB, 0x1F)
229-
val MajorVersion = 3
229+
val MajorVersion = 4
230230
val MinorVersion = 0
231231

232232
/** Tags used to serialize names */
@@ -336,7 +336,6 @@ object TastyFormat {
336336
final val RECtype = 90
337337
final val TYPEALIAS = 91
338338
final val SINGLETONtpt = 92
339-
final val NAMEDARG = 93
340339

341340
// Cat. 4: tag Nat AST
342341

@@ -349,6 +348,7 @@ object TastyFormat {
349348
final val TYPEREFsymbol = 116
350349
final val TYPEREF = 117
351350
final val SELFDEF = 118
351+
final val NAMEDARG = 119
352352

353353
// Cat. 5: tag Length ...
354354

@@ -408,6 +408,15 @@ object TastyFormat {
408408
final val firstNatASTTreeTag = IDENT
409409
final val firstLengthTreeTag = PACKAGE
410410

411+
/** Useful for debugging */
412+
def isLegalTag(tag: Int) =
413+
firstSimpleTreeTag <= tag && tag <= MACRO ||
414+
firstNatTreeTag <= tag && tag <= SYMBOLconst ||
415+
firstASTTreeTag <= tag && tag <= SINGLETONtpt ||
416+
firstNatASTTreeTag <= tag && tag <= NAMEDARG ||
417+
firstLengthTreeTag <= tag && tag <= TYPEREFin ||
418+
tag == HOLE
419+
411420
def isParamTag(tag: Int) = tag == PARAM || tag == TYPEPARAM
412421

413422
def isModifierTag(tag: Int) = tag match {

0 commit comments

Comments
 (0)