@@ -29,16 +29,29 @@ Macro-format:
2929 Section = NameRef Length Bytes
3030 Length = Nat // length of rest of entry in bytes
3131
32- Name = UTF8 Length UTF8-CodePoint*
33- QUALIFIED Length qualified_NameRef selector_NameRef
34- SIGNED Length original_NameRef resultSig_NameRef paramSig_NameRef*
35- EXPANDED Length original_NameRef
36- UNIQUE Length separator_NameRef num_Nat original_NameRef?
37- OBJECTCLASS Length module_NameRef
38- SUPERACCESSOR Length accessed_NameRef
39- DEFAULTGETTER Length method_NameRef paramNumber_Nat
40- SHADOWED Length original_NameRef
41- ...
32+ Name = UTF8 Length UTF8-CodePoint*
33+ QUALIFIED Length qualified_NameRef selector_NameRef
34+ FLATTENED Length qualified_NameRef selector_NameRef
35+ EXPANDED Length qualified_NameRef selector_NameRef
36+ EXPANDEDPREFIX Length qualified_NameRef selector_NameRef
37+ TRAITSETTER Length qualified_NameRef selector_NameRef
38+ UNIQUE Length separator_NameRef uniqid_Nat underlying_NameRef?
39+ DEFAULTGETTER Length underlying_NameRef index_Nat
40+ VARIANT Length underlying_NameRef variance_Nat // 0: Contravariant, 1: Covariant
41+ OUTERSELECT Length underlying_NameRef nhops_Nat // a reference to `nhops` <outer> selections, followed by `underlying`
42+
43+ SUPERACCESSOR Length underlying_NameRef
44+ PROTECTEDACCESSOR Length underlying_NameRef
45+ PROTECTEDSETTER Length underlying_NameRef
46+ INITIALIZER Length underlying_NameRef
47+ SHADOWED Length underlying_NameRef
48+ AVOIDCLASH Length underlying_NameRef
49+ DIRECT Length underlying_NameRef
50+ FIELD Length underlying_NameRef
51+ EXTMETH Length underlying_NameRef
52+ OBJECTVAR Length underlying_NameRef
53+ OBJECTCLASS Length underlying_NameRef
54+ SIGNED Length original_NameRef resultSig_NameRef paramSig_NameRef*
4255
4356 NameRef = Nat // ordinal number of name in name table, starting from 1.
4457
@@ -239,8 +252,7 @@ object TastyFormat {
239252 final val AVOIDCLASH = 30
240253 final val DIRECT = 31
241254 final val FIELD = 32
242- final val SETTER = 33
243- final val EXTMETH = 34
255+ final val EXTMETH = 33
244256 final val OBJECTVAR = 39
245257 final val OBJECTCLASS = 40
246258
@@ -431,12 +443,26 @@ object TastyFormat {
431443 case QUALIFIED => " QUALIFIED"
432444 case FLATTENED => " FLATTENED"
433445 case EXPANDED => " EXPANDED"
434- case SIGNED => " SIGNED "
435- case OBJECTCLASS => " OBJECTCLASS "
436- case SUPERACCESSOR => " SUPERACCESSOR "
446+ case EXPANDPREFIX => " EXPANDPREFIX "
447+ case TRAITSETTER => " TRAITSETTER "
448+ case UNIQUE => " UNIQUE "
437449 case DEFAULTGETTER => " DEFAULTGETTER"
438- case SHADOWED => " SHADOWED"
439450 case VARIANT => " VARIANT"
451+ case OUTERSELECT => " OUTERSELECT"
452+
453+ case SUPERACCESSOR => " SUPERACCESSOR"
454+ case PROTECTEDACCESSOR => " PROTECTEDACCESSOR"
455+ case PROTECTEDSETTER => " PROTECTEDSETTER"
456+ case INITIALIZER => " INITIALIZER"
457+ case SHADOWED => " SHADOWED"
458+ case AVOIDCLASH => " AVOIDCLASH"
459+ case DIRECT => " DIRECT"
460+ case FIELD => " FIELD"
461+ case EXTMETH => " EXTMETH"
462+ case OBJECTVAR => " OBJECTVAR"
463+ case OBJECTCLASS => " OBJECTCLASS"
464+
465+ case SIGNED => " SIGNED"
440466 }
441467
442468 def astTagToString (tag : Int ): String = tag match {
0 commit comments